1058 files changed, 84435 insertions, 84435 deletions

diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/pom.xml b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/pom.xml
index 72e4961926f..d40bdf7cde4 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/pom.xml
+++ b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/pom.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/dev/pom.xml</relativePath>

-	</parent>

-	<artifactId>org.eclipse.papyrus.tests.framework.annotations</artifactId>

-	<version>1.2.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

-	<build>

-		<plugins>

-			<!-- Empty out the xtend-gen folder in the clean phase. -->

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-clean-plugin</artifactId>

-				<configuration>

-					<filesets>

-						<fileset>

-							<directory>xtend-gen</directory>

-							<excludes>

-								<exclude>**/.gitignore</exclude>

-							</excludes>

-						</fileset>

-					</filesets>

-				</configuration>

-			</plugin>

-			<!-- Generate Xtend sources in the compilation phase. -->

-			<plugin>

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

-				<artifactId>xtend-maven-plugin</artifactId>

-						<configuration>

-							<encoding>UTF-8</encoding>

-						</configuration>

-				<executions>

-					<execution>

-						<goals>

-							<goal>compile</goal>

-						</goals>

-						<configuration>

-							<outputDirectory>xtend-gen</outputDirectory>

-						</configuration>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/dev/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.tests.framework.annotations</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<!-- Empty out the xtend-gen folder in the clean phase. -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>xtend-gen</directory>
+							<excludes>
+								<exclude>**/.gitignore</exclude>
+							</excludes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<!-- Generate Xtend sources in the compilation phase. -->
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+						<configuration>
+							<encoding>UTF-8</encoding>
+						</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>xtend-gen</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.edit/pom.xml b/tests/framework/org.eclipse.papyrus.tests.framework.edit/pom.xml
index 2dcb4d20b8b..a84e6c757ab 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework.edit/pom.xml
+++ b/tests/framework/org.eclipse.papyrus.tests.framework.edit/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/dev/pom.xml</relativePath>

-	</parent>

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

-	<artifactId>org.eclipse.papyrus.tests.framework.edit</artifactId>

-	<version>1.2.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/dev/pom.xml</relativePath>
+	</parent>
+	<groupId>org.eclipse.papyrus</groupId>
+	<artifactId>org.eclipse.papyrus.tests.framework.edit</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.editor/pom.xml b/tests/framework/org.eclipse.papyrus.tests.framework.editor/pom.xml
index 55899046d56..dac6abaa092 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework.editor/pom.xml
+++ b/tests/framework/org.eclipse.papyrus.tests.framework.editor/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/dev/pom.xml</relativePath>

-	</parent>

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

-	<artifactId>org.eclipse.papyrus.tests.framework.editor</artifactId>

-	<version>1.2.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/dev/pom.xml</relativePath>
+	</parent>
+	<groupId>org.eclipse.papyrus</groupId>
+	<artifactId>org.eclipse.papyrus.tests.framework.editor</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/pom.xml b/tests/framework/org.eclipse.papyrus.tests.framework/pom.xml
index e36d767625d..9eaab1176f9 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework/pom.xml
+++ b/tests/framework/org.eclipse.papyrus.tests.framework/pom.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/dev/pom.xml</relativePath>

-	</parent>

-	<artifactId>org.eclipse.papyrus.tests.framework</artifactId>

-	<version>1.2.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

-	<build>

-		<plugins>

-			<!-- Empty out the xtend-gen folder in the clean phase. -->

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-clean-plugin</artifactId>

-				<configuration>

-					<filesets>

-						<fileset>

-							<directory>xtend-gen</directory>

-							<excludes>

-								<exclude>**/.gitignore</exclude>

-							</excludes>

-						</fileset>

-					</filesets>

-				</configuration>

-			</plugin>

-			<!-- Generate Xtend sources in the compilation phase. -->

-			<plugin>

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

-				<artifactId>xtend-maven-plugin</artifactId>

-						<configuration>

-							<encoding>UTF-8</encoding>

-						</configuration>

-				<executions>

-					<execution>

-						<goals>

-							<goal>compile</goal>

-						</goals>

-						<configuration>

-							<outputDirectory>xtend-gen</outputDirectory>

-						</configuration>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/dev/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.tests.framework</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<!-- Empty out the xtend-gen folder in the clean phase. -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>xtend-gen</directory>
+							<excludes>
+								<exclude>**/.gitignore</exclude>
+							</excludes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<!-- Generate Xtend sources in the compilation phase. -->
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+						<configuration>
+							<encoding>UTF-8</encoding>
+						</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>xtend-gen</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
index ff10d540233..45c63ec3ab4 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",

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

- org.eclipse.pde.runtime;bundle-version="[3.5.0,4.0.0)",

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

- org.eclipse.pde;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)",

- org.eclipse.update.configurator;bundle-version="[3.3.0,4.0.0)",

- org.junit;bundle-version="[4.12.0,5.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

- org.eclipse.pde.api.tools;bundle-version="[1.0.1,2.0.0)",

- org.eclipse.jdt.core;bundle-version="[3.11.0,4.0.0)",

- org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.bundles.tests

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Import-Package: org.apache.commons.lang3.text.translate;version="3.1.0"

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.pde.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.pde;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.update.configurator;bundle-version="[3.3.0,4.0.0)",
+ org.junit;bundle-version="[4.12.0,5.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.pde.api.tools;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.bundles.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.apache.commons.lang3.text.translate;version="3.1.0"
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/OSGI-INF/l10n/bundle.properties
index 7aac3380448..82564655b18 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.bundles.tests

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.bundles.tests
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Bundles Tests
\ No newline at end of file
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/about.html b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/about.html
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/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/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties
index 62808b06f2b..966a41640e7 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               OSGI-INF/,\

-               about.html,\

-               build.properties,\

-               resources/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about.html,\
+               build.properties,\
+               resources/
+src.includes = about.html
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/Activator.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/Activator.java
index ab3930bc6ec..52750eaac8a 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/Activator.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/Activator.java
@@ -1,56 +1,56 @@
-package org.eclipse.papyrus.bundles.tests;

-

-import org.eclipse.pde.core.target.ITargetPlatformService;

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

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.ServiceReference;

-

-/**

- * 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.bundles.tests"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	private ITargetPlatformService tpService;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-		super();

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-

-		ServiceReference<? extends ITargetPlatformService> ref = context.getServiceReference(ITargetPlatformService.class);

-		tpService = (ref == null) ? null : context.getService(ref);

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		tpService = null;

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 * 

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-	public ITargetPlatformService getTargetPlatformService() {

-		return tpService;

-	}

-}

+package org.eclipse.papyrus.bundles.tests;
+
+import org.eclipse.pde.core.target.ITargetPlatformService;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * 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.bundles.tests"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	private ITargetPlatformService tpService;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+		super();
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+
+		ServiceReference<? extends ITargetPlatformService> ref = context.getServiceReference(ITargetPlatformService.class);
+		tpService = (ref == null) ? null : context.getService(ref);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		tpService = null;
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 * 
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	public ITargetPlatformService getTargetPlatformService() {
+		return tpService;
+	}
+}
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java
index 9e681470fff..ae422b7e0be 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java
@@ -1,26 +1,26 @@
-/*****************************************************************************

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

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

- *  Christian W. Damus - bug 485220

- *

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

-package org.eclipse.papyrus.bundles.tests;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.runner.Headless;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-@Headless

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({ BundlesTests.class })

-public class AllTests {

-	// JUnit 4 test suite

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.bundles.tests;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.runner.Headless;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@Headless
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({ BundlesTests.class })
+public class AllTests {
+	// JUnit 4 test suite
+}
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java
index f9e883f3467..5dd8d844b99 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java
@@ -1,215 +1,215 @@
-/*****************************************************************************

- * 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.bundles.tests.apireport;

-

-import java.io.IOException;

-import java.lang.reflect.Field;

-import java.util.HashMap;

-import java.util.Map;

-

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

-import org.eclipse.jdt.core.Flags;

-import org.eclipse.pde.api.tools.internal.IApiXmlConstants;

-import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta;

-import org.w3c.dom.Element;

-import org.w3c.dom.NodeList;

-

-/**

- * A specialized {@link SafeDeltaXmlVisitor} that accounts for new

- * compatibility scenarios in Java8's interface evoluation

- * capabilities (such as default and static methods).

- */

-public class Java8DeltaXMLVisitor extends SafeDeltaXmlVisitor {

-	private static final Map<String, Integer> deltaConstantsDecoder = new HashMap<>();

-

-	private final Element root;

-

-	static {

-		try {

-			for (Field next : IDelta.class.getFields()) {

-				if (next.getType() == int.class) {

-					deltaConstantsDecoder.put(next.getName(), next.getInt(null));

-				}

-			}

-		} catch (Exception e) {

-			// Won't happen because we iterate known fields of an interface, which

-			// are by definition always accessible

-			throw new Error(e);

-		}

-	}

-

-	public Java8DeltaXMLVisitor() throws CoreException {

-		super();

-

-		root = getDocument().getDocumentElement();

-	}

-

-

-	/**

-	 * Appends my XML content to a given {@code appendable}.

-	 * 

-	 * @param appendable

-	 *            the appenable on which to append me

-	 * 

-	 * @throws IOException

-	 *             on failure to append

-	 */

-	public void appendTo(Appendable appendable) throws IOException {

-		try {

-			appendable.append(getXML());

-		} catch (CoreException e) {

-			throw new IOException(e);

-		}

-	}

-

-	@Override

-	protected void processLeafDelta(IDelta delta) {

-		super.processLeafDelta(delta);

-

-		Element deltaElement = getNewElement();

-		if (isIncompatible(deltaElement)) {

-			amend(deltaElement);

-		}

-	}

-

-	/**

-	 * Obtains the element most recently added to the delta report.

-	 * 

-	 * @return the newest delta element

-	 */

-	Element getNewElement() {

-		NodeList nodes = root.getChildNodes();

-		// We don't append interstitial text

-		return (Element) nodes.item(nodes.getLength() - 1);

-	}

-

-	public boolean isIncompatible(Element delta) {

-		String result = getString(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE);

-		return !Boolean.parseBoolean(result);

-	}

-

-	protected void setCompatible(Element delta, boolean compatible) {

-		set(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE, compatible);

-	}

-

-	protected String getString(Element element, String attribute) {

-		return element.getAttribute(attribute);

-	}

-

-	protected void set(Element element, String attribute, String value) {

-		if (value == null) {

-			element.removeAttribute(attribute);

-		} else {

-			element.setAttribute(attribute, value);

-		}

-	}

-

-	protected boolean getBoolean(Element element, String attribute) {

-		String result = getString(element, attribute);

-		return Boolean.parseBoolean(result);

-	}

-

-	protected void set(Element element, String attribute, boolean value) {

-		set(element, attribute, Boolean.toString(value));

-	}

-

-	protected int getInt(Element element, String attribute) {

-		String result = getString(element, attribute);

-		return (result == null) ? 0 : Integer.parseInt(result);

-	}

-

-	protected void set(Element element, String attribute, int value) {

-		set(element, attribute, Integer.toString(value));

-	}

-

-	protected void amend(Element delta) {

-		Integer elementType = deltaConstantsDecoder.getOrDefault(

-				getString(delta, IApiXmlConstants.ATTR_NAME_ELEMENT_TYPE),

-				0);

-

-		switch (elementType) {

-		case IDelta.INTERFACE_ELEMENT_TYPE:

-			amendInterface(delta);

-			break;

-		}

-	}

-

-	protected void amendInterface(Element delta) {

-		boolean compatible = false;

-		Integer kind = deltaConstantsDecoder.getOrDefault(

-				getString(delta, IApiXmlConstants.ATTR_KIND),

-				0);

-		String newMessage = null;

-

-		switch (kind) {

-		case IDelta.ADDED:

-			// Something was added to the interface

-			switch (getInt(delta, IApiXmlConstants.ATTR_FLAGS)) {

-			case IDelta.FIELD:

-				// Interfaces can only have static fields, so of course this is

-				// compatible because the linkage is static

-				compatible = isStatic(delta);

-				if (compatible) {

-					newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE);

-					if (newMessage != null) {

-						newMessage = newMessage.replaceFirst("field", "static field");

-						newMessage = newMessage.replaceFirst("in an interface that .*? has", "has");

-					}

-				}

-				break;

-			case IDelta.METHOD:

-				// Java 8 default and static methods are a compatible addition

-				compatible = isDefaultOrStaticMethod(delta);

-				if (compatible) {

-					newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE);

-					if (newMessage != null) {

-						newMessage = newMessage.replaceFirst("method",

-								isStatic(delta) ? "static method" : "default method");

-						newMessage = newMessage.replaceFirst("in an interface that .*? has", "has");

-					}

-				}

-				break;

-			}

-			break;

-		}

-

-		if (compatible) {

-			setCompatible(delta, compatible);

-			if (newMessage != null) {

-				set(delta, IApiXmlConstants.ATTR_MESSAGE, newMessage);

-			}

-		}

-	}

-

-	private boolean isDefaultOrStaticMethod(Element delta) {

-		// Assume not if we can't get the method details

-		boolean result = false;

-

-		int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS);

-		result = Flags.isDefaultMethod(modifiers) || Flags.isStatic(modifiers)

-				|| !Flags.isAbstract(modifiers); // May not know that it's explicitly default

-

-		return result;

-	}

-

-	private boolean isStatic(Element delta) {

-		// Assume not if we can't get the method details

-		boolean result = false;

-

-		int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS);

-		result = Flags.isStatic(modifiers);

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * 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.bundles.tests.apireport;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.Flags;
+import org.eclipse.pde.api.tools.internal.IApiXmlConstants;
+import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+/**
+ * A specialized {@link SafeDeltaXmlVisitor} that accounts for new
+ * compatibility scenarios in Java8's interface evoluation
+ * capabilities (such as default and static methods).
+ */
+public class Java8DeltaXMLVisitor extends SafeDeltaXmlVisitor {
+	private static final Map<String, Integer> deltaConstantsDecoder = new HashMap<>();
+
+	private final Element root;
+
+	static {
+		try {
+			for (Field next : IDelta.class.getFields()) {
+				if (next.getType() == int.class) {
+					deltaConstantsDecoder.put(next.getName(), next.getInt(null));
+				}
+			}
+		} catch (Exception e) {
+			// Won't happen because we iterate known fields of an interface, which
+			// are by definition always accessible
+			throw new Error(e);
+		}
+	}
+
+	public Java8DeltaXMLVisitor() throws CoreException {
+		super();
+
+		root = getDocument().getDocumentElement();
+	}
+
+
+	/**
+	 * Appends my XML content to a given {@code appendable}.
+	 * 
+	 * @param appendable
+	 *            the appenable on which to append me
+	 * 
+	 * @throws IOException
+	 *             on failure to append
+	 */
+	public void appendTo(Appendable appendable) throws IOException {
+		try {
+			appendable.append(getXML());
+		} catch (CoreException e) {
+			throw new IOException(e);
+		}
+	}
+
+	@Override
+	protected void processLeafDelta(IDelta delta) {
+		super.processLeafDelta(delta);
+
+		Element deltaElement = getNewElement();
+		if (isIncompatible(deltaElement)) {
+			amend(deltaElement);
+		}
+	}
+
+	/**
+	 * Obtains the element most recently added to the delta report.
+	 * 
+	 * @return the newest delta element
+	 */
+	Element getNewElement() {
+		NodeList nodes = root.getChildNodes();
+		// We don't append interstitial text
+		return (Element) nodes.item(nodes.getLength() - 1);
+	}
+
+	public boolean isIncompatible(Element delta) {
+		String result = getString(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE);
+		return !Boolean.parseBoolean(result);
+	}
+
+	protected void setCompatible(Element delta, boolean compatible) {
+		set(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE, compatible);
+	}
+
+	protected String getString(Element element, String attribute) {
+		return element.getAttribute(attribute);
+	}
+
+	protected void set(Element element, String attribute, String value) {
+		if (value == null) {
+			element.removeAttribute(attribute);
+		} else {
+			element.setAttribute(attribute, value);
+		}
+	}
+
+	protected boolean getBoolean(Element element, String attribute) {
+		String result = getString(element, attribute);
+		return Boolean.parseBoolean(result);
+	}
+
+	protected void set(Element element, String attribute, boolean value) {
+		set(element, attribute, Boolean.toString(value));
+	}
+
+	protected int getInt(Element element, String attribute) {
+		String result = getString(element, attribute);
+		return (result == null) ? 0 : Integer.parseInt(result);
+	}
+
+	protected void set(Element element, String attribute, int value) {
+		set(element, attribute, Integer.toString(value));
+	}
+
+	protected void amend(Element delta) {
+		Integer elementType = deltaConstantsDecoder.getOrDefault(
+				getString(delta, IApiXmlConstants.ATTR_NAME_ELEMENT_TYPE),
+				0);
+
+		switch (elementType) {
+		case IDelta.INTERFACE_ELEMENT_TYPE:
+			amendInterface(delta);
+			break;
+		}
+	}
+
+	protected void amendInterface(Element delta) {
+		boolean compatible = false;
+		Integer kind = deltaConstantsDecoder.getOrDefault(
+				getString(delta, IApiXmlConstants.ATTR_KIND),
+				0);
+		String newMessage = null;
+
+		switch (kind) {
+		case IDelta.ADDED:
+			// Something was added to the interface
+			switch (getInt(delta, IApiXmlConstants.ATTR_FLAGS)) {
+			case IDelta.FIELD:
+				// Interfaces can only have static fields, so of course this is
+				// compatible because the linkage is static
+				compatible = isStatic(delta);
+				if (compatible) {
+					newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE);
+					if (newMessage != null) {
+						newMessage = newMessage.replaceFirst("field", "static field");
+						newMessage = newMessage.replaceFirst("in an interface that .*? has", "has");
+					}
+				}
+				break;
+			case IDelta.METHOD:
+				// Java 8 default and static methods are a compatible addition
+				compatible = isDefaultOrStaticMethod(delta);
+				if (compatible) {
+					newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE);
+					if (newMessage != null) {
+						newMessage = newMessage.replaceFirst("method",
+								isStatic(delta) ? "static method" : "default method");
+						newMessage = newMessage.replaceFirst("in an interface that .*? has", "has");
+					}
+				}
+				break;
+			}
+			break;
+		}
+
+		if (compatible) {
+			setCompatible(delta, compatible);
+			if (newMessage != null) {
+				set(delta, IApiXmlConstants.ATTR_MESSAGE, newMessage);
+			}
+		}
+	}
+
+	private boolean isDefaultOrStaticMethod(Element delta) {
+		// Assume not if we can't get the method details
+		boolean result = false;
+
+		int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS);
+		result = Flags.isDefaultMethod(modifiers) || Flags.isStatic(modifiers)
+				|| !Flags.isAbstract(modifiers); // May not know that it's explicitly default
+
+		return result;
+	}
+
+	private boolean isStatic(Element delta) {
+		// Assume not if we can't get the method details
+		boolean result = false;
+
+		int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS);
+		result = Flags.isStatic(modifiers);
+
+		return result;
+	}
+}
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF
index 648c5d8a1ec..e72074d97e8 100755
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.developer.suite.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.developer.suite.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 0.0.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.developer.suite.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.developer.suite.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.bundles.tests;bundle-version="[1.2.0,2.0.0)"
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF
index cf15aceb3ac..a24acd8edac 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
-Manifest-Version: 1.0

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

- org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.eclipse.project.editors.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: Papyrus Project Editor Tests

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Import-Package: com.google.common.base;version="21.0.0"

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.eclipse.project.editors.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: Papyrus Project Editor Tests
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation
index 3bfdbc03053..6cd26e5d1c1 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_b2JjcMjxEeS9XIofcN-grg" type="PapyrusUMLClassDiagram" name="main" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_eDFVEMjxEeS9XIofcN-grg" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_eDHKQMjxEeS9XIofcN-grg" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_eDHKQcjxEeS9XIofcN-grg" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_eDHKQsjxEeS9XIofcN-grg" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxUMjxEeS9XIofcN-grg" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxUcjxEeS9XIofcN-grg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxUsjxEeS9XIofcN-grg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxU8jxEeS9XIofcN-grg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxVMjxEeS9XIofcN-grg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxVcjxEeS9XIofcN-grg" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxVsjxEeS9XIofcN-grg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxV8jxEeS9XIofcN-grg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxWMjxEeS9XIofcN-grg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxWcjxEeS9XIofcN-grg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxWsjxEeS9XIofcN-grg" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxW8jxEeS9XIofcN-grg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxXMjxEeS9XIofcN-grg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxXcjxEeS9XIofcN-grg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxXsjxEeS9XIofcN-grg"/>

-      </children>

-      <element xmi:type="uml:Class" href="css_leaktest.uml#_eC9ZQMjxEeS9XIofcN-grg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDFVEcjxEeS9XIofcN-grg" x="47" y="21"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ggADcMjxEeS9XIofcN-grg" type="Enumeration_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ggAqgMjxEeS9XIofcN-grg" type="Enumeration_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ggAqgcjxEeS9XIofcN-grg" type="Enumeration_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ggAqgsjxEeS9XIofcN-grg" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ggBRkMjxEeS9XIofcN-grg" type="Enumeration_LiteralCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ggBRkcjxEeS9XIofcN-grg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ggBRksjxEeS9XIofcN-grg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ggBRk8jxEeS9XIofcN-grg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ggBRlMjxEeS9XIofcN-grg"/>

-      </children>

-      <element xmi:type="uml:Enumeration" href="css_leaktest.uml#_gf9nMMjxEeS9XIofcN-grg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ggADccjxEeS9XIofcN-grg" x="252" y="20"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_i5ZjwMjxEeS9XIofcN-grg" type="Package_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_i5aK0MjxEeS9XIofcN-grg" type="Package_NameLabel"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_i5aK0cjxEeS9XIofcN-grg" type="Package_PackagedElementCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yadd4MjxEeS9XIofcN-grg" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yadd4cjxEeS9XIofcN-grg" key="mutable" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_i5aK0sjxEeS9XIofcN-grg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5aK08jxEeS9XIofcN-grg"/>

-      </children>

-      <element xmi:type="uml:Package" href="css_leaktest.uml#_i5XukMjxEeS9XIofcN-grg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5ZjwcjxEeS9XIofcN-grg" x="29" y="159" width="385" height="300"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_b2JjccjxEeS9XIofcN-grg" name="diagram_compatibility_version" stringValue="1.3.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_b2JjcsjxEeS9XIofcN-grg"/>

-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_b7wrIBMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

-      <owner xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/>

-    </styles>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_yY3icMjxEeS9XIofcN-grg" name="css_stylesheets" eObjectListValue="_yY4wkMjxEeS9XIofcN-grg"/>

-    <element xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_tfPhEMjxEeS9XIofcN-grg"/>

-  <css:EmbeddedStyleSheet xmi:id="_yY4wkMjxEeS9XIofcN-grg" label="canonical" content="Class, Enumeration, Package {&#xA;    canonical: true&#xA;}"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_b2JjcMjxEeS9XIofcN-grg" type="PapyrusUMLClassDiagram" name="main" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_eDFVEMjxEeS9XIofcN-grg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_eDHKQMjxEeS9XIofcN-grg" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eDHKQcjxEeS9XIofcN-grg" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eDHKQsjxEeS9XIofcN-grg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxUMjxEeS9XIofcN-grg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxUcjxEeS9XIofcN-grg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxUsjxEeS9XIofcN-grg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxU8jxEeS9XIofcN-grg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxVMjxEeS9XIofcN-grg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxVcjxEeS9XIofcN-grg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxVsjxEeS9XIofcN-grg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxV8jxEeS9XIofcN-grg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxWMjxEeS9XIofcN-grg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxWcjxEeS9XIofcN-grg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxWsjxEeS9XIofcN-grg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxW8jxEeS9XIofcN-grg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxXMjxEeS9XIofcN-grg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxXcjxEeS9XIofcN-grg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxXsjxEeS9XIofcN-grg"/>
+      </children>
+      <element xmi:type="uml:Class" href="css_leaktest.uml#_eC9ZQMjxEeS9XIofcN-grg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDFVEcjxEeS9XIofcN-grg" x="47" y="21"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ggADcMjxEeS9XIofcN-grg" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ggAqgMjxEeS9XIofcN-grg" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ggAqgcjxEeS9XIofcN-grg" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ggAqgsjxEeS9XIofcN-grg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ggBRkMjxEeS9XIofcN-grg" type="Enumeration_LiteralCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ggBRkcjxEeS9XIofcN-grg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ggBRksjxEeS9XIofcN-grg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ggBRk8jxEeS9XIofcN-grg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ggBRlMjxEeS9XIofcN-grg"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="css_leaktest.uml#_gf9nMMjxEeS9XIofcN-grg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ggADccjxEeS9XIofcN-grg" x="252" y="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_i5ZjwMjxEeS9XIofcN-grg" type="Package_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_i5aK0MjxEeS9XIofcN-grg" type="Package_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_i5aK0cjxEeS9XIofcN-grg" type="Package_PackagedElementCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yadd4MjxEeS9XIofcN-grg" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yadd4cjxEeS9XIofcN-grg" key="mutable" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_i5aK0sjxEeS9XIofcN-grg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5aK08jxEeS9XIofcN-grg"/>
+      </children>
+      <element xmi:type="uml:Package" href="css_leaktest.uml#_i5XukMjxEeS9XIofcN-grg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5ZjwcjxEeS9XIofcN-grg" x="29" y="159" width="385" height="300"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_b2JjccjxEeS9XIofcN-grg" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_b2JjcsjxEeS9XIofcN-grg"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_b7wrIBMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_yY3icMjxEeS9XIofcN-grg" name="css_stylesheets" eObjectListValue="_yY4wkMjxEeS9XIofcN-grg"/>
+    <element xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_tfPhEMjxEeS9XIofcN-grg"/>
+  <css:EmbeddedStyleSheet xmi:id="_yY4wkMjxEeS9XIofcN-grg" label="canonical" content="Class, Enumeration, Package {&#xA;    canonical: true&#xA;}"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation
index ecc2551663c..31961186406 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation
@@ -1,92 +1,92 @@
-<?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:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_J526gLjVEeOUcroamP8z5w" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_K0bsYLjVEeOUcroamP8z5w" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_K0eIoLjVEeOUcroamP8z5w" type="Class_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_K0gk4LjVEeOUcroamP8z5w" type="Class_AttributeCompartment">

-      <children xmi:type="notation:Node" xmi:id="_nMwz4LjVEeOUcroamP8z5w" type="Property_ClassAttributeLabel">

-        <element xmi:type="uml:Property" href="model-no-j2ee-constraints.uml#_nMtwkLjVEeOUcroamP8z5w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nMwz4bjVEeOUcroamP8z5w"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_K0gk4bjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_K0gk4rjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0gk47jVEeOUcroamP8z5w"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL8LjVEeOUcroamP8z5w" type="Class_OperationCompartment">

-      <children xmi:type="notation:Node" xmi:id="_mFRAULjVEeOUcroamP8z5w" type="Operation_ClassOperationLabel">

-        <element xmi:type="uml:Operation" href="model-no-j2ee-constraints.uml#_mDkXMLjVEeOUcroamP8z5w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mFRAUbjVEeOUcroamP8z5w"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL8bjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL8rjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL87jVEeOUcroamP8z5w"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL9bjVEeOUcroamP8z5w" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL9rjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL97jVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL-LjVEeOUcroamP8z5w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL-bjVEeOUcroamP8z5w"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_nNB9UBL7EeeoPd87eel4nw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_nNCkYBL7EeeoPd87eel4nw" y="5"/>

-    </children>

-    <element xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0bsYbjVEeOUcroamP8z5w" x="35" y="123"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_nNKgMBL7EeeoPd87eel4nw" type="StereotypeComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR6dUBL7EeeoPd87eel4nw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR6dURL7EeeoPd87eel4nw" key="visible" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_nNNjgRL7EeeoPd87eel4nw" type="StereotypeCompartment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR7EYBL7EeeoPd87eel4nw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR7EYRL7EeeoPd87eel4nw" key="visible" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M8BL7EeeoPd87eel4nw" type="StereotypeProperty">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR7EYhL7EeeoPd87eel4nw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR7EYxL7EeeoPd87eel4nw" key="visible" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_UkhtYJKJEeOKCcahrNz4pQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M8RL7EeeoPd87eel4nw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M8hL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty">

-        <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_bLTv4JNUEeOscpAmdCPVFA"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M8xL7EeeoPd87eel4nw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M9BL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty">

-        <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_aXfgwJNpEeOGJZd41BJaSw"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M9RL7EeeoPd87eel4nw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M9hL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty">

-        <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_pjxUoJlyEeOYT-OW6x9nfw"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M9xL7EeeoPd87eel4nw"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_nNNjghL7EeeoPd87eel4nw"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_nNNjgxL7EeeoPd87eel4nw" name="stereotype" stringValue="j2ee::Bean"/>

-      <element xmi:type="uml:Stereotype" href="j2ee-no-constraints.profile.uml#_EMn1sJ_NEeOHObuLP75oVQ"/>

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

-    </children>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_nNKgMRL7EeeoPd87eel4nw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNMVYBL7EeeoPd87eel4nw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/>

-  </children>

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

-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_nNAIIBL7EeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

-    <owner xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/>

-  </styles>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_nX5wkBL7EeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/>

-  <element xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/>

-  <edges xmi:type="notation:Connector" xmi:id="_nNM8cBL7EeeoPd87eel4nw" type="StereotypeCommentLink" source="_K0bsYLjVEeOUcroamP8z5w" target="_nNKgMBL7EeeoPd87eel4nw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_nNM8cRL7EeeoPd87eel4nw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNNjgBL7EeeoPd87eel4nw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ef6_krjVEeOUcroamP8z5w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_k7jVEeOUcroamP8z5w" id="(1.0,0.4830508474576271)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_lLjVEeOUcroamP8z5w" id="(0.0,0.6166666666666667)"/>

-  </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:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_J526gLjVEeOUcroamP8z5w" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_K0bsYLjVEeOUcroamP8z5w" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_K0eIoLjVEeOUcroamP8z5w" type="Class_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_K0gk4LjVEeOUcroamP8z5w" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Node" xmi:id="_nMwz4LjVEeOUcroamP8z5w" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model-no-j2ee-constraints.uml#_nMtwkLjVEeOUcroamP8z5w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nMwz4bjVEeOUcroamP8z5w"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_K0gk4bjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_K0gk4rjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0gk47jVEeOUcroamP8z5w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0gk5LjVEeOUcroamP8z5w"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL8LjVEeOUcroamP8z5w" type="Class_OperationCompartment">
+      <children xmi:type="notation:Node" xmi:id="_mFRAULjVEeOUcroamP8z5w" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model-no-j2ee-constraints.uml#_mDkXMLjVEeOUcroamP8z5w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mFRAUbjVEeOUcroamP8z5w"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL8bjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL8rjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL87jVEeOUcroamP8z5w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL9LjVEeOUcroamP8z5w"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL9bjVEeOUcroamP8z5w" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL9rjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL97jVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL-LjVEeOUcroamP8z5w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL-bjVEeOUcroamP8z5w"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_nNB9UBL7EeeoPd87eel4nw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_nNCkYBL7EeeoPd87eel4nw" y="5"/>
+    </children>
+    <element xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0bsYbjVEeOUcroamP8z5w" x="35" y="123"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_nNKgMBL7EeeoPd87eel4nw" type="StereotypeComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR6dUBL7EeeoPd87eel4nw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR6dURL7EeeoPd87eel4nw" key="visible" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_nNNjgRL7EeeoPd87eel4nw" type="StereotypeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR7EYBL7EeeoPd87eel4nw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR7EYRL7EeeoPd87eel4nw" key="visible" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M8BL7EeeoPd87eel4nw" type="StereotypeProperty">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR7EYhL7EeeoPd87eel4nw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR7EYxL7EeeoPd87eel4nw" key="visible" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_UkhtYJKJEeOKCcahrNz4pQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M8RL7EeeoPd87eel4nw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M8hL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty">
+        <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_bLTv4JNUEeOscpAmdCPVFA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M8xL7EeeoPd87eel4nw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M9BL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty">
+        <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_aXfgwJNpEeOGJZd41BJaSw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M9RL7EeeoPd87eel4nw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M9hL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty">
+        <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_pjxUoJlyEeOYT-OW6x9nfw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M9xL7EeeoPd87eel4nw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_nNNjghL7EeeoPd87eel4nw"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_nNNjgxL7EeeoPd87eel4nw" name="stereotype" stringValue="j2ee::Bean"/>
+      <element xmi:type="uml:Stereotype" href="j2ee-no-constraints.profile.uml#_EMn1sJ_NEeOHObuLP75oVQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nNNjhBL7EeeoPd87eel4nw"/>
+    </children>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_nNKgMRL7EeeoPd87eel4nw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNMVYBL7EeeoPd87eel4nw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_J526gbjVEeOUcroamP8z5w"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_nNAIIBL7EeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/>
+  </styles>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_nX5wkBL7EeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/>
+  <element xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/>
+  <edges xmi:type="notation:Connector" xmi:id="_nNM8cBL7EeeoPd87eel4nw" type="StereotypeCommentLink" source="_K0bsYLjVEeOUcroamP8z5w" target="_nNKgMBL7EeeoPd87eel4nw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_nNM8cRL7EeeoPd87eel4nw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNNjgBL7EeeoPd87eel4nw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ef6_krjVEeOUcroamP8z5w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_k7jVEeOUcroamP8z5w" id="(1.0,0.4830508474576271)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_lLjVEeOUcroamP8z5w" id="(0.0,0.6166666666666667)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation
index 14fb3cb60ca..0f2126ceb31 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation
@@ -1,92 +1,92 @@
-<?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:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_J526gLjVEeOUcroamP8z5w" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_K0bsYLjVEeOUcroamP8z5w" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_K0eIoLjVEeOUcroamP8z5w" type="Class_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_K0gk4LjVEeOUcroamP8z5w" type="Class_AttributeCompartment">

-      <children xmi:type="notation:Node" xmi:id="_nMwz4LjVEeOUcroamP8z5w" type="Property_ClassAttributeLabel">

-        <element xmi:type="uml:Property" href="model.uml#_nMtwkLjVEeOUcroamP8z5w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nMwz4bjVEeOUcroamP8z5w"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_K0gk4bjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_K0gk4rjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0gk47jVEeOUcroamP8z5w"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL8LjVEeOUcroamP8z5w" type="Class_OperationCompartment">

-      <children xmi:type="notation:Node" xmi:id="_mFRAULjVEeOUcroamP8z5w" type="Operation_ClassOperationLabel">

-        <element xmi:type="uml:Operation" href="model.uml#_mDkXMLjVEeOUcroamP8z5w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mFRAUbjVEeOUcroamP8z5w"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL8bjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL8rjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL87jVEeOUcroamP8z5w"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL9bjVEeOUcroamP8z5w" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL9rjVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL97jVEeOUcroamP8z5w"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL-LjVEeOUcroamP8z5w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL-bjVEeOUcroamP8z5w"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_HXCp4RMAEeeoPd87eel4nw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HXCp4hMAEeeoPd87eel4nw" y="5"/>

-    </children>

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

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0bsYbjVEeOUcroamP8z5w" x="35" y="123"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_HXEfExMAEeeoPd87eel4nw" type="StereotypeComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKlsBMAEeeoPd87eel4nw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKlsRMAEeeoPd87eel4nw" key="visible" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_HXFGJhMAEeeoPd87eel4nw" type="StereotypeCompartment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKlshMAEeeoPd87eel4nw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKlsxMAEeeoPd87eel4nw" key="visible" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_HXGUQBMAEeeoPd87eel4nw" type="StereotypeProperty">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKltBMAEeeoPd87eel4nw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKltRMAEeeoPd87eel4nw" key="visible" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="j2ee.profile.uml#_UkhtYJKJEeOKCcahrNz4pQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGUQRMAEeeoPd87eel4nw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_HXGUQhMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty">

-        <element xmi:type="uml:Property" href="j2ee.profile.uml#_bLTv4JNUEeOscpAmdCPVFA"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGUQxMAEeeoPd87eel4nw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_HXGURBMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty">

-        <element xmi:type="uml:Property" href="j2ee.profile.uml#_aXfgwJNpEeOGJZd41BJaSw"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGURRMAEeeoPd87eel4nw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_HXGURhMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty">

-        <element xmi:type="uml:Property" href="j2ee.profile.uml#_pjxUoJlyEeOYT-OW6x9nfw"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGURxMAEeeoPd87eel4nw"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_HXFGJxMAEeeoPd87eel4nw"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_HXFGKBMAEeeoPd87eel4nw" name="stereotype" stringValue="j2ee::Bean"/>

-      <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_EMn1sJ_NEeOHObuLP75oVQ"/>

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

-    </children>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_HXEfFBMAEeeoPd87eel4nw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HXEfFhMAEeeoPd87eel4nw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/>

-  </children>

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

-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_HXCp4BMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

-    <owner xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/>

-  </styles>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_HaFW0BMAEeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/>

-  <element xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/>

-  <edges xmi:type="notation:Connector" xmi:id="_HXFGIBMAEeeoPd87eel4nw" type="StereotypeCommentLink" source="_K0bsYLjVEeOUcroamP8z5w" target="_HXEfExMAEeeoPd87eel4nw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_HXFGIRMAEeeoPd87eel4nw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HXFGJRMAEeeoPd87eel4nw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ef6_krjVEeOUcroamP8z5w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_k7jVEeOUcroamP8z5w" id="(1.0,0.4830508474576271)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_lLjVEeOUcroamP8z5w" id="(0.0,0.6166666666666667)"/>

-  </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:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_J526gLjVEeOUcroamP8z5w" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_K0bsYLjVEeOUcroamP8z5w" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_K0eIoLjVEeOUcroamP8z5w" type="Class_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_K0gk4LjVEeOUcroamP8z5w" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Node" xmi:id="_nMwz4LjVEeOUcroamP8z5w" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_nMtwkLjVEeOUcroamP8z5w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nMwz4bjVEeOUcroamP8z5w"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_K0gk4bjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_K0gk4rjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0gk47jVEeOUcroamP8z5w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0gk5LjVEeOUcroamP8z5w"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL8LjVEeOUcroamP8z5w" type="Class_OperationCompartment">
+      <children xmi:type="notation:Node" xmi:id="_mFRAULjVEeOUcroamP8z5w" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_mDkXMLjVEeOUcroamP8z5w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mFRAUbjVEeOUcroamP8z5w"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL8bjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL8rjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL87jVEeOUcroamP8z5w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL9LjVEeOUcroamP8z5w"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL9bjVEeOUcroamP8z5w" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL9rjVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL97jVEeOUcroamP8z5w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL-LjVEeOUcroamP8z5w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL-bjVEeOUcroamP8z5w"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_HXCp4RMAEeeoPd87eel4nw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_HXCp4hMAEeeoPd87eel4nw" y="5"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0bsYbjVEeOUcroamP8z5w" x="35" y="123"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_HXEfExMAEeeoPd87eel4nw" type="StereotypeComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKlsBMAEeeoPd87eel4nw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKlsRMAEeeoPd87eel4nw" key="visible" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_HXFGJhMAEeeoPd87eel4nw" type="StereotypeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKlshMAEeeoPd87eel4nw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKlsxMAEeeoPd87eel4nw" key="visible" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HXGUQBMAEeeoPd87eel4nw" type="StereotypeProperty">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKltBMAEeeoPd87eel4nw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKltRMAEeeoPd87eel4nw" key="visible" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="j2ee.profile.uml#_UkhtYJKJEeOKCcahrNz4pQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGUQRMAEeeoPd87eel4nw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HXGUQhMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty">
+        <element xmi:type="uml:Property" href="j2ee.profile.uml#_bLTv4JNUEeOscpAmdCPVFA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGUQxMAEeeoPd87eel4nw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HXGURBMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty">
+        <element xmi:type="uml:Property" href="j2ee.profile.uml#_aXfgwJNpEeOGJZd41BJaSw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGURRMAEeeoPd87eel4nw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HXGURhMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty">
+        <element xmi:type="uml:Property" href="j2ee.profile.uml#_pjxUoJlyEeOYT-OW6x9nfw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGURxMAEeeoPd87eel4nw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HXFGJxMAEeeoPd87eel4nw"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_HXFGKBMAEeeoPd87eel4nw" name="stereotype" stringValue="j2ee::Bean"/>
+      <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_EMn1sJ_NEeOHObuLP75oVQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HXFGKRMAEeeoPd87eel4nw"/>
+    </children>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_HXEfFBMAEeeoPd87eel4nw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HXEfFhMAEeeoPd87eel4nw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_J526gbjVEeOUcroamP8z5w"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_HXCp4BMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/>
+  </styles>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_HaFW0BMAEeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/>
+  <element xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/>
+  <edges xmi:type="notation:Connector" xmi:id="_HXFGIBMAEeeoPd87eel4nw" type="StereotypeCommentLink" source="_K0bsYLjVEeOUcroamP8z5w" target="_HXEfExMAEeeoPd87eel4nw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_HXFGIRMAEeeoPd87eel4nw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HXFGJRMAEeeoPd87eel4nw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ef6_krjVEeOUcroamP8z5w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_k7jVEeOUcroamP8z5w" id="(1.0,0.4830508474576271)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_lLjVEeOUcroamP8z5w" id="(0.0,0.6166666666666667)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF
index cbb6da51fbb..df48c200998 100755
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",

- org.eclipse.core.runtime;bundle-version="3.11.0",

- org.junit,

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

-Export-Package: org.eclipse.papyrus.infra.core.clipboard.tests

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.3.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.core.clipboard.tests.Activator

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
+ org.eclipse.core.runtime;bundle-version="3.11.0",
+ org.junit,
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.core.clipboard.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.3.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.core.clipboard.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.clipboard.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
index febc461d04c..b0ee1184e8a 100644
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

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

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

- org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,

- org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal,

- org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query,

- org.eclipse.papyrus.infra.core.sasheditor.di.tests

-Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,
+ org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal,
+ org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query,
+ org.eclipse.papyrus.infra.core.sasheditor.di.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
index 8b2634ac1b5..032bec92b58 100644
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui.editors;bundle-version="3.8.0",

- org.eclipse.jface.text;bundle-version="3.8.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.core.resources;bundle-version="3.8.0",

- org.junit;bundle-version="4.10.0",

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

- org.eclipse.ui;bundle-version="3.106.0",

- org.eclipse.ui.workbench.texteditor;bundle-version="3.9.0",

- org.eclipse.core.runtime;bundle-version="3.10.0",

- org.eclipse.emf.ecore;bundle-version="2.11.0",

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

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

-Export-Package: org.eclipse.papyrus.infra.core.sasheditor.contentprovider,

- org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple,

- org.eclipse.papyrus.infra.core.sasheditor.editor,

- org.eclipse.papyrus.infra.core.sasheditor.internal,

- org.eclipse.papyrus.infra.core.sasheditor.pagesmodel,

- org.eclipse.papyrus.infra.core.sasheditor.tests,

- org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor,

- org.eclipse.papyrus.infra.core.sasheditor.tests.utils,

- org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak,

- org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace,

- org.eclipse.papyrus.infra.core.sasheditor.utils

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui.editors;bundle-version="3.8.0",
+ org.eclipse.jface.text;bundle-version="3.8.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.ui;bundle-version="3.106.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.9.0",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.emf.ecore;bundle-version="2.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.infra.core.sasheditor.contentprovider,
+ org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple,
+ org.eclipse.papyrus.infra.core.sasheditor.editor,
+ org.eclipse.papyrus.infra.core.sasheditor.internal,
+ org.eclipse.papyrus.infra.core.sasheditor.pagesmodel,
+ org.eclipse.papyrus.infra.core.sasheditor.tests,
+ org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor,
+ org.eclipse.papyrus.infra.core.sasheditor.tests.utils,
+ org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak,
+ org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace,
+ org.eclipse.papyrus.infra.core.sasheditor.utils
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF
index 72f72d4c543..e66cbb025aa 100755
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.core.suite.tests.Activator

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.core.tests;bundle-version="[3.0.1,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="[1.3.0,2.0.0)"

+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 0.0.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.core.suite.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.suite.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.tests;bundle-version="[3.0.1,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="[1.3.0,2.0.0)"
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
index e6a1c7cc0a0..1c94cef06a8 100644
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)"

-Export-Package: org.eclipse.papyrus.infra.core.resource,

- org.eclipse.papyrus.infra.core.services,

- org.eclipse.papyrus.infra.core.tests

-Bundle-Vendor: %providerName

-Bundle-Version: 3.0.100.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.core.resource,
+ org.eclipse.papyrus.infra.core.services,
+ org.eclipse.papyrus.infra.core.tests
+Bundle-Vendor: %providerName
+Bundle-Version: 3.0.100.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.tests;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/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF
index 82f3b5ca1c9..69ab93f3a51 100644
--- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.editor.welcome.tests

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

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

- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:=reexport,

- org.junit;bundle-version="4.12.0";visibility:=reexport,

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

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

- org.eclipse.papyrus.junit.utils;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.tools;bundle-version="[3.0.0,4.0.0)",

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

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

- org.eclipse.core.databinding;bundle-version="1.6.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

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

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

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

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.editor.welcome.tests
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.editor.welcome;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:=reexport,
+ org.junit;bundle-version="4.12.0";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;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.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.databinding;bundle-version="1.6.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.editor.welcome.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF
index 022f5d99867..ed2123cb8d5 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.emf.gmf.tests,

- org.eclipse.papyrus.infra.emf.gmf.util.tests

-Require-Bundle: org.junit;bundle-version="4.12.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.100.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf.gmf.tests,
+ org.eclipse.papyrus.infra.emf.gmf.util.tests
+Require-Bundle: org.junit;bundle-version="4.12.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.100.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
index 2d9d4852326..f102d4b1a8e 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

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

- org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

-Export-Package: org.eclipse.papyrus.infra.emf.readonly,

- org.eclipse.papyrus.infra.emf.readonly.tests

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.emf.readonly,
+ org.eclipse.papyrus.infra.emf.readonly.tests
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.collect;version="21.0.0"
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.project b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.project
index c45d0ac7154..c9b3afc9717 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.project
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.emf.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.emf.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
index 0e131ec5114..044a80f861e 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.emf.advice,

- org.eclipse.papyrus.infra.emf.resource,

- org.eclipse.papyrus.infra.emf.resource.index,

- org.eclipse.papyrus.infra.emf.tests,

- org.eclipse.papyrus.infra.emf.utils

-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",

- org.junit;bundle-version="4.10.0",

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

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

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

- org.eclipse.papyrus.junit.utils;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.services.edit;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.4.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: fragment

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.tests;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.io;version="21.0.0",

- com.google.common.util.concurrent;version="21.0.0"

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf.advice,
+ org.eclipse.papyrus.infra.emf.resource,
+ org.eclipse.papyrus.infra.emf.resource.index,
+ org.eclipse.papyrus.infra.emf.tests,
+ org.eclipse.papyrus.infra.emf.utils
+Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;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.services.edit;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.4.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: fragment
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.tests;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.io;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/about.html b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/about.html
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/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/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/build.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/build.properties
index 0e0445f2f37..4c51b14e84e 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/build.properties
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = tests/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               fragment.properties,\

-               resources/

-src.includes = about.html,\

-               org.eclipse.papyrus.infra.emf.tests.launch

+source.. = tests/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               fragment.properties,\
+               resources/
+src.includes = about.html,\
+               org.eclipse.papyrus.infra.emf.tests.launch
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties
index 438acf1e574..81b6a3aa629 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2012 Cedric Dumoulin.

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

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

-# which accompanies this distribution, and is available at

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

-#

-# Contributors:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

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

-pluginName=Papyrus EMF Tests

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2012 Cedric Dumoulin.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus EMF Tests
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceTest.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceTest.java
index 9ad33a07c70..1d0bf36e3ba 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceTest.java
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceTest.java
@@ -1,107 +1,107 @@
-/*****************************************************************************

- * Copyright (c) 2012, 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:

- *  LIFL - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 431953 (fix start-up of selective services to require only their dependencies)

- */

-package org.eclipse.papyrus.infra.emf.utils;

-

-import static org.junit.Assert.assertNotNull;

-

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

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

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

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

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

-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

-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.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * @author dumoulin

- *

- */

-public class ServiceUtilsForResourceTest {

-

-	/**

-	 * @throws java.lang.Exception

-	 */

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	/**

-	 * @throws java.lang.Exception

-	 */

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource#getInstance()}.

-	 */

-	@Test

-	public void testGetInstance() {

-	

-		assertNotNull("Instance ready", ServiceUtilsForResource.getInstance());

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource#getServiceRegistry(org.eclipse.emf.ecore.resource.Resource)}.

-	 * @throws ServiceException 

-	 */

-	@Test

-	public void testGetServiceRegistryResource() throws ServiceException {

-

-

-		// Create services

-		ServicesRegistry servicesRegistry = new ServicesRegistry();

-		

-		ModelSet modelSet = new ModelSet();

-		URI uri = URI.createURI("temp.ecore");

-		

-		  // Register the default resource factory -- only needed for stand-alone!

-		modelSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(

-		    Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());

-

-		Resource resource = modelSet.createResource(uri);

-		assertNotNull("resource created", resource);

-		

-		EClass obj1 = EcoreFactory.eINSTANCE.createEClass();

-		EPackage pack2 = EcoreFactory.eINSTANCE.createEPackage();

-		EClass obj2 = EcoreFactory.eINSTANCE.createEClass();

-		pack2.getEClassifiers().add(obj2);		

-		resource.getContents().add(obj1);

-		resource.getContents().add(pack2);

-		

-		servicesRegistry.add(ModelSet.class, 10, modelSet);

-		

-		servicesRegistry.startServicesByClassKeys(ModelSet.class);

-		

-		// Check registry

-		assertNotNull("service ModelSet", servicesRegistry.getService(ModelSet.class) );

-		assertNotNull("ModelSet service not correctly initialized", ServiceUtils.getInstance().getModelSet(servicesRegistry) );

-		

-		// Do tests

-		ServicesRegistry r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(obj1.eResource());

-		assertNotNull("found from obj1", r2);

-		

-		r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(obj2.eResource());

-		assertNotNull("found from obj2", r2);

-

-		r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(pack2.eResource());

-		assertNotNull("found from pack2", r2);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 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:
+ *  LIFL - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431953 (fix start-up of selective services to require only their dependencies)
+ */
+package org.eclipse.papyrus.infra.emf.utils;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+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.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author dumoulin
+ *
+ */
+public class ServiceUtilsForResourceTest {
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@Before
+	public void setUp() throws Exception {
+	}
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@After
+	public void tearDown() throws Exception {
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource#getInstance()}.
+	 */
+	@Test
+	public void testGetInstance() {
+	
+		assertNotNull("Instance ready", ServiceUtilsForResource.getInstance());
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource#getServiceRegistry(org.eclipse.emf.ecore.resource.Resource)}.
+	 * @throws ServiceException 
+	 */
+	@Test
+	public void testGetServiceRegistryResource() throws ServiceException {
+
+
+		// Create services
+		ServicesRegistry servicesRegistry = new ServicesRegistry();
+		
+		ModelSet modelSet = new ModelSet();
+		URI uri = URI.createURI("temp.ecore");
+		
+		  // Register the default resource factory -- only needed for stand-alone!
+		modelSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(
+		    Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
+
+		Resource resource = modelSet.createResource(uri);
+		assertNotNull("resource created", resource);
+		
+		EClass obj1 = EcoreFactory.eINSTANCE.createEClass();
+		EPackage pack2 = EcoreFactory.eINSTANCE.createEPackage();
+		EClass obj2 = EcoreFactory.eINSTANCE.createEClass();
+		pack2.getEClassifiers().add(obj2);		
+		resource.getContents().add(obj1);
+		resource.getContents().add(pack2);
+		
+		servicesRegistry.add(ModelSet.class, 10, modelSet);
+		
+		servicesRegistry.startServicesByClassKeys(ModelSet.class);
+		
+		// Check registry
+		assertNotNull("service ModelSet", servicesRegistry.getService(ModelSet.class) );
+		assertNotNull("ModelSet service not correctly initialized", ServiceUtils.getInstance().getModelSet(servicesRegistry) );
+		
+		// Do tests
+		ServicesRegistry r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(obj1.eResource());
+		assertNotNull("found from obj1", r2);
+		
+		r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(obj2.eResource());
+		assertNotNull("found from obj2", r2);
+
+		r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(pack2.eResource());
+		assertNotNull("found from pack2", r2);
+	}
+
+}
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF
index 76b46800267..915859e373c 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

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

- org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

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

-Export-Package: org.eclipse.papyrus.infra.ui.emf.tests,

- org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.ui.emf.tests,
+ org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf.tests;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/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
index 16b32d0d291..d66d5885548 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
@@ -1,34 +1,34 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.tests

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

- org.junit;visibility:=reexport,

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

- org.eclipse.emf.ecore;bundle-version="2.11.0";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.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,

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

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

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

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

- org.eclipse.papyrus.infra.core;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.infra.types.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.gef;bundle-version="3.10.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",

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

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-Import-Package: com.google.common.base;version="21.0.0",

- com.google.common.collect;version="21.0.0"

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.tests
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit;visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="2.11.0";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.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.ui;bundle-version="1.7.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;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.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gef;bundle-version="3.10.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations
index 90182790064..42f4de7b071 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations
@@ -1,99 +1,99 @@
-<?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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_JHkF8Jg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Bean" identifier="org.eclipse.papyrus.example.j2ee.Bean" name="Bean">

-    <iconEntry xmi:id="_JHkF8pg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF85g0EeSrbqbUdG1DAA">

-      <stereotypesQualifiedNames>j2ee::Bean</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Finder" identifier="org.eclipse.papyrus.example.j2ee.Finder" name="Finder">

-    <iconEntry xmi:id="_JHkF9Zg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF9pg0EeSrbqbUdG1DAA">

-      <stereotypesQualifiedNames>j2ee::Finder</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Operation"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Import" identifier="org.eclipse.papyrus.example.j2ee.Import" name="Import">

-    <iconEntry xmi:id="_JHkF-Jg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF-Zg0EeSrbqbUdG1DAA">

-      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Web" identifier="org.eclipse.papyrus.example.j2ee.Web" name="Web">

-    <iconEntry xmi:id="_JHkF-5g0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF_Jg0EeSrbqbUdG1DAA">

-      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User" identifier="org.eclipse.papyrus.example.j2ee.User" name="User">

-    <iconEntry xmi:id="_JHkF_pg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF_5g0EeSrbqbUdG1DAA">

-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser" identifier="org.eclipse.papyrus.example.j2ee.Browser" name="Browser">

-    <iconEntry xmi:id="_JHkGAZg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGApg0EeSrbqbUdG1DAA">

-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint" name="BranchPoint">

-    <iconEntry xmi:id="_JHkGBJg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGBZg0EeSrbqbUdG1DAA">

-      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionPoint"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario" identifier="org.eclipse.papyrus.example.j2ee.WebScenario" name="WebScenario">

-    <iconEntry xmi:id="_JHkGB5g0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGCJg0EeSrbqbUdG1DAA">

-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGCZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.bean" target="org.eclipse.papyrus.example.j2ee.Bean">

-    <stereotypesToApply xmi:id="_JHkGCpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Bean" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGC5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.finder" target="org.eclipse.papyrus.example.j2ee.Finder">

-    <stereotypesToApply xmi:id="_JHkGDJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Finder" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGDZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.import" target="org.eclipse.papyrus.example.j2ee.Import">

-    <stereotypesToApply xmi:id="_JHkGDpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Import" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGD5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.web" target="org.eclipse.papyrus.example.j2ee.Web">

-    <stereotypesToApply xmi:id="_JHkGEJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Web" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGEZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.user" target="org.eclipse.papyrus.example.j2ee.User">

-    <stereotypesToApply xmi:id="_JHkGEpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::User" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGE5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.browser" target="org.eclipse.papyrus.example.j2ee.Browser">

-    <stereotypesToApply xmi:id="_JHkGFJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Browser" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGFZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.branchPoint" target="org.eclipse.papyrus.example.j2ee.BranchPoint">

-    <stereotypesToApply xmi:id="_JHkGFpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGF5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.webScenario" target="org.eclipse.papyrus.example.j2ee.WebScenario">

-    <stereotypesToApply xmi:id="_JHkGGJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_JHkF8Jg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Bean" identifier="org.eclipse.papyrus.example.j2ee.Bean" name="Bean">
+    <iconEntry xmi:id="_JHkF8pg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF85g0EeSrbqbUdG1DAA">
+      <stereotypesQualifiedNames>j2ee::Bean</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Finder" identifier="org.eclipse.papyrus.example.j2ee.Finder" name="Finder">
+    <iconEntry xmi:id="_JHkF9Zg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF9pg0EeSrbqbUdG1DAA">
+      <stereotypesQualifiedNames>j2ee::Finder</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Operation"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Import" identifier="org.eclipse.papyrus.example.j2ee.Import" name="Import">
+    <iconEntry xmi:id="_JHkF-Jg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF-Zg0EeSrbqbUdG1DAA">
+      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Web" identifier="org.eclipse.papyrus.example.j2ee.Web" name="Web">
+    <iconEntry xmi:id="_JHkF-5g0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF_Jg0EeSrbqbUdG1DAA">
+      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User" identifier="org.eclipse.papyrus.example.j2ee.User" name="User">
+    <iconEntry xmi:id="_JHkF_pg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF_5g0EeSrbqbUdG1DAA">
+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser" identifier="org.eclipse.papyrus.example.j2ee.Browser" name="Browser">
+    <iconEntry xmi:id="_JHkGAZg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGApg0EeSrbqbUdG1DAA">
+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint" name="BranchPoint">
+    <iconEntry xmi:id="_JHkGBJg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGBZg0EeSrbqbUdG1DAA">
+      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionPoint"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario" identifier="org.eclipse.papyrus.example.j2ee.WebScenario" name="WebScenario">
+    <iconEntry xmi:id="_JHkGB5g0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGCJg0EeSrbqbUdG1DAA">
+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGCZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.bean" target="org.eclipse.papyrus.example.j2ee.Bean">
+    <stereotypesToApply xmi:id="_JHkGCpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Bean" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGC5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.finder" target="org.eclipse.papyrus.example.j2ee.Finder">
+    <stereotypesToApply xmi:id="_JHkGDJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Finder" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGDZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.import" target="org.eclipse.papyrus.example.j2ee.Import">
+    <stereotypesToApply xmi:id="_JHkGDpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Import" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGD5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.web" target="org.eclipse.papyrus.example.j2ee.Web">
+    <stereotypesToApply xmi:id="_JHkGEJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Web" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGEZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.user" target="org.eclipse.papyrus.example.j2ee.User">
+    <stereotypesToApply xmi:id="_JHkGEpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::User" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGE5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.browser" target="org.eclipse.papyrus.example.j2ee.Browser">
+    <stereotypesToApply xmi:id="_JHkGFJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Browser" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGFZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.branchPoint" target="org.eclipse.papyrus.example.j2ee.BranchPoint">
+    <stereotypesToApply xmi:id="_JHkGFpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGF5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.webScenario" target="org.eclipse.papyrus.example.j2ee.WebScenario">
+    <stereotypesToApply xmi:id="_JHkGGJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
index 639353533e1..568cc26a27f 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
@@ -1,183 +1,183 @@
-<?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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Import_4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" hint="4013">

-    <iconEntry xmi:id="_PDKkspgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKks5gTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Web_4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" hint="4011">

-    <iconEntry xmi:id="_PDKktZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKktpgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" hint="3018">

-    <iconEntry xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" hint="3011">

-    <iconEntry xmi:id="_PDKku5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" hint="2011">

-    <iconEntry xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" hint="2012">

-    <iconEntry xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_ClassifierShape"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" hint="3018">

-    <iconEntry xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" hint="3011">

-    <iconEntry xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" hint="2011">

-    <iconEntry xmi:id="_PDKkypgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKky5gTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" hint="2012">

-    <iconEntry xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_ClassifierShape"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" hint="3007">

-    <iconEntry xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" hint="3008">

-    <iconEntry xmi:id="_PDKk05gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" hint="3012">

-    <iconEntry xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk15gTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape_CN"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" hint="2013">

-    <iconEntry xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" hint="2014">

-    <iconEntry xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ">

-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_ClassifierShape"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="org.eclipse.papyrus.example.j2ee.Import_4013">

-    <stereotypesToApply xmi:id="_PDKk35gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Import" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="org.eclipse.papyrus.example.j2ee.Web_4011">

-    <stereotypesToApply xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Web" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="org.eclipse.papyrus.example.j2ee.User_3018">

-    <stereotypesToApply xmi:id="_PDKk45gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="org.eclipse.papyrus.example.j2ee.User_3011">

-    <stereotypesToApply xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="org.eclipse.papyrus.example.j2ee.User_2011">

-    <stereotypesToApply xmi:id="_PDKk55gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="org.eclipse.papyrus.example.j2ee.User_2012">

-    <stereotypesToApply xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="org.eclipse.papyrus.example.j2ee.Browser_3018">

-    <stereotypesToApply xmi:id="_PDKk65gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="org.eclipse.papyrus.example.j2ee.Browser_3011">

-    <stereotypesToApply xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="org.eclipse.papyrus.example.j2ee.Browser_2011">

-    <stereotypesToApply xmi:id="_PDKk75gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="org.eclipse.papyrus.example.j2ee.Browser_2012">

-    <stereotypesToApply xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="org.eclipse.papyrus.example.j2ee.BranchPoint_3007">

-    <stereotypesToApply xmi:id="_PDKk85gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="org.eclipse.papyrus.example.j2ee.BranchPoint_3008">

-    <stereotypesToApply xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="org.eclipse.papyrus.example.j2ee.WebScenario_3012">

-    <stereotypesToApply xmi:id="_PDKk95gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="org.eclipse.papyrus.example.j2ee.WebScenario_2013">

-    <stereotypesToApply xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="org.eclipse.papyrus.example.j2ee.WebScenario_2014">

-    <stereotypesToApply xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Import_4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" hint="4013">
+    <iconEntry xmi:id="_PDKkspgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKks5gTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Web_4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" hint="4011">
+    <iconEntry xmi:id="_PDKktZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKktpgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" hint="3018">
+    <iconEntry xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" hint="3011">
+    <iconEntry xmi:id="_PDKku5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" hint="2011">
+    <iconEntry xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" hint="2012">
+    <iconEntry xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_ClassifierShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" hint="3018">
+    <iconEntry xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" hint="3011">
+    <iconEntry xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" hint="2011">
+    <iconEntry xmi:id="_PDKkypgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKky5gTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" hint="2012">
+    <iconEntry xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_ClassifierShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" hint="3007">
+    <iconEntry xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" hint="3008">
+    <iconEntry xmi:id="_PDKk05gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" hint="3012">
+    <iconEntry xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk15gTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape_CN"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" hint="2013">
+    <iconEntry xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" hint="2014">
+    <iconEntry xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_ClassifierShape"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="org.eclipse.papyrus.example.j2ee.Import_4013">
+    <stereotypesToApply xmi:id="_PDKk35gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Import" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="org.eclipse.papyrus.example.j2ee.Web_4011">
+    <stereotypesToApply xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Web" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="org.eclipse.papyrus.example.j2ee.User_3018">
+    <stereotypesToApply xmi:id="_PDKk45gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="org.eclipse.papyrus.example.j2ee.User_3011">
+    <stereotypesToApply xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="org.eclipse.papyrus.example.j2ee.User_2011">
+    <stereotypesToApply xmi:id="_PDKk55gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="org.eclipse.papyrus.example.j2ee.User_2012">
+    <stereotypesToApply xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="org.eclipse.papyrus.example.j2ee.Browser_3018">
+    <stereotypesToApply xmi:id="_PDKk65gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="org.eclipse.papyrus.example.j2ee.Browser_3011">
+    <stereotypesToApply xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="org.eclipse.papyrus.example.j2ee.Browser_2011">
+    <stereotypesToApply xmi:id="_PDKk75gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="org.eclipse.papyrus.example.j2ee.Browser_2012">
+    <stereotypesToApply xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="org.eclipse.papyrus.example.j2ee.BranchPoint_3007">
+    <stereotypesToApply xmi:id="_PDKk85gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="org.eclipse.papyrus.example.j2ee.BranchPoint_3008">
+    <stereotypesToApply xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="org.eclipse.papyrus.example.j2ee.WebScenario_3012">
+    <stereotypesToApply xmi:id="_PDKk95gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="org.eclipse.papyrus.example.j2ee.WebScenario_2013">
+    <stereotypesToApply xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="org.eclipse.papyrus.example.j2ee.WebScenario_2014">
+    <stereotypesToApply xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.project b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.project
index 718e1d52780..5556bd51a0b 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.project
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.gmfdiag.canonical.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.gmfdiag.canonical.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
index 931efc1c74c..20f104961e1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
@@ -1,35 +1,35 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.11.0",

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

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

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

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

- org.eclipse.papyrus.uml.diagram.clazz;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.emf;bundle-version="[3.0.0,4.0.0)",

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

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

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

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

- org.eclipse.gmf.codegen;bundle-version="2.11.0",

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

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

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.tests,

- org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;x-internal:=true

-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.canonical.tests.internal.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests;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
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;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.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ 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)",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.codegen;bundle-version="2.11.0",
+ org.eclipse.papyrus.gmfgenextension;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.tests,
+ org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;x-internal:=true
+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.canonical.tests.internal.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests;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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/about.html b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/about.html
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/build.properties b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/build.properties
index 54e8f43992d..a14417e24e9 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/build.properties
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               models/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               models/
+src.includes = about.html
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCSSCanonicalTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCSSCanonicalTest.java
index 2f6445c29bf..68ced01d33c 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCSSCanonicalTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCSSCanonicalTest.java
@@ -1,183 +1,183 @@
-/*****************************************************************************

- * 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.canonical.tests;

-

-import java.io.InputStream;

-import java.lang.annotation.ElementType;

-import java.lang.annotation.Retention;

-import java.lang.annotation.RetentionPolicy;

-import java.lang.annotation.Target;

-import java.net.URL;

-

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

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

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

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

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

-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.gmfdiag.common.databinding.custom.AddCustomStyleListValueCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

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

-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.databinding.AddCSSStyleSheetCommand;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;

-import org.eclipse.papyrus.junit.utils.JUnitUtils;

-import org.junit.Rule;

-import org.junit.rules.TestRule;

-import org.junit.rules.TestWatcher;

-import org.junit.runner.Description;

-import org.osgi.framework.FrameworkUtil;

-

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

-

-/**

- * Common implementation of canonical test cases for CSS.

- */

-public class AbstractCSSCanonicalTest extends AbstractCanonicalTest {

-	@Rule

-	public final TestRule stylesheetRule = new StylesheetRule();

-

-	protected IFile cssFile;

-

-	public AbstractCSSCanonicalTest() {

-		super();

-	}

-

-	protected EmbeddedStyleSheet getStylesheet(String name) {

-		EmbeddedStyleSheet result = null;

-

-		for (EmbeddedStyleSheet next : Iterables.filter(getDiagramEditPart().getNotationView().eResource().getContents(), EmbeddedStyleSheet.class)) {

-			if (name.equals(next.getLabel())) {

-				result = next;

-				break;

-			}

-		}

-

-		return result;

-	}

-

-	protected void referenceEmbeddedStylesheet(String name) {

-		referenceEmbeddedStylesheet(name, false);

-	}

-

-	private void referenceEmbeddedStylesheet(String name, boolean unsafe) {

-		TransactionalEditingDomain domain = editor.getEditingDomain();

-		View targetView = getDiagramEditPart().getNotationView();

-		EmbeddedStyleSheet css = getStylesheet(name);

-

-		Command command = new AddCSSStyleSheetCommand(domain, targetView,

-				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,

-				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,

-				css);

-

-		if (unsafe) {

-			command = GMFUnsafe.wrap(editor.getEditingDomain(), command);

-			command.execute();

-			domain.getCommandStack().flush(); // Just in case

-		} else {

-			domain.getCommandStack().execute(command);

-		}

-

-		waitForUIEvents();

-	}

-

-	protected void referenceExternalStylesheet(String path) {

-		referenceExternalStylesheet(path, false);

-	}

-

-	private void referenceExternalStylesheet(String path, boolean unsafe) {

-		TransactionalEditingDomain domain = editor.getEditingDomain();

-		View targetView = getDiagramEditPart().getNotationView();

-		StyleSheetReference css = StylesheetsFactory.eINSTANCE.createStyleSheetReference();

-		css.setPath(path);

-

-		Command command = new AddCSSStyleSheetCommand(domain, targetView,

-				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,

-				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,

-				css);

-

-		if (unsafe) {

-			command = GMFUnsafe.wrap(editor.getEditingDomain(), command);

-			command.execute();

-			domain.getCommandStack().flush(); // Just in case

-		} else {

-			domain.getCommandStack().execute(command);

-		}

-

-		waitForUIEvents();

-	}

-

-	protected void addStyleClass(View view, String name) {

-		TransactionalEditingDomain domain = editor.getEditingDomain();

-

-		Command command = new AddCustomStyleListValueCommand(domain, view,

-				CSSStyles.CSS_GMF_CLASS_KEY,

-				NotationPackage.Literals.STRING_LIST_VALUE_STYLE, NotationPackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE,

-				name);

-

-		domain.getCommandStack().execute(command);

-

-		waitForUIEvents();

-	}

-

-	protected void refreshDiagram() {

-		Diagram diagram = editor.getActiveDiagramEditor().getDiagram();

-		((CSSDiagram) diagram).getEngine().reset();

-		DiagramHelper.forceRefresh(editor.getActiveDiagramEditor().getDiagramEditPart());

-	}

-

-	//

-	// Nested types

-	//

-

-	@Retention(RetentionPolicy.RUNTIME)

-	@Target({ ElementType.TYPE, ElementType.METHOD })

-	protected @interface StylesheetRef {

-		String value();

-	}

-

-	@Retention(RetentionPolicy.RUNTIME)

-	@Target({ ElementType.TYPE, ElementType.METHOD })

-	protected @interface CSSResource {

-		String value();

-	}

-

-	private class StylesheetRule extends TestWatcher {

-		@Override

-		protected void starting(Description description) {

-			StylesheetRef ref = JUnitUtils.getAnnotation(description, StylesheetRef.class);

-			if (ref != null) {

-				referenceEmbeddedStylesheet(ref.value(), true);

-			}

-

-			CSSResource css = JUnitUtils.getAnnotation(description, CSSResource.class);

-			if (css != null) {

-				URL url = FrameworkUtil.getBundle(AbstractCSSCanonicalTest.this.getClass()).getEntry(css.value());

-				try (InputStream contents = url.openStream()) {

-					cssFile = editor.getProject().getProject().getFile(URI.createURI(url.toExternalForm()).lastSegment());

-					cssFile.create(contents, false, null);

-				} catch (Exception e) {

-					throw new WrappedException(e);

-				}

-				referenceExternalStylesheet(cssFile.getFullPath().toString(), true);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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.canonical.tests;
+
+import java.io.InputStream;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.net.URL;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+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.gmfdiag.common.databinding.custom.AddCustomStyleListValueCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
+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.databinding.AddCSSStyleSheetCommand;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;
+import org.eclipse.papyrus.junit.utils.JUnitUtils;
+import org.junit.Rule;
+import org.junit.rules.TestRule;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
+import org.osgi.framework.FrameworkUtil;
+
+import com.google.common.collect.Iterables;
+
+/**
+ * Common implementation of canonical test cases for CSS.
+ */
+public class AbstractCSSCanonicalTest extends AbstractCanonicalTest {
+	@Rule
+	public final TestRule stylesheetRule = new StylesheetRule();
+
+	protected IFile cssFile;
+
+	public AbstractCSSCanonicalTest() {
+		super();
+	}
+
+	protected EmbeddedStyleSheet getStylesheet(String name) {
+		EmbeddedStyleSheet result = null;
+
+		for (EmbeddedStyleSheet next : Iterables.filter(getDiagramEditPart().getNotationView().eResource().getContents(), EmbeddedStyleSheet.class)) {
+			if (name.equals(next.getLabel())) {
+				result = next;
+				break;
+			}
+		}
+
+		return result;
+	}
+
+	protected void referenceEmbeddedStylesheet(String name) {
+		referenceEmbeddedStylesheet(name, false);
+	}
+
+	private void referenceEmbeddedStylesheet(String name, boolean unsafe) {
+		TransactionalEditingDomain domain = editor.getEditingDomain();
+		View targetView = getDiagramEditPart().getNotationView();
+		EmbeddedStyleSheet css = getStylesheet(name);
+
+		Command command = new AddCSSStyleSheetCommand(domain, targetView,
+				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,
+				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,
+				css);
+
+		if (unsafe) {
+			command = GMFUnsafe.wrap(editor.getEditingDomain(), command);
+			command.execute();
+			domain.getCommandStack().flush(); // Just in case
+		} else {
+			domain.getCommandStack().execute(command);
+		}
+
+		waitForUIEvents();
+	}
+
+	protected void referenceExternalStylesheet(String path) {
+		referenceExternalStylesheet(path, false);
+	}
+
+	private void referenceExternalStylesheet(String path, boolean unsafe) {
+		TransactionalEditingDomain domain = editor.getEditingDomain();
+		View targetView = getDiagramEditPart().getNotationView();
+		StyleSheetReference css = StylesheetsFactory.eINSTANCE.createStyleSheetReference();
+		css.setPath(path);
+
+		Command command = new AddCSSStyleSheetCommand(domain, targetView,
+				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,
+				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,
+				css);
+
+		if (unsafe) {
+			command = GMFUnsafe.wrap(editor.getEditingDomain(), command);
+			command.execute();
+			domain.getCommandStack().flush(); // Just in case
+		} else {
+			domain.getCommandStack().execute(command);
+		}
+
+		waitForUIEvents();
+	}
+
+	protected void addStyleClass(View view, String name) {
+		TransactionalEditingDomain domain = editor.getEditingDomain();
+
+		Command command = new AddCustomStyleListValueCommand(domain, view,
+				CSSStyles.CSS_GMF_CLASS_KEY,
+				NotationPackage.Literals.STRING_LIST_VALUE_STYLE, NotationPackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE,
+				name);
+
+		domain.getCommandStack().execute(command);
+
+		waitForUIEvents();
+	}
+
+	protected void refreshDiagram() {
+		Diagram diagram = editor.getActiveDiagramEditor().getDiagram();
+		((CSSDiagram) diagram).getEngine().reset();
+		DiagramHelper.forceRefresh(editor.getActiveDiagramEditor().getDiagramEditPart());
+	}
+
+	//
+	// Nested types
+	//
+
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target({ ElementType.TYPE, ElementType.METHOD })
+	protected @interface StylesheetRef {
+		String value();
+	}
+
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target({ ElementType.TYPE, ElementType.METHOD })
+	protected @interface CSSResource {
+		String value();
+	}
+
+	private class StylesheetRule extends TestWatcher {
+		@Override
+		protected void starting(Description description) {
+			StylesheetRef ref = JUnitUtils.getAnnotation(description, StylesheetRef.class);
+			if (ref != null) {
+				referenceEmbeddedStylesheet(ref.value(), true);
+			}
+
+			CSSResource css = JUnitUtils.getAnnotation(description, CSSResource.class);
+			if (css != null) {
+				URL url = FrameworkUtil.getBundle(AbstractCSSCanonicalTest.this.getClass()).getEntry(css.value());
+				try (InputStream contents = url.openStream()) {
+					cssFile = editor.getProject().getProject().getFile(URI.createURI(url.toExternalForm()).lastSegment());
+					cssFile.create(contents, false, null);
+				} catch (Exception e) {
+					throw new WrappedException(e);
+				}
+				referenceExternalStylesheet(cssFile.getFullPath().toString(), true);
+			}
+		}
+	}
+
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/internal/Activator.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/internal/Activator.java
index a7a6a3c9e4f..3083aa43e00 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/internal/Activator.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/internal/Activator.java
@@ -1,44 +1,44 @@
-package org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;

-

-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.tests"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;
+
+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.tests"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF
index da21ce31126..c1f71e4a5de 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

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

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.commands.tests

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.commands.tests
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands.tests;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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStackTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStackTest.java
index 7c05b0425d6..aa083d38a1a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStackTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStackTest.java
@@ -1,227 +1,227 @@
-/*****************************************************************************

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

-

-import static org.hamcrest.CoreMatchers.is;

-import static org.hamcrest.MatcherAssert.assertThat;

-

-import org.eclipse.emf.common.command.AbstractCommand;

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

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

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.transaction.TransactionalCommandStack;

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

-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;

-import org.eclipse.papyrus.infra.emf.gmf.command.NotifyingWorkspaceCommandStack;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Regression tests for the {@link NotifyingWorkspaceCommandStack} class.

- */

-public class NotifyingWorkspaceCommandStackTest extends AbstractPapyrusTest {

-

-	private TransactionalEditingDomain domain;

-	private NotifyingWorkspaceCommandStack fixture;

-

-	@Test

-	public void dirtyAfterExecute() {

-		assertNotDirty();

-		execute(new TestCommand());

-		assertDirty();

-	}

-

-	@Test

-	public void notDirtyAfterExecuteNonDirtying() {

-		assertNotDirty();

-		execute(new NonDirtyingCommand());

-		assertNotDirty();

-	}

-

-	@Test

-	public void notDirtyAfterExecute_undo() {

-		assertNotDirty();

-		execute(new TestCommand());

-		undo();

-		assertNotDirty();

-	}

-

-	@Test

-	public void notDirtyAfterExecuteNonDirtying_undo() {

-		assertNotDirty();

-		execute(new NonDirtyingCommand());

-		undo();

-		assertNotDirty();

-	}

-

-	@Test

-	public void notDirtyAfterExecute_save() {

-		assertNotDirty();

-		execute(new TestCommand());

-		save();

-		assertNotDirty();

-	}

-

-	@Test

-	public void dirtyAfterExecute_save_undo() {

-		assertNotDirty();

-		execute(new TestCommand());

-		save();

-		undo();

-		assertDirty();

-	}

-

-	@Test

-	public void notDirtyAfterExecute_save_undo_save() {

-		assertNotDirty();

-		execute(new TestCommand());

-		save();

-		undo();

-		save();

-		assertNotDirty();

-	}

-

-	@Test

-	public void dirtyAfterExecute_save_undo_save_redo() {

-		assertNotDirty();

-		execute(new TestCommand());

-		save();

-		undo();

-		save();

-		redo();

-		assertDirty();

-	}

-

-	@Test

-	public void notDirtyAfterExecute_save_executeNonDirtying_undo_undo_redo_redo() {

-		assertNotDirty();

-		execute(new TestCommand());

-		save();

-		execute(new NonDirtyingCommand());

-		undo();

-		undo();

-		redo();

-		redo();

-		assertNotDirty();

-	}

-

-	@Test

-	public void notDirtyAfterExecute_save_execute_undo_undo_redo() {

-		assertNotDirty();

-		execute(new TestCommand());

-		save();

-		execute(new TestCommand());

-		undo();

-		undo();

-		redo();

-		assertNotDirty();

-	}

-

-	@Test

-	public void dirtyAfterExecute_save_execute_undo_undo_save_redo() {

-		assertNotDirty();

-		execute(new TestCommand());

-		save();

-		execute(new TestCommand());

-		undo();

-		undo();

-		save();

-		redo();

-		assertDirty();

-	}

-

-	//

-	// Test framework

-	//

-

-	@Before

-	public void createFixture() {

-		fixture = new NotifyingWorkspaceCommandStack(CheckedOperationHistory.getInstance());

-		AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-		domain = new TransactionalEditingDomainImpl(adapterFactory, (TransactionalCommandStack) fixture);

-	}

-

-	@After

-	public void destroyFixture() {

-		// This disposes the command stack for us

-		domain.dispose();

-		domain = null;

-		fixture = null;

-	}

-

-	void execute(Command command) {

-		assertThat("Cannot execute", command.canExecute(), is(true));

-		fixture.execute(command);

-	}

-

-	void undo() {

-		assertThat("Cannot undo", fixture.canUndo(), is(true));

-		fixture.undo();

-	}

-

-	void redo() {

-		assertThat("Cannot redo", fixture.canRedo(), is(true));

-		fixture.redo();

-	}

-

-	void save() {

-		assertDirty();

-		fixture.saveIsDone();

-	}

-

-	void assertDirty() {

-		assertThat("Stack is not dirty", fixture.isSaveNeeded(), is(true));

-	}

-

-	void assertNotDirty() {

-		assertThat("Stack is dirty", fixture.isSaveNeeded(), is(false));

-	}

-

-	static class TestCommand extends AbstractCommand {

-		TestCommand() {

-			super();

-		}

-

-		@Override

-		public boolean canExecute() {

-			return true;

-		}

-

-		public void execute() {

-			// Pass

-		}

-

-		@Override

-		public boolean canUndo() {

-			return true;

-		}

-

-		@Override

-		public void undo() {

-			// Pass

-		}

-

-		public void redo() {

-			// Pass

-		}

-	}

-

-	static class NonDirtyingCommand extends TestCommand implements AbstractCommand.NonDirtying {

-		NonDirtyingCommand() {

-			super();

-		}

-	}

-}

+/*****************************************************************************
+ * 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.commands;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.transaction.TransactionalCommandStack;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
+import org.eclipse.papyrus.infra.emf.gmf.command.NotifyingWorkspaceCommandStack;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Regression tests for the {@link NotifyingWorkspaceCommandStack} class.
+ */
+public class NotifyingWorkspaceCommandStackTest extends AbstractPapyrusTest {
+
+	private TransactionalEditingDomain domain;
+	private NotifyingWorkspaceCommandStack fixture;
+
+	@Test
+	public void dirtyAfterExecute() {
+		assertNotDirty();
+		execute(new TestCommand());
+		assertDirty();
+	}
+
+	@Test
+	public void notDirtyAfterExecuteNonDirtying() {
+		assertNotDirty();
+		execute(new NonDirtyingCommand());
+		assertNotDirty();
+	}
+
+	@Test
+	public void notDirtyAfterExecute_undo() {
+		assertNotDirty();
+		execute(new TestCommand());
+		undo();
+		assertNotDirty();
+	}
+
+	@Test
+	public void notDirtyAfterExecuteNonDirtying_undo() {
+		assertNotDirty();
+		execute(new NonDirtyingCommand());
+		undo();
+		assertNotDirty();
+	}
+
+	@Test
+	public void notDirtyAfterExecute_save() {
+		assertNotDirty();
+		execute(new TestCommand());
+		save();
+		assertNotDirty();
+	}
+
+	@Test
+	public void dirtyAfterExecute_save_undo() {
+		assertNotDirty();
+		execute(new TestCommand());
+		save();
+		undo();
+		assertDirty();
+	}
+
+	@Test
+	public void notDirtyAfterExecute_save_undo_save() {
+		assertNotDirty();
+		execute(new TestCommand());
+		save();
+		undo();
+		save();
+		assertNotDirty();
+	}
+
+	@Test
+	public void dirtyAfterExecute_save_undo_save_redo() {
+		assertNotDirty();
+		execute(new TestCommand());
+		save();
+		undo();
+		save();
+		redo();
+		assertDirty();
+	}
+
+	@Test
+	public void notDirtyAfterExecute_save_executeNonDirtying_undo_undo_redo_redo() {
+		assertNotDirty();
+		execute(new TestCommand());
+		save();
+		execute(new NonDirtyingCommand());
+		undo();
+		undo();
+		redo();
+		redo();
+		assertNotDirty();
+	}
+
+	@Test
+	public void notDirtyAfterExecute_save_execute_undo_undo_redo() {
+		assertNotDirty();
+		execute(new TestCommand());
+		save();
+		execute(new TestCommand());
+		undo();
+		undo();
+		redo();
+		assertNotDirty();
+	}
+
+	@Test
+	public void dirtyAfterExecute_save_execute_undo_undo_save_redo() {
+		assertNotDirty();
+		execute(new TestCommand());
+		save();
+		execute(new TestCommand());
+		undo();
+		undo();
+		save();
+		redo();
+		assertDirty();
+	}
+
+	//
+	// Test framework
+	//
+
+	@Before
+	public void createFixture() {
+		fixture = new NotifyingWorkspaceCommandStack(CheckedOperationHistory.getInstance());
+		AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		domain = new TransactionalEditingDomainImpl(adapterFactory, (TransactionalCommandStack) fixture);
+	}
+
+	@After
+	public void destroyFixture() {
+		// This disposes the command stack for us
+		domain.dispose();
+		domain = null;
+		fixture = null;
+	}
+
+	void execute(Command command) {
+		assertThat("Cannot execute", command.canExecute(), is(true));
+		fixture.execute(command);
+	}
+
+	void undo() {
+		assertThat("Cannot undo", fixture.canUndo(), is(true));
+		fixture.undo();
+	}
+
+	void redo() {
+		assertThat("Cannot redo", fixture.canRedo(), is(true));
+		fixture.redo();
+	}
+
+	void save() {
+		assertDirty();
+		fixture.saveIsDone();
+	}
+
+	void assertDirty() {
+		assertThat("Stack is not dirty", fixture.isSaveNeeded(), is(true));
+	}
+
+	void assertNotDirty() {
+		assertThat("Stack is dirty", fixture.isSaveNeeded(), is(false));
+	}
+
+	static class TestCommand extends AbstractCommand {
+		TestCommand() {
+			super();
+		}
+
+		@Override
+		public boolean canExecute() {
+			return true;
+		}
+
+		public void execute() {
+			// Pass
+		}
+
+		@Override
+		public boolean canUndo() {
+			return true;
+		}
+
+		@Override
+		public void undo() {
+			// Pass
+		}
+
+		public void redo() {
+			// Pass
+		}
+	}
+
+	static class NonDirtyingCommand extends TestCommand implements AbstractCommand.NonDirtying {
+		NonDirtyingCommand() {
+			super();
+		}
+	}
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/util/CommandTreeIteratorTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/util/CommandTreeIteratorTest.java
index 3ab07ce6d2c..750a2cb74e1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/util/CommandTreeIteratorTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/util/CommandTreeIteratorTest.java
@@ -1,194 +1,194 @@
-/*****************************************************************************

- * 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.commands.util;

-

-import static org.hamcrest.CoreMatchers.is;

-import static org.hamcrest.MatcherAssert.assertThat;

-

-import java.util.Iterator;

-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.common.command.AbstractCommand;

-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.common.core.command.CompositeCommand;

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

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

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

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

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

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

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

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.google.common.collect.Sets;

-

-/**

- * Test suite for the {@link CommandTreeIterator} class.

- */

-public class CommandTreeIteratorTest extends AbstractPapyrusTest {

-

-	private Object fixture;

-

-	private int gefCount;

-

-	private int emfCount;

-

-	private int gmfCount;

-

-	public CommandTreeIteratorTest() {

-		super();

-	}

-

-	@Test

-	public void gefCompoundsAndWrappers() {

-		assertThat(collectAll(fixture, Command.class).size(), is(gefCount));

-	}

-

-	@Test

-	public void emfCompoundsAndWrappers() {

-		assertThat(collectAll(fixture, org.eclipse.emf.common.command.Command.class).size(), is(emfCount));

-	}

-

-	@Test

-	public void gmfCompoundsAndWrappers() {

-		assertThat(collectAll(fixture, ICommand.class).size(), is(gmfCount));

-	}

-

-	@Test

-	public void genericCompoundsAndWrappers() {

-		assertThat(collectAll(fixture).size(), is(gefCount + emfCount + gmfCount));

-	}

-

-	//

-	// Test framework

-	//

-

-	@Before

-	public void createFixture() {

-		CompoundCommand compoundGEFCommand = new CompoundCommand();

-

-		// Add a simple EMF command wrapped

-		compoundGEFCommand.add(EMFtoGEFCommandWrapper.wrap(new TestEMFCommand()));

-

-		// Add a double-wrapped GMF command

-		compoundGEFCommand.add(EMFtoGEFCommandWrapper.wrap(GMFtoEMFCommandWrapper.wrap(new TestGMFCommand())));

-

-		// Add a (wrapped differently) GMF compound

-		CompositeCommand compoundGMFCommand = new CompositeCommand("composite");

-		compoundGEFCommand.add(new ICommandProxy(compoundGMFCommand));

-

-		// Add a GEF command (wrapped) to the GMF compound

-		compoundGMFCommand.add(new CommandProxy(new TestGEFCommand()));

-		compoundGMFCommand.add(EMFtoGMFCommandWrapper.wrap(GEFtoEMFCommandWrapper.wrap(new TestGEFCommand())));

-

-		// And now an EMF compound

-		org.eclipse.emf.common.command.CompoundCommand compoundEMFCommand = new org.eclipse.emf.common.command.CompoundCommand();

-		compoundGMFCommand.add(EMFtoGMFCommandWrapper.wrap(compoundEMFCommand));

-

-		// And an EMF command to the EMF compound

-		compoundEMFCommand.append(new TestEMFCommand());

-

-		// and a GEF command

-		compoundEMFCommand.append(GEFtoEMFCommandWrapper.wrap(new TestGEFCommand()));

-

-		// Top it off with a GMF command on the GMF compound

-		compoundGMFCommand.add(new TestGMFCommand());

-

-		fixture = compoundGEFCommand;

-	}

-

-	<C> Set<C> collectAll(Object command, Class<C> type) {

-		Set<C> result = Sets.newLinkedHashSet();

-

-		for (Iterator<C> iter = CommandTreeIterator.iterate(command, type); iter.hasNext();) {

-			result.add(iter.next());

-		}

-

-		return result;

-	}

-

-	Set<?> collectAll(Object command) {

-		Set<Object> result = Sets.newLinkedHashSet();

-

-		for (Iterator<?> iter = CommandTreeIterator.iterate(command); iter.hasNext();) {

-			result.add(iter.next());

-		}

-

-		return result;

-	}

-

-	//

-	// Nested types

-	//

-

-	private class TestEMFCommand extends AbstractCommand {

-		TestEMFCommand() {

-			super();

-

-			if (fixture == null) {

-				emfCount++;

-			}

-		}

-

-		public void execute() {

-			// Pass

-		}

-

-		public void redo() {

-			// Pass

-		}

-	}

-

-	private class TestGEFCommand extends Command {

-		TestGEFCommand() {

-			super();

-

-			if (fixture == null) {

-				gefCount++;

-			}

-		}

-	}

-

-	private class TestGMFCommand extends org.eclipse.gmf.runtime.common.core.command.AbstractCommand {

-		TestGMFCommand() {

-			super("test");

-

-			if (fixture == null) {

-				gmfCount++;

-			}

-		}

-

-		@Override

-		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			return CommandResult.newCancelledCommandResult();

-		}

-

-		@Override

-		protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			return CommandResult.newCancelledCommandResult();

-		}

-

-		@Override

-		protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			return CommandResult.newCancelledCommandResult();

-		}

-	}

-}

+/*****************************************************************************
+ * 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.commands.util;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.Iterator;
+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.common.command.AbstractCommand;
+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.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.collect.Sets;
+
+/**
+ * Test suite for the {@link CommandTreeIterator} class.
+ */
+public class CommandTreeIteratorTest extends AbstractPapyrusTest {
+
+	private Object fixture;
+
+	private int gefCount;
+
+	private int emfCount;
+
+	private int gmfCount;
+
+	public CommandTreeIteratorTest() {
+		super();
+	}
+
+	@Test
+	public void gefCompoundsAndWrappers() {
+		assertThat(collectAll(fixture, Command.class).size(), is(gefCount));
+	}
+
+	@Test
+	public void emfCompoundsAndWrappers() {
+		assertThat(collectAll(fixture, org.eclipse.emf.common.command.Command.class).size(), is(emfCount));
+	}
+
+	@Test
+	public void gmfCompoundsAndWrappers() {
+		assertThat(collectAll(fixture, ICommand.class).size(), is(gmfCount));
+	}
+
+	@Test
+	public void genericCompoundsAndWrappers() {
+		assertThat(collectAll(fixture).size(), is(gefCount + emfCount + gmfCount));
+	}
+
+	//
+	// Test framework
+	//
+
+	@Before
+	public void createFixture() {
+		CompoundCommand compoundGEFCommand = new CompoundCommand();
+
+		// Add a simple EMF command wrapped
+		compoundGEFCommand.add(EMFtoGEFCommandWrapper.wrap(new TestEMFCommand()));
+
+		// Add a double-wrapped GMF command
+		compoundGEFCommand.add(EMFtoGEFCommandWrapper.wrap(GMFtoEMFCommandWrapper.wrap(new TestGMFCommand())));
+
+		// Add a (wrapped differently) GMF compound
+		CompositeCommand compoundGMFCommand = new CompositeCommand("composite");
+		compoundGEFCommand.add(new ICommandProxy(compoundGMFCommand));
+
+		// Add a GEF command (wrapped) to the GMF compound
+		compoundGMFCommand.add(new CommandProxy(new TestGEFCommand()));
+		compoundGMFCommand.add(EMFtoGMFCommandWrapper.wrap(GEFtoEMFCommandWrapper.wrap(new TestGEFCommand())));
+
+		// And now an EMF compound
+		org.eclipse.emf.common.command.CompoundCommand compoundEMFCommand = new org.eclipse.emf.common.command.CompoundCommand();
+		compoundGMFCommand.add(EMFtoGMFCommandWrapper.wrap(compoundEMFCommand));
+
+		// And an EMF command to the EMF compound
+		compoundEMFCommand.append(new TestEMFCommand());
+
+		// and a GEF command
+		compoundEMFCommand.append(GEFtoEMFCommandWrapper.wrap(new TestGEFCommand()));
+
+		// Top it off with a GMF command on the GMF compound
+		compoundGMFCommand.add(new TestGMFCommand());
+
+		fixture = compoundGEFCommand;
+	}
+
+	<C> Set<C> collectAll(Object command, Class<C> type) {
+		Set<C> result = Sets.newLinkedHashSet();
+
+		for (Iterator<C> iter = CommandTreeIterator.iterate(command, type); iter.hasNext();) {
+			result.add(iter.next());
+		}
+
+		return result;
+	}
+
+	Set<?> collectAll(Object command) {
+		Set<Object> result = Sets.newLinkedHashSet();
+
+		for (Iterator<?> iter = CommandTreeIterator.iterate(command); iter.hasNext();) {
+			result.add(iter.next());
+		}
+
+		return result;
+	}
+
+	//
+	// Nested types
+	//
+
+	private class TestEMFCommand extends AbstractCommand {
+		TestEMFCommand() {
+			super();
+
+			if (fixture == null) {
+				emfCount++;
+			}
+		}
+
+		public void execute() {
+			// Pass
+		}
+
+		public void redo() {
+			// Pass
+		}
+	}
+
+	private class TestGEFCommand extends Command {
+		TestGEFCommand() {
+			super();
+
+			if (fixture == null) {
+				gefCount++;
+			}
+		}
+	}
+
+	private class TestGMFCommand extends org.eclipse.gmf.runtime.common.core.command.AbstractCommand {
+		TestGMFCommand() {
+			super("test");
+
+			if (fixture == null) {
+				gmfCount++;
+			}
+		}
+
+		@Override
+		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			return CommandResult.newCancelledCommandResult();
+		}
+
+		@Override
+		protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			return CommandResult.newCancelledCommandResult();
+		}
+
+		@Override
+		protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			return CommandResult.newCancelledCommandResult();
+		}
+	}
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.expansionmodel b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.expansionmodel
index 8e934ef7024..a2fd34c98af 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.expansionmodel
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.expansionmodel
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<expansionmodel:DiagramExpansion xmlns:expansionmodel="http:///expansionmodel.ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="test AddBorderItem" xmi:id="_BOX98NnkEeSFtu511b-yaw" xmi:version="2.0">

-  <usages diagramType="Class Diagram" name="Add acomparment on class of papyrus" representations="//@usages.0/@gmftRepresentations.0">

-    <gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart" name="Reuse representation of class of the class diagram" reusedID="Class_Shape" subRepresentations="//@libraries.0/@representations.0" viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"/>

-  </usages>

-  <libraries name="library">

-    <representations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart" name="Interface as BorderItem" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory" xsi:type="expansionmodel:Representation">

-      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

-    </representations>

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<expansionmodel:DiagramExpansion xmlns:expansionmodel="http:///expansionmodel.ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="test AddBorderItem" xmi:id="_BOX98NnkEeSFtu511b-yaw" xmi:version="2.0">
+  <usages diagramType="Class Diagram" name="Add acomparment on class of papyrus" representations="//@usages.0/@gmftRepresentations.0">
+    <gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart" name="Reuse representation of class of the class diagram" reusedID="Class_Shape" subRepresentations="//@libraries.0/@representations.0" viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"/>
+  </usages>
+  <libraries name="library">
+    <representations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart" name="Interface as BorderItem" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory" xsi:type="expansionmodel:Representation">
+      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+    </representations>
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.expansionmodel b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.expansionmodel
index 1e6ed880cf0..da83a080316 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.expansionmodel
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.expansionmodel
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<expansionmodel:DiagramExpansion xmlns:expansionmodel="http:///expansionmodel.ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="AddChildLabel" xmi:id="_BOX98NnkEeSFtu511b-yaw" xmi:version="2.0">

-  <usages diagramType="Class Diagram" name="Add acomparment on class of papyrus" representations="//@usages.0/@gmftRepresentations.0">

-    <gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart" inducedRepresentations="//@libraries.0/@representations.0" name="Reuse representation of class of the class diagram" reusedID="Class_Shape" viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"/>

-  </usages>

-  <libraries name="compartmentlibrary">

-    <representations children="//@libraries.0/@representations.1" editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart" hint="Implemented Interfaces" name="Compartment to implement interfaces" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory" xsi:type="expansionmodel:InducedRepresentation"/>

-    <representations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart" name="Nested Interface Label" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory" xsi:type="expansionmodel:Representation">

-      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

-    </representations>

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<expansionmodel:DiagramExpansion xmlns:expansionmodel="http:///expansionmodel.ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="AddChildLabel" xmi:id="_BOX98NnkEeSFtu511b-yaw" xmi:version="2.0">
+  <usages diagramType="Class Diagram" name="Add acomparment on class of papyrus" representations="//@usages.0/@gmftRepresentations.0">
+    <gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart" inducedRepresentations="//@libraries.0/@representations.0" name="Reuse representation of class of the class diagram" reusedID="Class_Shape" viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"/>
+  </usages>
+  <libraries name="compartmentlibrary">
+    <representations children="//@libraries.0/@representations.1" editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart" hint="Implemented Interfaces" name="Compartment to implement interfaces" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory" xsi:type="expansionmodel:InducedRepresentation"/>
+    <representations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart" name="Nested Interface Label" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory" xsi:type="expansionmodel:Representation">
+      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+    </representations>
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.expansionmodel b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.expansionmodel
index 5bddc29a7f8..6103fdb57d8 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.expansionmodel
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.expansionmodel
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="Add CompartmentText">

-  <usages diagramType="Class Diagram"

-      representations="//@usages.0/@gmftRepresentations.0"

-      name="Add acomparment on class of papyrus">

-    <gmftRepresentations

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"

-        name="Reuse respresentation of class of the class diagram"

-        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"

-        inducedRepresentations="//@libraries.0/@representations.0"

-        reusedID="Class_Shape"/>

-  </usages>

-  <libraries

-      name="compartmentlibrary">

-    <representations

-        xsi:type="expansionmodel:InducedRepresentation"

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"

-        name="Compartment to implement interfaces"

-        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"

-        hint="Implemented Interfaces"/>

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="Add CompartmentText">
+  <usages diagramType="Class Diagram"
+      representations="//@usages.0/@gmftRepresentations.0"
+      name="Add acomparment on class of papyrus">
+    <gmftRepresentations
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
+        name="Reuse respresentation of class of the class diagram"
+        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
+        inducedRepresentations="//@libraries.0/@representations.0"
+        reusedID="Class_Shape"/>
+  </usages>
+  <libraries
+      name="compartmentlibrary">
+    <representations
+        xsi:type="expansionmodel:InducedRepresentation"
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"
+        name="Compartment to implement interfaces"
+        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"
+        hint="Implemented Interfaces"/>
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.expansionmodel b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.expansionmodel
index 098a626dd38..ee6c736c9ff 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.expansionmodel
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.expansionmodel
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="Add CompartmentText">

-  <usages diagramType="Class Diagram"

-      representations="//@usages.0/@gmftRepresentations.0"

-      name="Add acomparment on class of papyrus">

-    <gmftRepresentations

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"

-        name="Reuse respresentation of class of the class diagram"

-        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"

-        inducedRepresentations="//@libraries.0/@representations.0"

-        reusedID="Class_Shape"/>

-  </usages>

-  <libraries

-      name="compartmentlibrary">

-    <representationkinds

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"

-        name="ListCompartment"

-        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"/>

-    <representations

-        xsi:type="expansionmodel:InducedRepresentation"

-        kind="//@libraries.0/@representationkinds.0"

-        name="Compartment to implement interfaces"

-        hint="Implemented Interfaces"/>

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="Add CompartmentText">
+  <usages diagramType="Class Diagram"
+      representations="//@usages.0/@gmftRepresentations.0"
+      name="Add acomparment on class of papyrus">
+    <gmftRepresentations
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
+        name="Reuse respresentation of class of the class diagram"
+        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
+        inducedRepresentations="//@libraries.0/@representations.0"
+        reusedID="Class_Shape"/>
+  </usages>
+  <libraries
+      name="compartmentlibrary">
+    <representationkinds
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"
+        name="ListCompartment"
+        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"/>
+    <representations
+        xsi:type="expansionmodel:InducedRepresentation"
+        kind="//@libraries.0/@representationkinds.0"
+        name="Compartment to implement interfaces"
+        hint="Implemented Interfaces"/>
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddLink.expansionmodel b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddLink.expansionmodel
index cde9b699de7..697db944774 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddLink.expansionmodel
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddLink.expansionmodel
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<expansionmodel:DiagramExpansion xmlns:expansionmodel="http:///expansionmodel.ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="test new link" xmi:id="_BOX98NnkEeSFtu511b-yaw" xmi:version="2.0">

-  <usages diagramType="Class Diagram" name="Add link on class of papyrus" representations="//@libraries.0/@representations.0"/>

-  <libraries name="library">

-    <representations description="" editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart" name="NewDependency" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ConnectorViewFactory" xsi:type="expansionmodel:Representation">

-      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

-    </representations>

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<expansionmodel:DiagramExpansion xmlns:expansionmodel="http:///expansionmodel.ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="test new link" xmi:id="_BOX98NnkEeSFtu511b-yaw" xmi:version="2.0">
+  <usages diagramType="Class Diagram" name="Add link on class of papyrus" representations="//@libraries.0/@representations.0"/>
+  <libraries name="library">
+    <representations description="" editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart" name="NewDependency" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ConnectorViewFactory" xsi:type="expansionmodel:Representation">
+      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+    </representations>
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadContextExpansion.expansionmodel b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadContextExpansion.expansionmodel
index a9a2086aae5..f58823e6855 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadContextExpansion.expansionmodel
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadContextExpansion.expansionmodel
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="BadContextTest">

-  <usages/>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="BadContextTest">
+  <usages/>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadElementTypeForExpansion.expansionmodel b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadElementTypeForExpansion.expansionmodel
index 1bece84aa49..5a0f366bc5a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadElementTypeForExpansion.expansionmodel
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadElementTypeForExpansion.expansionmodel
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="BadElementTupeforExpansion">

-  <usages diagramType="PapyrusUMLClassDiagram"

-      representations="//@libraries.0/@representations.0"

-      name="extension of the class diagram"/>

-  <libraries

-      name="Bad library">

-      <representations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart" name="Representation with bad graphical element Types" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory" xsi:type="expansionmodel:Representation">

-      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItemorg.eclipse.Titi" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

-    </representations>   

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="BadElementTupeforExpansion">
+  <usages diagramType="PapyrusUMLClassDiagram"
+      representations="//@libraries.0/@representations.0"
+      name="extension of the class diagram"/>
+  <libraries
+      name="Bad library">
+      <representations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart" name="Representation with bad graphical element Types" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory" xsi:type="expansionmodel:Representation">
+      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItemorg.eclipse.Titi" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+    </representations>   
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadProviderForExpansion.expansionmodel b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadProviderForExpansion.expansionmodel
index 988605cb8f6..88631eb0084 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadProviderForExpansion.expansionmodel
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/BadProviderForExpansion.expansionmodel
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="BadProviderForExpansion">

-  <usages diagramType="Class Diagram"

-      representations="//@libraries.0/@representations.0"

-      name="extension of the class diagram"/>

-  <libraries

-      name="Bad library">

-        <!--org.eclipse.papyrus.uml.Class-->

-    <representations editPartQualifiedName="Editpart_that_not_exists" name="Representation with providers that cannot be loaded" viewFactory="View Factory_that_not_exists" xsi:type="expansionmodel:Representation">

-      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

-    </representations> 

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="BadProviderForExpansion">
+  <usages diagramType="Class Diagram"
+      representations="//@libraries.0/@representations.0"
+      name="extension of the class diagram"/>
+  <libraries
+      name="Bad library">
+        <!--org.eclipse.papyrus.uml.Class-->
+    <representations editPartQualifiedName="Editpart_that_not_exists" name="Representation with providers that cannot be loaded" viewFactory="View Factory_that_not_exists" xsi:type="expansionmodel:Representation">
+      <graphicalElementTypeRef href="TestExpansionDiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+    </representations> 
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.di
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation
index 270ece7f0c2..0498d75c889 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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">

-  <notation:Diagram xmi:id="_zW-jQOKJEeSwE5hduTH6nQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_0OTz4OKJEeSwE5hduTH6nQ" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEOKJEeSwE5hduTH6nQ" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEeKJEeSwE5hduTH6nQ" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0OVpEuKJEeSwE5hduTH6nQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_XrHXgOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQIeKJEeSwE5hduTH6nQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_0OWQIuKJEeSwE5hduTH6nQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0OWQI-KJEeSwE5hduTH6nQ"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_XrH-kOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQJuKJEeSwE5hduTH6nQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3MOKJEeSwE5hduTH6nQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3MeKJEeSwE5hduTH6nQ"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_XrIloOumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_0OW3NOKJEeSwE5hduTH6nQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3NeKJEeSwE5hduTH6nQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3NuKJEeSwE5hduTH6nQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3N-KJEeSwE5hduTH6nQ"/>

-      </children>

-      <element xmi:type="uml:Class" href="ExpansionModelTest.uml#_0ONtQOKJEeSwE5hduTH6nQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OTz4eKJEeSwE5hduTH6nQ" x="180" y="80"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_zwbhEPPMEeSh3rAaWaQzhQ" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_zwgZkPPMEeSh3rAaWaQzhQ" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_zwhAoPPMEeSh3rAaWaQzhQ" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zwhAofPMEeSh3rAaWaQzhQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_XrJMsOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnsfPMEeSh3rAaWaQzhQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnsvPMEeSh3rAaWaQzhQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhns_PMEeSh3rAaWaQzhQ"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_XrJzwOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_zwhntvPMEeSh3rAaWaQzhQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnt_PMEeSh3rAaWaQzhQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnuPPMEeSh3rAaWaQzhQ"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_XrKa0OumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnu_PMEeSh3rAaWaQzhQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnvPPMEeSh3rAaWaQzhQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnvfPMEeSh3rAaWaQzhQ"/>

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

-      </children>

-      <element xmi:type="uml:Class" href="ExpansionModelTest.uml#__FNz0PMjEeSc2PGFYV7S2w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwbhEfPMEeSh3rAaWaQzhQ" x="460" y="80"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_zW-jQeKJEeSwE5hduTH6nQ" name="diagram_compatibility_version" stringValue="1.2.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_zW-jQuKJEeSwE5hduTH6nQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zW-jQ-KJEeSwE5hduTH6nQ">

-      <owner xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_eyWjYB6pEeeaxZx4sIiwfg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_fNdLAB6pEeeaxZx4sIiwfg" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_fNdLAh6pEeeaxZx4sIiwfg" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_fNdLAx6pEeeaxZx4sIiwfg" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fNdLBB6pEeeaxZx4sIiwfg" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_fNdLBR6pEeeaxZx4sIiwfg" type="Class_StructureCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_f1VDUB6pEeeaxZx4sIiwfg" type="Property_Shape">

-          <children xmi:type="notation:DecorationNode" xmi:id="_f1VDUh6pEeeaxZx4sIiwfg" type="Property_NameLabel"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_f1VDUx6pEeeaxZx4sIiwfg" type="Property_FloatingNameLabel">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_f1VDVB6pEeeaxZx4sIiwfg" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_f1VDVR6pEeeaxZx4sIiwfg" type="Property_StructureCompartment">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_f1VDVh6pEeeaxZx4sIiwfg"/>

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

-          </children>

-          <element xmi:type="uml:Property" href="ExpansionModelTest.uml#_f1LSUB6pEeeaxZx4sIiwfg"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f1VDUR6pEeeaxZx4sIiwfg" x="55" y="68"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_fNdLBh6pEeeaxZx4sIiwfg"/>

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

-      </children>

-      <element xmi:type="uml:Class" href="ExpansionModelTest.uml#_fNTaAB6pEeeaxZx4sIiwfg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fNdLAR6pEeeaxZx4sIiwfg" x="248" y="149" width="553" height="271"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_eyWjYR6pEeeaxZx4sIiwfg" name="diagram_compatibility_version" stringValue="1.2.0"/>

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

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_eyWjYx6pEeeaxZx4sIiwfg">

-      <owner xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>

-  </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: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">
+  <notation:Diagram xmi:id="_zW-jQOKJEeSwE5hduTH6nQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_0OTz4OKJEeSwE5hduTH6nQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEOKJEeSwE5hduTH6nQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEeKJEeSwE5hduTH6nQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0OVpEuKJEeSwE5hduTH6nQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XrHXgOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQIeKJEeSwE5hduTH6nQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0OWQIuKJEeSwE5hduTH6nQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0OWQI-KJEeSwE5hduTH6nQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OWQJOKJEeSwE5hduTH6nQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XrH-kOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQJuKJEeSwE5hduTH6nQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3MOKJEeSwE5hduTH6nQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3MeKJEeSwE5hduTH6nQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3MuKJEeSwE5hduTH6nQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XrIloOumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0OW3NOKJEeSwE5hduTH6nQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3NeKJEeSwE5hduTH6nQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3NuKJEeSwE5hduTH6nQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3N-KJEeSwE5hduTH6nQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="ExpansionModelTest.uml#_0ONtQOKJEeSwE5hduTH6nQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OTz4eKJEeSwE5hduTH6nQ" x="180" y="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_zwbhEPPMEeSh3rAaWaQzhQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zwgZkPPMEeSh3rAaWaQzhQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zwhAoPPMEeSh3rAaWaQzhQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zwhAofPMEeSh3rAaWaQzhQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XrJMsOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnsfPMEeSh3rAaWaQzhQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnsvPMEeSh3rAaWaQzhQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhns_PMEeSh3rAaWaQzhQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhntPPMEeSh3rAaWaQzhQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XrJzwOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zwhntvPMEeSh3rAaWaQzhQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnt_PMEeSh3rAaWaQzhQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnuPPMEeSh3rAaWaQzhQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnufPMEeSh3rAaWaQzhQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XrKa0OumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnu_PMEeSh3rAaWaQzhQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnvPPMEeSh3rAaWaQzhQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnvfPMEeSh3rAaWaQzhQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnvvPMEeSh3rAaWaQzhQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="ExpansionModelTest.uml#__FNz0PMjEeSc2PGFYV7S2w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwbhEfPMEeSh3rAaWaQzhQ" x="460" y="80"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_zW-jQeKJEeSwE5hduTH6nQ" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_zW-jQuKJEeSwE5hduTH6nQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zW-jQ-KJEeSwE5hduTH6nQ">
+      <owner xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_eyWjYB6pEeeaxZx4sIiwfg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_fNdLAB6pEeeaxZx4sIiwfg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fNdLAh6pEeeaxZx4sIiwfg" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fNdLAx6pEeeaxZx4sIiwfg" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fNdLBB6pEeeaxZx4sIiwfg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fNdLBR6pEeeaxZx4sIiwfg" type="Class_StructureCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_f1VDUB6pEeeaxZx4sIiwfg" type="Property_Shape">
+          <children xmi:type="notation:DecorationNode" xmi:id="_f1VDUh6pEeeaxZx4sIiwfg" type="Property_NameLabel"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_f1VDUx6pEeeaxZx4sIiwfg" type="Property_FloatingNameLabel">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_f1VDVB6pEeeaxZx4sIiwfg" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_f1VDVR6pEeeaxZx4sIiwfg" type="Property_StructureCompartment">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_f1VDVh6pEeeaxZx4sIiwfg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f1VDVx6pEeeaxZx4sIiwfg"/>
+          </children>
+          <element xmi:type="uml:Property" href="ExpansionModelTest.uml#_f1LSUB6pEeeaxZx4sIiwfg"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f1VDUR6pEeeaxZx4sIiwfg" x="55" y="68"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fNdLBh6pEeeaxZx4sIiwfg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fNdLBx6pEeeaxZx4sIiwfg"/>
+      </children>
+      <element xmi:type="uml:Class" href="ExpansionModelTest.uml#_fNTaAB6pEeeaxZx4sIiwfg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fNdLAR6pEeeaxZx4sIiwfg" x="248" y="149" width="553" height="271"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_eyWjYR6pEeeaxZx4sIiwfg" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_eyWjYh6pEeeaxZx4sIiwfg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_eyWjYx6pEeeaxZx4sIiwfg">
+      <owner xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.uml
index 28b1bb9af09..2151a3d68ac 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.uml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.uml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_zV8ogOKJEeSwE5hduTH6nQ" name="Model">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_zV8ogeKJEeSwE5hduTH6nQ">

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

-  </packageImport>

-  <packagedElement xmi:type="uml:Class" xmi:id="_0ONtQOKJEeSwE5hduTH6nQ" name="MyClass">

-    <nestedClassifier xmi:type="uml:Interface" xmi:id="_DpZwsPMkEeSc2PGFYV7S2w" name="MyNestedInterface"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="__FNz0PMjEeSc2PGFYV7S2w" name="MyOtherClass"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_fNTaAB6pEeeaxZx4sIiwfg" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_f1LSUB6pEeeaxZx4sIiwfg" name="Attribute1"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_zV8ogOKJEeSwE5hduTH6nQ" name="Model">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_zV8ogeKJEeSwE5hduTH6nQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_0ONtQOKJEeSwE5hduTH6nQ" name="MyClass">
+    <nestedClassifier xmi:type="uml:Interface" xmi:id="_DpZwsPMkEeSc2PGFYV7S2w" name="MyNestedInterface"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="__FNz0PMjEeSc2PGFYV7S2w" name="MyOtherClass"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_fNTaAB6pEeeaxZx4sIiwfg" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_f1LSUB6pEeeaxZx4sIiwfg" name="Attribute1"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants
index 4a7f85b1969..d2027d74c91 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" name="PapyrusUMLClassDiagram">

-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.umldi.Class_Shape"/>

-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="MyNestedInterface" elementTypeID="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label"/>

-  <ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/>

-  <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" filter="//@ownedFilter.0"/>

-  <elementTypeID>org.eclipse.papyrus.umldi.Class_Shape</elementTypeID>

-  <elementTypeID>org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label</elementTypeID>

-</assistant:ModelingAssistantProvider>

+<?xml version="1.0" encoding="UTF-8"?>
+<assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" name="PapyrusUMLClassDiagram">
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.umldi.Class_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="MyNestedInterface" elementTypeID="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label"/>
+  <ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/>
+  <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" filter="//@ownedFilter.0"/>
+  <elementTypeID>org.eclipse.papyrus.umldi.Class_Shape</elementTypeID>
+  <elementTypeID>org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label</elementTypeID>
+</assistant:ModelingAssistantProvider>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/NullExpansion.expansionmodel b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/NullExpansion.expansionmodel
index baaacad2c17..843737c4e9a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/NullExpansion.expansionmodel
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/NullExpansion.expansionmodel
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="NullExpansionTest"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="NullExpansionTest"/>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations
index b8207ee61b5..f9577a6710d 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations
@@ -1,15 +1,15 @@
-<?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" identifier="TestExpansionDiagram" name="TestExpansionDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" name="Interface" hint="Interface_Label">

-    <iconEntry xmi:id="_rWNxVXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" name="Interface" hint="Interface_BorderItem">

-    <iconEntry xmi:id="_C-1XIeN1EeSPY_4fjIBntw" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" name="Dependency" hint="Dependency_Link">

-    <iconEntry xmi:id="_Tm5Y0fPMEeSh3rAaWaQzhQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>

-  </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="_rWI4YHPzEeSnGJwaJWHCSg" identifier="TestExpansionDiagram" name="TestExpansionDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" name="Interface" hint="Interface_Label">
+    <iconEntry xmi:id="_rWNxVXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" name="Interface" hint="Interface_BorderItem">
+    <iconEntry xmi:id="_C-1XIeN1EeSPY_4fjIBntw" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" name="Dependency" hint="Dependency_Link">
+    <iconEntry xmi:id="_Tm5Y0fPMEeSh3rAaWaQzhQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
+  </elementTypeConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/org.eclipse.papyrus.infra.gmfdiag.common.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/org.eclipse.papyrus.infra.gmfdiag.common.tests.launch
index efb6789b0b1..7e25cdc155a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/org.eclipse.papyrus.infra.gmfdiag.common.tests.launch
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/org.eclipse.papyrus.infra.gmfdiag.common.tests.launch
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="org.eclipse.papyrus.infra.gmfdiag.common"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.dnd/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.common/src"/>

-</listAttribute>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.common.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Doomph.setup.skip=true"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="true"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="org.eclipse.papyrus.infra.gmfdiag.common"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">
+<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.dnd/src"/>
+<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.common/src"/>
+</listAttribute>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.common.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Doomph.setup.skip=true"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="true"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/plugin.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/plugin.xml
index 0c39a506f83..47914f331cf 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/plugin.xml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/plugin.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<fragment>

-   <extension

-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">

-      <elementTypeSet

-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

-            path="models/TestExpansionDiagram.elementtypesconfigurations">

-      </elementTypeSet>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.sync.triggers">

-      <syncTrigger

-            class="org.eclipse.papyrus.infra.gmfdiag.common.sync.tests.TestSyncFixture$TestClassDiagramSyncTrigger">

-      </syncTrigger>

-   </extension>

-

-</fragment>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<fragment>
+   <extension
+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+      <elementTypeSet
+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
+            path="models/TestExpansionDiagram.elementtypesconfigurations">
+      </elementTypeSet>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.sync.triggers">
+      <syncTrigger
+            class="org.eclipse.papyrus.infra.gmfdiag.common.sync.tests.TestSyncFixture$TestClassDiagramSyncTrigger">
+      </syncTrigger>
+   </extension>
+
+</fragment>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/LoadExpansionModel.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/LoadExpansionModel.java
index cb28d057500..48c73472f16 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/LoadExpansionModel.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/LoadExpansionModel.java
@@ -1,93 +1,93 @@
-/*****************************************************************************

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

-

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

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionSingleton;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionsRegistry;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * this Test is used to test if expansion can be loaded

- * see #Test T001-Load ExpansionModel

- *

- */

-public class LoadExpansionModel extends AbstractPapyrusTest {

-

-	@Test

-	public void init_DiagramExpansionRegistry() {

-		DiagramExpansionsRegistry diagramExpansionsRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();

-		diagramExpansionsRegistry.clear();

-		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());

-		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());

-	}

-

-	@Test

-	public void load_DiagramExpansion() {

-		DiagramExpansionsRegistry diagramExpansionsRegistry = loadXMIExpansionModel("NullExpansion.expansionmodel");

-		Assert.assertEquals("Size ot the registry must be equals to 1", 1, diagramExpansionsRegistry.getDiagramExpansions().size());

-		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());

-

-	}

-

-	@Test

-	public void load_BadDiagramExpansion() {

-		DiagramExpansionsRegistry diagramExpansionsRegistry = loadXMIExpansionModel("BadContextExpansion.expansionmodel");

-

-		// This model is not valid so it is not loaded

-		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());

-		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());

-	}

-

-	@Test

-	public void load_BadProviderDiagramExpansion() {

-		DiagramExpansionsRegistry diagramExpansionsRegistry = loadXMIExpansionModel("BadProviderForExpansion.expansionmodel");

-

-		// This model is not valid so it is not loaded

-		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());

-		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());

-	}

-

-	@Test

-	public void load_BadelementTypeDiagramExpansion() {

-		DiagramExpansionsRegistry diagramExpansionsRegistry = loadXMIExpansionModel("BadElementTypeForExpansion.expansionmodel");

-

-		// This model is not valid so it is not loaded

-		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());

-		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());

-	}

-

-	protected DiagramExpansionsRegistry loadXMIExpansionModel(String filename) {

-		DiagramExpansionsRegistry diagramExpansionsRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();

-		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());

-		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());

-		URI badContextExpansion = URI.createPlatformPluginURI("org.eclipse.papyrus.infra.gmfdiag.common.tests", true);

-		badContextExpansion = badContextExpansion.appendSegment("models");

-		badContextExpansion = badContextExpansion.appendSegment(filename);

-

-		diagramExpansionsRegistry.loadExpansion(badContextExpansion);

-		return diagramExpansionsRegistry;

-	}

-

-	@After

-	@Before

-	public void clearExpansionRegistry() {

-		DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry().clear();

-	}

-

-}

+/*****************************************************************************
+ * 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.tests;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionSingleton;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionsRegistry;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * this Test is used to test if expansion can be loaded
+ * see #Test T001-Load ExpansionModel
+ *
+ */
+public class LoadExpansionModel extends AbstractPapyrusTest {
+
+	@Test
+	public void init_DiagramExpansionRegistry() {
+		DiagramExpansionsRegistry diagramExpansionsRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();
+		diagramExpansionsRegistry.clear();
+		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());
+		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());
+	}
+
+	@Test
+	public void load_DiagramExpansion() {
+		DiagramExpansionsRegistry diagramExpansionsRegistry = loadXMIExpansionModel("NullExpansion.expansionmodel");
+		Assert.assertEquals("Size ot the registry must be equals to 1", 1, diagramExpansionsRegistry.getDiagramExpansions().size());
+		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());
+
+	}
+
+	@Test
+	public void load_BadDiagramExpansion() {
+		DiagramExpansionsRegistry diagramExpansionsRegistry = loadXMIExpansionModel("BadContextExpansion.expansionmodel");
+
+		// This model is not valid so it is not loaded
+		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());
+		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());
+	}
+
+	@Test
+	public void load_BadProviderDiagramExpansion() {
+		DiagramExpansionsRegistry diagramExpansionsRegistry = loadXMIExpansionModel("BadProviderForExpansion.expansionmodel");
+
+		// This model is not valid so it is not loaded
+		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());
+		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());
+	}
+
+	@Test
+	public void load_BadelementTypeDiagramExpansion() {
+		DiagramExpansionsRegistry diagramExpansionsRegistry = loadXMIExpansionModel("BadElementTypeForExpansion.expansionmodel");
+
+		// This model is not valid so it is not loaded
+		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());
+		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());
+	}
+
+	protected DiagramExpansionsRegistry loadXMIExpansionModel(String filename) {
+		DiagramExpansionsRegistry diagramExpansionsRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();
+		Assert.assertEquals("Size ot the registry must be equals to 0", 0, diagramExpansionsRegistry.getDiagramExpansions().size());
+		Assert.assertEquals("Size ot the map childreen must be equals to 0", 0, diagramExpansionsRegistry.mapChildreen.size());
+		URI badContextExpansion = URI.createPlatformPluginURI("org.eclipse.papyrus.infra.gmfdiag.common.tests", true);
+		badContextExpansion = badContextExpansion.appendSegment("models");
+		badContextExpansion = badContextExpansion.appendSegment(filename);
+
+		diagramExpansionsRegistry.loadExpansion(badContextExpansion);
+		return diagramExpansionsRegistry;
+	}
+
+	@After
+	@Before
+	public void clearExpansionRegistry() {
+		DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry().clear();
+	}
+
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project
index ff2463a3162..dc1904b8c69 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.gmfdiag.css.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.gmfdiag.css.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
index 6d982d5b2d7..60548753c19 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
@@ -1,36 +1,36 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

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

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

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

- org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;bundle-version="[3.0.0,4.0.0)",

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

- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

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

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

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

- org.eclipse.core.resources;bundle-version="3.8.0",

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

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

- org.junit;bundle-version="4.10.0",

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

- org.eclipse.core.databinding;bundle-version="1.4.1",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests,

- org.eclipse.papyrus.infra.gmfdiag.css.tests.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: CSS Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests,
+ org.eclipse.papyrus.infra.gmfdiag.css.tests.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: CSS Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties
index c89f5eb10cb..d86e66890b5 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               resources/,\

-               about.html,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               resources/,\
+               about.html,\
+               plugin.xml
+src.includes = about.html
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di
index c1e4f445dce..dd040596777 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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="model.notation#_MDVbsHTIEeG92qGoaUUGLQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_MDVbsHTIEeG92qGoaUUGLQ"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<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="model.notation#_MDVbsHTIEeG92qGoaUUGLQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_MDVbsHTIEeG92qGoaUUGLQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml
index 10f71c39957..a2c578a5ca3 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MBtEAHTIEeG92qGoaUUGLQ" name="model">

-  <packagedElement xmi:type="uml:Interface" xmi:id="_PGr38HTIEeG92qGoaUUGLQ" name="Interface1"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MBtEAHTIEeG92qGoaUUGLQ" name="model">
+  <packagedElement xmi:type="uml:Interface" xmi:id="_PGr38HTIEeG92qGoaUUGLQ" name="Interface1"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.di
index b38a75b62ee..b09e23648e1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.di
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.di
@@ -1,23 +1,23 @@
-<?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="model.notation#_4EGG0ImVEeOGN4dVepS-Uw"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_8JDKAImVEeOGN4dVepS-Uw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_4EGG0ImVEeOGN4dVepS-Uw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="model.notation#_8JDKAImVEeOGN4dVepS-Uw"/>

-        </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="model.notation#_4EGG0ImVEeOGN4dVepS-Uw"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="model.notation#_8JDKAImVEeOGN4dVepS-Uw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_4EGG0ImVEeOGN4dVepS-Uw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="model.notation#_8JDKAImVEeOGN4dVepS-Uw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml
index d1eaf6c61a4..ba43ff5a952 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4DWgNImVEeOGN4dVepS-Uw" name="CSSTests">

-  <ownedComment xmi:type="uml:Comment" xmi:id="__TiJAImVEeOGN4dVepS-Uw">

-    <body>Test model for CSS in Luna >= M5 (Compartments, Labels)</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_9S_YIImWEeOGN4dVepS-Uw" annotatedElement="_CzvgYImWEeOGN4dVepS-Uw">

-    <body>Expected: Attribute collapsed, Nested classifier hidden</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_D1WR4ImXEeOGN4dVepS-Uw" annotatedElement="_61R_kImWEeOGN4dVepS-Uw">

-    <body>Expected: Compartments hidden</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_TnYnQImXEeOGN4dVepS-Uw" annotatedElement="_DpvUQImWEeOGN4dVepS-Uw">

-    <body>Expected: Collapsed = false</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_anMSAImXEeOGN4dVepS-Uw" annotatedElement="_az5twImWEeOGN4dVepS-Uw">

-    <body>Expected: Attribute and Operation visible</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_Tfr8cImaEeOGN4dVepS-Uw" annotatedElement="_DZrfAImWEeOGN4dVepS-Uw">

-    <body>Expected: Compartment Attribute and Operation visible</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_TlMukImaEeOGN4dVepS-Uw" annotatedElement="_1epSEImWEeOGN4dVepS-Uw">

-    <body>Expected: Only operation compartment is visible</body>

-  </ownedComment>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_4DWgNYmVEeOGN4dVepS-Uw">

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

-  </packageImport>

-  <packagedElement xmi:type="uml:Class" xmi:id="_CzvgYImWEeOGN4dVepS-Uw" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_U81zwImWEeOGN4dVepS-Uw" name="P1"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_VDYgoImWEeOGN4dVepS-Uw" name="P2"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_VJCcsImWEeOGN4dVepS-Uw" name="P3"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_DZrfAImWEeOGN4dVepS-Uw" name="Interface1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_V6u_YImWEeOGN4dVepS-Uw" name="Attribute1"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_DpvUQImWEeOGN4dVepS-Uw" name="Enumeration1">

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EAgOcImWEeOGN4dVepS-Uw" name="EnumerationLiteral1"/>

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ENAZYImWEeOGN4dVepS-Uw" name="EnumerationLiteral2"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_az5twImWEeOGN4dVepS-Uw" name="Class2">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_cSOF4ImWEeOGN4dVepS-Uw" name="P"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_1epSEImWEeOGN4dVepS-Uw" name="Interface2"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_61R_kImWEeOGN4dVepS-Uw" name="Class3"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4DWgNImVEeOGN4dVepS-Uw" name="CSSTests">
+  <ownedComment xmi:type="uml:Comment" xmi:id="__TiJAImVEeOGN4dVepS-Uw">
+    <body>Test model for CSS in Luna >= M5 (Compartments, Labels)</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_9S_YIImWEeOGN4dVepS-Uw" annotatedElement="_CzvgYImWEeOGN4dVepS-Uw">
+    <body>Expected: Attribute collapsed, Nested classifier hidden</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_D1WR4ImXEeOGN4dVepS-Uw" annotatedElement="_61R_kImWEeOGN4dVepS-Uw">
+    <body>Expected: Compartments hidden</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_TnYnQImXEeOGN4dVepS-Uw" annotatedElement="_DpvUQImWEeOGN4dVepS-Uw">
+    <body>Expected: Collapsed = false</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_anMSAImXEeOGN4dVepS-Uw" annotatedElement="_az5twImWEeOGN4dVepS-Uw">
+    <body>Expected: Attribute and Operation visible</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_Tfr8cImaEeOGN4dVepS-Uw" annotatedElement="_DZrfAImWEeOGN4dVepS-Uw">
+    <body>Expected: Compartment Attribute and Operation visible</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_TlMukImaEeOGN4dVepS-Uw" annotatedElement="_1epSEImWEeOGN4dVepS-Uw">
+    <body>Expected: Only operation compartment is visible</body>
+  </ownedComment>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_4DWgNYmVEeOGN4dVepS-Uw">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_CzvgYImWEeOGN4dVepS-Uw" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_U81zwImWEeOGN4dVepS-Uw" name="P1"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_VDYgoImWEeOGN4dVepS-Uw" name="P2"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_VJCcsImWEeOGN4dVepS-Uw" name="P3"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_DZrfAImWEeOGN4dVepS-Uw" name="Interface1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_V6u_YImWEeOGN4dVepS-Uw" name="Attribute1"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_DpvUQImWEeOGN4dVepS-Uw" name="Enumeration1">
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EAgOcImWEeOGN4dVepS-Uw" name="EnumerationLiteral1"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ENAZYImWEeOGN4dVepS-Uw" name="EnumerationLiteral2"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_az5twImWEeOGN4dVepS-Uw" name="Class2">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_cSOF4ImWEeOGN4dVepS-Uw" name="P"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_1epSEImWEeOGN4dVepS-Uw" name="Interface2"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_61R_kImWEeOGN4dVepS-Uw" name="Class3"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.di
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.uml
index 706f72612e0..3b4cd8f0e9b 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.uml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.uml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ANMzQP4fEeSePJTjmnYBcA" name="RootElement">

-  <packagedElement xmi:type="uml:Class" xmi:id="_dtIjwCCUEeWbLoxdAKQ_jg" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_tO0wACCUEeWbLoxdAKQ_jg" name="class2" type="_ix1zwCCUEeWbLoxdAKQ_jg" association="_tOupYCCUEeWbLoxdAKQ_jg"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_ix1zwCCUEeWbLoxdAKQ_jg" name="Class2">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_tO0wASCUEeWbLoxdAKQ_jg" name="class1" type="_dtIjwCCUEeWbLoxdAKQ_jg" association="_tOupYCCUEeWbLoxdAKQ_jg"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_tOupYCCUEeWbLoxdAKQ_jg" name="associationName" memberEnd="_tO0wACCUEeWbLoxdAKQ_jg _tO0wASCUEeWbLoxdAKQ_jg">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tOupYSCUEeWbLoxdAKQ_jg" source="org.eclipse.papyrus">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tOupYiCUEeWbLoxdAKQ_jg" key="nature" value="UML_Nature"/>

-    </eAnnotations>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Abstraction" xmi:id="_yuXh4CCUEeWbLoxdAKQ_jg" client="_dtIjwCCUEeWbLoxdAKQ_jg" supplier="_ix1zwCCUEeWbLoxdAKQ_jg"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ANMzQP4fEeSePJTjmnYBcA" name="RootElement">
+  <packagedElement xmi:type="uml:Class" xmi:id="_dtIjwCCUEeWbLoxdAKQ_jg" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_tO0wACCUEeWbLoxdAKQ_jg" name="class2" type="_ix1zwCCUEeWbLoxdAKQ_jg" association="_tOupYCCUEeWbLoxdAKQ_jg"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ix1zwCCUEeWbLoxdAKQ_jg" name="Class2">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_tO0wASCUEeWbLoxdAKQ_jg" name="class1" type="_dtIjwCCUEeWbLoxdAKQ_jg" association="_tOupYCCUEeWbLoxdAKQ_jg"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_tOupYCCUEeWbLoxdAKQ_jg" name="associationName" memberEnd="_tO0wACCUEeWbLoxdAKQ_jg _tO0wASCUEeWbLoxdAKQ_jg">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tOupYSCUEeWbLoxdAKQ_jg" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tOupYiCUEeWbLoxdAKQ_jg" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Abstraction" xmi:id="_yuXh4CCUEeWbLoxdAKQ_jg" client="_dtIjwCCUEeWbLoxdAKQ_jg" supplier="_ix1zwCCUEeWbLoxdAKQ_jg"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.di
index 15fd7df2e2b..a8838c28bdd 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.di
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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="model.notation#_o6cwoH_vEeGjwt6V_QPj1Q"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_o6cwoH_vEeGjwt6V_QPj1Q"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<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="model.notation#_o6cwoH_vEeGjwt6V_QPj1Q"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_o6cwoH_vEeGjwt6V_QPj1Q"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.uml
index 44c585df1d3..e8fa769a5e1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.uml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.uml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o6SYkH_vEeGjwt6V_QPj1Q" name="Model">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_o6SYkX_vEeGjwt6V_QPj1Q">

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

-  </packageImport>

-  <packagedElement xmi:type="uml:Class" xmi:id="_pqo3cH_vEeGjwt6V_QPj1Q" name="Class1"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_pwFYIH_vEeGjwt6V_QPj1Q" name="Class2"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_qQ-esH_vEeGjwt6V_QPj1Q" name="Interface1"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_qWPZMH_vEeGjwt6V_QPj1Q" name="Interface2"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_qcCfMH_vEeGjwt6V_QPj1Q" name="Interface3"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_j6agEIABEeGwNeJPoDbgzg" name="Package1"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="__AZ18IABEeGwNeJPoDbgzg" name="Class3" isAbstract="true"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="__TtMcIABEeGwNeJPoDbgzg" name="Class4" isAbstract="true"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="__jacYIABEeGwNeJPoDbgzg" name="Class5" isAbstract="true"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_aQb4oIACEeGwNeJPoDbgzg" name="Class6"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_b0lL8IACEeGwNeJPoDbgzg" name="Class7" isAbstract="true"/>

-  <packagedElement xmi:type="uml:Component" xmi:id="_PSFcoNt1EeOqjfzVFOrWIg" name="Component1"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o6SYkH_vEeGjwt6V_QPj1Q" name="Model">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_o6SYkX_vEeGjwt6V_QPj1Q">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_pqo3cH_vEeGjwt6V_QPj1Q" name="Class1"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_pwFYIH_vEeGjwt6V_QPj1Q" name="Class2"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_qQ-esH_vEeGjwt6V_QPj1Q" name="Interface1"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_qWPZMH_vEeGjwt6V_QPj1Q" name="Interface2"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_qcCfMH_vEeGjwt6V_QPj1Q" name="Interface3"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_j6agEIABEeGwNeJPoDbgzg" name="Package1"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="__AZ18IABEeGwNeJPoDbgzg" name="Class3" isAbstract="true"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="__TtMcIABEeGwNeJPoDbgzg" name="Class4" isAbstract="true"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="__jacYIABEeGwNeJPoDbgzg" name="Class5" isAbstract="true"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_aQb4oIACEeGwNeJPoDbgzg" name="Class6"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_b0lL8IACEeGwNeJPoDbgzg" name="Class7" isAbstract="true"/>
+  <packagedElement xmi:type="uml:Component" xmi:id="_PSFcoNt1EeOqjfzVFOrWIg" name="Component1"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.di
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.uml
index fb950fbbc96..3f816e76ee5 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.uml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.uml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_bx7cEP76EeSxqMY0na5WMQ" name="RootElement">

-  <ownedComment xmi:type="uml:Comment" xmi:id="_9xte0P77EeSStPeINaOwzA" annotatedElement="_lkV74P77EeSStPeINaOwzA">

-    <body>name = null</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_-BdyEP77EeSStPeINaOwzA" annotatedElement="_xZT-wP77EeSStPeINaOwzA">

-    <body>name = &quot;&quot;</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_APDD8P78EeSStPeINaOwzA" annotatedElement="_lXoVkP77EeSStPeINaOwzA">

-    <body>name = &quot;NamedClass&quot;</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_FlpVMP78EeSStPeINaOwzA" annotatedElement="_QTkF4P77EeSStPeINaOwzA">

-    <body>Untyped: not bold&#xD;

-unnamedType: bold&#xD;

-namedType: bold&#xD;

-emptyNameType: bold</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_N7EIAP78EeSStPeINaOwzA" annotatedElement="_QTkF4P77EeSStPeINaOwzA">

-    <body>namedType: red</body>

-  </ownedComment>

-  <packagedElement xmi:type="uml:Class" xmi:id="_QTkF4P77EeSStPeINaOwzA" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_hxLMQP77EeSStPeINaOwzA" name="untyped"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_i3mBwP77EeSStPeINaOwzA" name="unnamedType" type="_lkV74P77EeSStPeINaOwzA"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_jiyT0P77EeSStPeINaOwzA" name="namedType" type="_lXoVkP77EeSStPeINaOwzA"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_ufWvEP77EeSStPeINaOwzA" name="emptyNameType" type="_xZT-wP77EeSStPeINaOwzA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_lXoVkP77EeSStPeINaOwzA" name="NamedClass"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_lkV74P77EeSStPeINaOwzA"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_xZT-wP77EeSStPeINaOwzA" name=""/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_bx7cEP76EeSxqMY0na5WMQ" name="RootElement">
+  <ownedComment xmi:type="uml:Comment" xmi:id="_9xte0P77EeSStPeINaOwzA" annotatedElement="_lkV74P77EeSStPeINaOwzA">
+    <body>name = null</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_-BdyEP77EeSStPeINaOwzA" annotatedElement="_xZT-wP77EeSStPeINaOwzA">
+    <body>name = &quot;&quot;</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_APDD8P78EeSStPeINaOwzA" annotatedElement="_lXoVkP77EeSStPeINaOwzA">
+    <body>name = &quot;NamedClass&quot;</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_FlpVMP78EeSStPeINaOwzA" annotatedElement="_QTkF4P77EeSStPeINaOwzA">
+    <body>Untyped: not bold&#xD;
+unnamedType: bold&#xD;
+namedType: bold&#xD;
+emptyNameType: bold</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_N7EIAP78EeSStPeINaOwzA" annotatedElement="_QTkF4P77EeSStPeINaOwzA">
+    <body>namedType: red</body>
+  </ownedComment>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QTkF4P77EeSStPeINaOwzA" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_hxLMQP77EeSStPeINaOwzA" name="untyped"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_i3mBwP77EeSStPeINaOwzA" name="unnamedType" type="_lkV74P77EeSStPeINaOwzA"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_jiyT0P77EeSStPeINaOwzA" name="namedType" type="_lXoVkP77EeSStPeINaOwzA"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ufWvEP77EeSStPeINaOwzA" name="emptyNameType" type="_xZT-wP77EeSStPeINaOwzA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_lXoVkP77EeSStPeINaOwzA" name="NamedClass"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_lkV74P77EeSStPeINaOwzA"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_xZT-wP77EeSStPeINaOwzA" name=""/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.di
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.uml
index 9cf91a55465..5651d5542fc 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.uml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.uml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_w0uLIIeLEeWWuLbIMcUiMw" name="RootElement">

-  <packagedElement xmi:type="uml:Class" xmi:id="_xoqJgIeLEeWWuLbIMcUiMw" name="Class1"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_w0uLIIeLEeWWuLbIMcUiMw" name="RootElement">
+  <packagedElement xmi:type="uml:Class" xmi:id="_xoqJgIeLEeWWuLbIMcUiMw" name="Class1"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di
index 15fd7df2e2b..a8838c28bdd 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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="model.notation#_o6cwoH_vEeGjwt6V_QPj1Q"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_o6cwoH_vEeGjwt6V_QPj1Q"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<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="model.notation#_o6cwoH_vEeGjwt6V_QPj1Q"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_o6cwoH_vEeGjwt6V_QPj1Q"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml
index e063ffd6ed3..2596b5e95db 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_o6SYkH_vEeGjwt6V_QPj1Q" name="Model">

-  <packageImport xmi:id="_o6SYkX_vEeGjwt6V_QPj1Q">

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

-  </packageImport>

-  <packagedElement xmi:type="uml:Class" xmi:id="_pqo3cH_vEeGjwt6V_QPj1Q" name="Class1"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_pwFYIH_vEeGjwt6V_QPj1Q" name="Class2"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_qQ-esH_vEeGjwt6V_QPj1Q" name="Interface1"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_qWPZMH_vEeGjwt6V_QPj1Q" name="Interface2"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_qcCfMH_vEeGjwt6V_QPj1Q" name="Interface3"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_j6agEIABEeGwNeJPoDbgzg" name="Package1"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="__AZ18IABEeGwNeJPoDbgzg" name="Class3" isAbstract="true"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="__TtMcIABEeGwNeJPoDbgzg" name="Class4" isAbstract="true"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="__jacYIABEeGwNeJPoDbgzg" name="Class5" isAbstract="true"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_aQb4oIACEeGwNeJPoDbgzg" name="Class6"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_b0lL8IACEeGwNeJPoDbgzg" name="Class7" isAbstract="true"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_o6SYkH_vEeGjwt6V_QPj1Q" name="Model">
+  <packageImport xmi:id="_o6SYkX_vEeGjwt6V_QPj1Q">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_pqo3cH_vEeGjwt6V_QPj1Q" name="Class1"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_pwFYIH_vEeGjwt6V_QPj1Q" name="Class2"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_qQ-esH_vEeGjwt6V_QPj1Q" name="Interface1"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_qWPZMH_vEeGjwt6V_QPj1Q" name="Interface2"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_qcCfMH_vEeGjwt6V_QPj1Q" name="Interface3"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_j6agEIABEeGwNeJPoDbgzg" name="Package1"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="__AZ18IABEeGwNeJPoDbgzg" name="Class3" isAbstract="true"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="__TtMcIABEeGwNeJPoDbgzg" name="Class4" isAbstract="true"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="__jacYIABEeGwNeJPoDbgzg" name="Class5" isAbstract="true"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_aQb4oIACEeGwNeJPoDbgzg" name="Class6"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_b0lL8IACEeGwNeJPoDbgzg" name="Class7" isAbstract="true"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/ModelStylesheetTest.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/ModelStylesheetTest.css
index 4dee630a69c..e18ed37400e 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/ModelStylesheetTest.css
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/ModelStylesheetTest.css
@@ -1,15 +1,15 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

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

-

-/* Component in Red */

-Component {

-	gradient:none;

-	fillColor:lime;

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+
+/* Component in Red */
+Component {
+	gradient:none;
+	fillColor:lime;
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css
index f45a4299049..c12a92c4b42 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css
@@ -1,98 +1,98 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which 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 0.9 CSS

-*	Test stylesheet for #getAvailableClasses()

-*/

-

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

- * All cX should be matched for Interfaces (c01 ~ c17) 

- * xX should not be matched for Interfaces

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

-

-

-/**************** Ignored Selector *********************/

-

-.anyClass {

-	

-}

-

-/**************** Simple selectors *********************/

-

-

-*.c01{

-	

-}

-

-Interface.c02{

-	

-}

-

-.c03 {

-	

-}

-

-.c04, .c05, .c06 {

-	

-}

-

-Class.x01{

-	

-}

-

-#x05 {

-	

-}

-

-/************ Combinator selectors **************/

-

-.c07 .c08 {

-	

-}

-.c09 Class.x02{

-	

-}

-

-.c10 > Class.x03{

-	

-}

-

-Interface.c11 + Class.x04 {

-	

-}

-

-*.c12 + Interface.c13 {

-	

-}

-

-/************* Combinator Conditions ****************/

-

-#x06:x07 {

-	

-}

-

-.c14#x8:x09{

-	

-}

-

-Interface.c15#x10{

-	

-}

-

-#x11.c16 {

-	

-}

-

-#x12.c17:x13 {

-	

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which 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 0.9 CSS
+*	Test stylesheet for #getAvailableClasses()
+*/
+
+/******************************************************** 
+ * All cX should be matched for Interfaces (c01 ~ c17) 
+ * xX should not be matched for Interfaces
+ *******************************************************/
+
+
+/**************** Ignored Selector *********************/
+
+.anyClass {
+	
+}
+
+/**************** Simple selectors *********************/
+
+
+*.c01{
+	
+}
+
+Interface.c02{
+	
+}
+
+.c03 {
+	
+}
+
+.c04, .c05, .c06 {
+	
+}
+
+Class.x01{
+	
+}
+
+#x05 {
+	
+}
+
+/************ Combinator selectors **************/
+
+.c07 .c08 {
+	
+}
+.c09 Class.x02{
+	
+}
+
+.c10 > Class.x03{
+	
+}
+
+Interface.c11 + Class.x04 {
+	
+}
+
+*.c12 + Interface.c13 {
+	
+}
+
+/************* Combinator Conditions ****************/
+
+#x06:x07 {
+	
+}
+
+.c14#x8:x09{
+	
+}
+
+Interface.c15#x10{
+	
+}
+
+#x11.c16 {
+	
+}
+
+#x12.c17:x13 {
+	
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css
index d38b353f6f8..ce9c058e2c6 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css
@@ -1,35 +1,35 @@
-* {

-	showTitle: false;

-}

-

-/* Check showTitle, to avoid priority conflicts with more specific rules */

-.showTitleForAllCompartments Compartment {

-	showTitle: true;

-}

-

-Interface > Compartment[kind=attributes],

-Interface > Compartment[kind=nestedclassifiers] {

-	visible:false;

-}

-

-Interface[ownedAttribute] > Compartment[kind=attributes]{

-	visible:true;

-}

-

-Compartment[kind=nestedclassifiers] {

-	visible: false;

-}

-

-

-/* Collapse the Attribute compartment if the Class contains a P1 attribute (Displayed) */

-Class[ownedAttribute~="P1"] > Compartment[kind=attributes]{

-	collapsed: true;

-}

-

-Enumeration > Compartment {

-	collapsed: true;

-}

-

-Enumeration > Compartment[kind=LiteRalS]{ /* Case insensitive */

-	collapsed: false;

-}

+* {
+	showTitle: false;
+}
+
+/* Check showTitle, to avoid priority conflicts with more specific rules */
+.showTitleForAllCompartments Compartment {
+	showTitle: true;
+}
+
+Interface > Compartment[kind=attributes],
+Interface > Compartment[kind=nestedclassifiers] {
+	visible:false;
+}
+
+Interface[ownedAttribute] > Compartment[kind=attributes]{
+	visible:true;
+}
+
+Compartment[kind=nestedclassifiers] {
+	visible: false;
+}
+
+
+/* Collapse the Attribute compartment if the Class contains a P1 attribute (Displayed) */
+Class[ownedAttribute~="P1"] > Compartment[kind=attributes]{
+	collapsed: true;
+}
+
+Enumeration > Compartment {
+	collapsed: true;
+}
+
+Enumeration > Compartment[kind=LiteRalS]{ /* Case insensitive */
+	collapsed: false;
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css
index 2bde9cb9630..f68c2f92139 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which 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 0.9 CSS

-*	Main test stylesheet

-*/

-

-* {

-	gradient:red vertical;

-}

-

-Class {

-	gradient:none;

-	fillColor:red;

-}

-

-Interface {

-	fillColor:yellow;

-}

-

-Interface.myInterface {

-	fontName:KaiTi; /* TODO: The font name should be case insensitive */

-	fillColor:lightgreen;

-	gradient:dEEpSKyBluE lightgreen horizontal;

-	elementIcon:false;

-}

-

-Package {

-	fillColor:white;

-}

-

-/* White elements */

-Class.myClass.myOtherClass, Class.myClass {

-	fillColor:white;

-	gradient:none;

-	bold:false;

-	fontName: Tunga;

-}

-

-/* Blue + Gradient + Bold */

-Class[isAbstract=true] {

-	bold:true;

-	fillColor: rgb(195, 205, 255);

-	gradient: white vertical;

-}

-

-Component {

-	gradient:none;

-	fillColor:rgb(0, 0, 255);

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which 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 0.9 CSS
+*	Main test stylesheet
+*/
+
+* {
+	gradient:red vertical;
+}
+
+Class {
+	gradient:none;
+	fillColor:red;
+}
+
+Interface {
+	fillColor:yellow;
+}
+
+Interface.myInterface {
+	fontName:KaiTi; /* TODO: The font name should be case insensitive */
+	fillColor:lightgreen;
+	gradient:dEEpSKyBluE lightgreen horizontal;
+	elementIcon:false;
+}
+
+Package {
+	fillColor:white;
+}
+
+/* White elements */
+Class.myClass.myOtherClass, Class.myClass {
+	fillColor:white;
+	gradient:none;
+	bold:false;
+	fontName: Tunga;
+}
+
+/* Blue + Gradient + Bold */
+Class[isAbstract=true] {
+	bold:true;
+	fillColor: rgb(195, 205, 255);
+	gradient: white vertical;
+}
+
+Component {
+	gradient:none;
+	fillColor:rgb(0, 0, 255);
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java
index 5994b38d491..2c72a12f0cf 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/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.tests;

-

-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.tests"; //$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.tests;
+
+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.tests"; //$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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AbstractCSSStylesheetTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AbstractCSSStylesheetTest.java
index ca677ae058b..247d6a14ea1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AbstractCSSStylesheetTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AbstractCSSStylesheetTest.java
@@ -1,154 +1,154 @@
-/*****************************************************************************

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

- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;

-

-import java.util.Iterator;

-

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

-import org.eclipse.gmf.runtime.notation.GradientStyle;

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

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

-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

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

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- *

- * An abstract Class to test CSSStylesheet. The Papyrus model tested is "../../model/stylesheetTest/".

- * In the daughter's class you must implement initCSSTheme() with the @BeforeClass tag and init() with the @Before tag.

- *

- * @author Mickael ADAM

- *

- */

-public abstract class AbstractCSSStylesheetTest extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	protected CSSDiagram diagram;

-

-	@Test

-	public void testClassStyle() {

-		Shape classView = findShape("Class1");

-		if(classView == null) {

-			return;

-		}

-		Assert.assertEquals("Invalid color", rgb(255, 0, 0), classView.getFillColor()); //Red = #FF0000

-		Assert.assertNull("Invalid gradient", classView.getGradient());

-		Assert.assertTrue("The element icon should be displayed", AppearanceHelper.showElementIcon(classView));

-	}

-

-	@Test

-	public void testInterfaceStyle() {

-		Shape interfaceView = findShape("Interface1");

-		Assert.assertNotNull("The interface should have a gradient", interfaceView.getGradient());

-		Assert.assertEquals("The fill color should be yellow", rgb(255, 255, 0), interfaceView.getFillColor()); //Yellow = #FFFF00

-		Assert.assertEquals("The gradient should be red", rgb(255, 0, 0), interfaceView.getGradient().getGradientColor1()); //Red = #FF0000

-		Assert.assertEquals("The gradient should be vertical", GradientStyle.VERTICAL, interfaceView.getGradient().getGradientStyle());

-		Assert.assertTrue("The element icon should be displayed", AppearanceHelper.showElementIcon(interfaceView));

-	}

-

-	@Test

-	public void testCSSClassStyle() {

-		Shape interfaceView = findShape("Interface2");

-		Assert.assertNotNull("The interface should have a gradient", interfaceView.getGradient());

-		Assert.assertEquals("The fill color should be light green (#90EE90)", rgb(144, 238, 144), interfaceView.getFillColor()); //Lightgreen = #90EE90

-		//Case insensitive color name

-		Assert.assertEquals(rgb(0, 191, 255), interfaceView.getGradient().getGradientColor1()); //DeepSkyBlue = #00BFFF

-		Assert.assertEquals(GradientStyle.HORIZONTAL, interfaceView.getGradient().getGradientStyle());

-		Assert.assertFalse(AppearanceHelper.showElementIcon(interfaceView));

-		//TODO: Font names should be case-insensitive

-		Assert.assertEquals("KaiTi", interfaceView.getFontName());

-	}

-

-	@Test

-	public void testPackage() {

-		Shape packageView = findShape("Package1");

-		Assert.assertNotNull(packageView.getGradient());

-		//Inherited style (From *)

-		Assert.assertEquals(rgb(255, 0, 0), packageView.getGradient().getGradientColor1()); //Red = #FF0000

-	}

-

-	@Test

-	public void testPriorities() {

-		//Tests the priorities between styles:

-		//.myClass : Low priority

-		//.myClass.myOtherClass : Highest priority

-		//[isAbstract=true] : Medium priority

-		//Styles should also be merged when they aren't conflicting (ie. [isAbstract] + .myClass -> fontName = Tunga)

-		Shape class3 = findShape("Class3");

-		Shape class5 = findShape("Class5");

-		testBlueStyle(class3); //isAbstract

-		testBlueStyle(class5); //isAbstract

-		Shape class4 = findShape("Class4");

-		testWhiteStyle(class4); //.myClass.myOtherClass (Overrides isAbstract)

-		testFontName(class4); //.myClass (Doesn't conflict with isAbstract)

-		Shape class6 = findShape("Class6");

-		testWhiteStyle(class6); //.myClass

-		testFontName(class6); //.myClass

-		Shape class7 = findShape("Class7");

-		testBlueStyle(class7); //isAbstract

-		testFontName(class7); //.myClass (Doesn't conflict with isAbstract)

-	}

-

-	private void testBlueStyle(Shape shape) {

-		Assert.assertEquals(rgb(195, 205, 255), shape.getFillColor()); //rgb syntax

-		Assert.assertTrue(shape.isBold());

-		Assert.assertNotNull(shape.getGradient());

-	}

-

-	private void testWhiteStyle(Shape shape) {

-		Assert.assertEquals(rgb(255, 255, 255), shape.getFillColor()); //White = #FFFFFF (Hexa syntax)

-		Assert.assertFalse(shape.isBold());

-		Assert.assertNull(shape.getGradient());

-	}

-

-	private void testFontName(Shape shape) {

-		Assert.assertEquals("Tunga", shape.getFontName());

-	}

-

-	@After

-	public void dispose() {

-		Iterator<Resource> iterator = diagram.eResource().getResourceSet().getResources().iterator();

-		while(iterator.hasNext()) {

-			iterator.next().unload();

-			iterator.remove();

-		}

-	}

-

-	protected int rgb(int red, int green, int blue) {

-		return red | green << 8 | blue << 16;

-	}

-

-	protected Shape findShape(String elementName) {

-		for(Object viewObject : diagram.getChildren()) {

-			View view = (View)viewObject;

-			if(view instanceof Shape && view.getElement() instanceof NamedElement) {

-				NamedElement element = (NamedElement)view.getElement();

-				if(elementName.equals(element.getName())) {

-					return (Shape)view;

-				}

-			}

-		}

-		Assert.fail("Cannot find the view associated to " + elementName);

-		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 422257
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.notation.GradientStyle;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.uml2.uml.NamedElement;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ *
+ * An abstract Class to test CSSStylesheet. The Papyrus model tested is "../../model/stylesheetTest/".
+ * In the daughter's class you must implement initCSSTheme() with the @BeforeClass tag and init() with the @Before tag.
+ *
+ * @author Mickael ADAM
+ *
+ */
+public abstract class AbstractCSSStylesheetTest extends AbstractPapyrusTest {
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	protected CSSDiagram diagram;
+
+	@Test
+	public void testClassStyle() {
+		Shape classView = findShape("Class1");
+		if(classView == null) {
+			return;
+		}
+		Assert.assertEquals("Invalid color", rgb(255, 0, 0), classView.getFillColor()); //Red = #FF0000
+		Assert.assertNull("Invalid gradient", classView.getGradient());
+		Assert.assertTrue("The element icon should be displayed", AppearanceHelper.showElementIcon(classView));
+	}
+
+	@Test
+	public void testInterfaceStyle() {
+		Shape interfaceView = findShape("Interface1");
+		Assert.assertNotNull("The interface should have a gradient", interfaceView.getGradient());
+		Assert.assertEquals("The fill color should be yellow", rgb(255, 255, 0), interfaceView.getFillColor()); //Yellow = #FFFF00
+		Assert.assertEquals("The gradient should be red", rgb(255, 0, 0), interfaceView.getGradient().getGradientColor1()); //Red = #FF0000
+		Assert.assertEquals("The gradient should be vertical", GradientStyle.VERTICAL, interfaceView.getGradient().getGradientStyle());
+		Assert.assertTrue("The element icon should be displayed", AppearanceHelper.showElementIcon(interfaceView));
+	}
+
+	@Test
+	public void testCSSClassStyle() {
+		Shape interfaceView = findShape("Interface2");
+		Assert.assertNotNull("The interface should have a gradient", interfaceView.getGradient());
+		Assert.assertEquals("The fill color should be light green (#90EE90)", rgb(144, 238, 144), interfaceView.getFillColor()); //Lightgreen = #90EE90
+		//Case insensitive color name
+		Assert.assertEquals(rgb(0, 191, 255), interfaceView.getGradient().getGradientColor1()); //DeepSkyBlue = #00BFFF
+		Assert.assertEquals(GradientStyle.HORIZONTAL, interfaceView.getGradient().getGradientStyle());
+		Assert.assertFalse(AppearanceHelper.showElementIcon(interfaceView));
+		//TODO: Font names should be case-insensitive
+		Assert.assertEquals("KaiTi", interfaceView.getFontName());
+	}
+
+	@Test
+	public void testPackage() {
+		Shape packageView = findShape("Package1");
+		Assert.assertNotNull(packageView.getGradient());
+		//Inherited style (From *)
+		Assert.assertEquals(rgb(255, 0, 0), packageView.getGradient().getGradientColor1()); //Red = #FF0000
+	}
+
+	@Test
+	public void testPriorities() {
+		//Tests the priorities between styles:
+		//.myClass : Low priority
+		//.myClass.myOtherClass : Highest priority
+		//[isAbstract=true] : Medium priority
+		//Styles should also be merged when they aren't conflicting (ie. [isAbstract] + .myClass -> fontName = Tunga)
+		Shape class3 = findShape("Class3");
+		Shape class5 = findShape("Class5");
+		testBlueStyle(class3); //isAbstract
+		testBlueStyle(class5); //isAbstract
+		Shape class4 = findShape("Class4");
+		testWhiteStyle(class4); //.myClass.myOtherClass (Overrides isAbstract)
+		testFontName(class4); //.myClass (Doesn't conflict with isAbstract)
+		Shape class6 = findShape("Class6");
+		testWhiteStyle(class6); //.myClass
+		testFontName(class6); //.myClass
+		Shape class7 = findShape("Class7");
+		testBlueStyle(class7); //isAbstract
+		testFontName(class7); //.myClass (Doesn't conflict with isAbstract)
+	}
+
+	private void testBlueStyle(Shape shape) {
+		Assert.assertEquals(rgb(195, 205, 255), shape.getFillColor()); //rgb syntax
+		Assert.assertTrue(shape.isBold());
+		Assert.assertNotNull(shape.getGradient());
+	}
+
+	private void testWhiteStyle(Shape shape) {
+		Assert.assertEquals(rgb(255, 255, 255), shape.getFillColor()); //White = #FFFFFF (Hexa syntax)
+		Assert.assertFalse(shape.isBold());
+		Assert.assertNull(shape.getGradient());
+	}
+
+	private void testFontName(Shape shape) {
+		Assert.assertEquals("Tunga", shape.getFontName());
+	}
+
+	@After
+	public void dispose() {
+		Iterator<Resource> iterator = diagram.eResource().getResourceSet().getResources().iterator();
+		while(iterator.hasNext()) {
+			iterator.next().unload();
+			iterator.remove();
+		}
+	}
+
+	protected int rgb(int red, int green, int blue) {
+		return red | green << 8 | blue << 16;
+	}
+
+	protected Shape findShape(String elementName) {
+		for(Object viewObject : diagram.getChildren()) {
+			View view = (View)viewObject;
+			if(view instanceof Shape && view.getElement() instanceof NamedElement) {
+				NamedElement element = (NamedElement)view.getElement();
+				if(elementName.equals(element.getName())) {
+					return (Shape)view;
+				}
+			}
+		}
+		Assert.fail("Cannot find the view associated to " + elementName);
+		return null;
+	}
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java
index ea48c427765..8392ab92c72 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

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

- *  

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

-package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;

-

-

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.Iterator;

-import java.util.List;

-

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSClassContentProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;

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

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-

-public class CSSClassProviderTest extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-	

-	private CSSDiagram diagram;

-

-	private static int expectedNumberOfClasses = 17;

-

-	@Before

-	public void init() {

-		ResourceSet resourceSet = houseKeeper.createResourceSet();

-		CSSHelper.installCSSSupport(resourceSet);

-

-		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/classProviderTest/model.notation", true);

-		try {

-			Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri);

-			Assert.assertNotNull("Cannot find the model", diagram);

-			Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);

-			this.diagram = (CSSDiagram)diagram;

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	@Test

-	public void testCSSClassContentProvider() {

-		ExtendedCSSEngine engine = diagram.getEngine();

-		IStaticContentProvider provider = new CSSClassContentProvider("Interface", engine);

-		Object[] result = provider.getElements();

-		List<Object> resultList = Arrays.asList(result);

-

-		//Result is expected to contain c01 to c17

-		//Result should not contain x01 to x13

-		//Result may contain anything else (Depending on the current Workspace Theme).

-

-		//Check that all expected classes are returned

-		for(int i = 1; i <= expectedNumberOfClasses; i++) {

-			String expectedClassName = "c";

-			if(i < 10) {

-				expectedClassName += "0";

-			}

-			expectedClassName += i;

-			Assert.assertTrue("An expected CSS Class has not been found: " + expectedClassName, resultList.contains(expectedClassName));

-		}

-

-		//Check that no invalid class is returned

-		for(Object object : resultList) {

-			Assert.assertTrue("The CSSClassContentProvider must return Strings", object instanceof String);

-			String cssClass = (String)object;

-

-			Assert.assertFalse("Invalid CSS Class has been returned: " + cssClass, cssClass.matches("x[0-9]+"));

-		}

-	}

-

-	@After

-	public void dispose() {

-		Iterator<Resource> iterator = diagram.eResource().getResourceSet().getResources().iterator();

-		while(iterator.hasNext()) {

-			iterator.next().unload();

-			iterator.remove();

-		}

-	}

-}

+/*****************************************************************************
+ * 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 422257
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;
+
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+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.Diagram;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSClassContentProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+
+public class CSSClassProviderTest extends AbstractPapyrusTest {
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+	
+	private CSSDiagram diagram;
+
+	private static int expectedNumberOfClasses = 17;
+
+	@Before
+	public void init() {
+		ResourceSet resourceSet = houseKeeper.createResourceSet();
+		CSSHelper.installCSSSupport(resourceSet);
+
+		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/classProviderTest/model.notation", true);
+		try {
+			Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri);
+			Assert.assertNotNull("Cannot find the model", diagram);
+			Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);
+			this.diagram = (CSSDiagram)diagram;
+		} catch (IOException ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	@Test
+	public void testCSSClassContentProvider() {
+		ExtendedCSSEngine engine = diagram.getEngine();
+		IStaticContentProvider provider = new CSSClassContentProvider("Interface", engine);
+		Object[] result = provider.getElements();
+		List<Object> resultList = Arrays.asList(result);
+
+		//Result is expected to contain c01 to c17
+		//Result should not contain x01 to x13
+		//Result may contain anything else (Depending on the current Workspace Theme).
+
+		//Check that all expected classes are returned
+		for(int i = 1; i <= expectedNumberOfClasses; i++) {
+			String expectedClassName = "c";
+			if(i < 10) {
+				expectedClassName += "0";
+			}
+			expectedClassName += i;
+			Assert.assertTrue("An expected CSS Class has not been found: " + expectedClassName, resultList.contains(expectedClassName));
+		}
+
+		//Check that no invalid class is returned
+		for(Object object : resultList) {
+			Assert.assertTrue("The CSSClassContentProvider must return Strings", object instanceof String);
+			String cssClass = (String)object;
+
+			Assert.assertFalse("Invalid CSS Class has been returned: " + cssClass, cssClass.matches("x[0-9]+"));
+		}
+	}
+
+	@After
+	public void dispose() {
+		Iterator<Resource> iterator = diagram.eResource().getResourceSet().getResources().iterator();
+		while(iterator.hasNext()) {
+			iterator.next().unload();
+			iterator.remove();
+		}
+	}
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSModelStylesheetTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSModelStylesheetTest.java
index 14e2730d7d6..e8abeb70adc 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSModelStylesheetTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSModelStylesheetTest.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

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

- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;

-

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.WorkspaceCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.preferences.ThemePreferences;

-import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class CSSModelStylesheetTest extends AbstractCSSStylesheetTest {

-

-	@BeforeClass

-	public static void initCSSTheme() {

-		IPreferenceStore cssThemePreferences = org.eclipse.papyrus.infra.gmfdiag.css.Activator.getDefault().getPreferenceStore();

-		cssThemePreferences.setValue(ThemePreferences.CURRENT_THEME, "org.eclipse.papyrus.css.papyrus_theme");

-		WorkspaceCSSEngine.instance.reset();

-	}

-

-	@Before

-	public void init() throws Exception {

-		ResourceSet resourceSet = houseKeeper.createResourceSet();

-		CSSHelper.installCSSSupport(resourceSet);

-

-		URI modelURI = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/modelStylesheetTest/model.notation", true);

-

-		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, modelURI);

-		Assert.assertNotNull("Cannot find the model", diagram);

-		Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);

-		this.diagram = (CSSDiagram)diagram;

-	}

-

-	@Test

-	public void testStyleSheetsPriorities() {

-		//Diagram CSS have a highter priority than Model CSS

-		//Component for Model CSS is Red and for diagram must be Lime

-		Shape componentView = findShape("Component1");

-		Assert.assertEquals("Invalid color", rgb(0, 255, 0), componentView.getFillColor()); //RGB(0,255,0)

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.WorkspaceCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.preferences.ThemePreferences;
+import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class CSSModelStylesheetTest extends AbstractCSSStylesheetTest {
+
+	@BeforeClass
+	public static void initCSSTheme() {
+		IPreferenceStore cssThemePreferences = org.eclipse.papyrus.infra.gmfdiag.css.Activator.getDefault().getPreferenceStore();
+		cssThemePreferences.setValue(ThemePreferences.CURRENT_THEME, "org.eclipse.papyrus.css.papyrus_theme");
+		WorkspaceCSSEngine.instance.reset();
+	}
+
+	@Before
+	public void init() throws Exception {
+		ResourceSet resourceSet = houseKeeper.createResourceSet();
+		CSSHelper.installCSSSupport(resourceSet);
+
+		URI modelURI = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/modelStylesheetTest/model.notation", true);
+
+		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, modelURI);
+		Assert.assertNotNull("Cannot find the model", diagram);
+		Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);
+		this.diagram = (CSSDiagram)diagram;
+	}
+
+	@Test
+	public void testStyleSheetsPriorities() {
+		//Diagram CSS have a highter priority than Model CSS
+		//Component for Model CSS is Red and for diagram must be Lime
+		Shape componentView = findShape("Component1");
+		Assert.assertEquals("Invalid color", rgb(0, 255, 0), componentView.getFillColor()); //RGB(0,255,0)
+	}
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java
index 2918654e788..9d8881bcf43 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.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 422257

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;

-

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

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

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.WorkspaceCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.preferences.ThemePreferences;

-import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.BeforeClass;

-

-public class CSSStylesheetTest extends AbstractCSSStylesheetTest {

-

-	@BeforeClass

-	public static void initCSSTheme() {

-		IPreferenceStore cssThemePreferences = org.eclipse.papyrus.infra.gmfdiag.css.Activator.getDefault().getPreferenceStore();

-		cssThemePreferences.setValue(ThemePreferences.CURRENT_THEME, "org.eclipse.papyrus.css.papyrus_theme");

-		WorkspaceCSSEngine.instance.reset();

-	}

-

-	@Before

-	public void init() throws Exception {

-		ResourceSet resourceSet = houseKeeper.createResourceSet();

-		CSSHelper.installCSSSupport(resourceSet);

-		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true);

-

-		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri);

-		Assert.assertNotNull("Cannot find the model", diagram);

-		Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);

-		this.diagram = (CSSDiagram)diagram;

-	}

-}

+/*****************************************************************************
+ * 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 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.WorkspaceCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.preferences.ThemePreferences;
+import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+public class CSSStylesheetTest extends AbstractCSSStylesheetTest {
+
+	@BeforeClass
+	public static void initCSSTheme() {
+		IPreferenceStore cssThemePreferences = org.eclipse.papyrus.infra.gmfdiag.css.Activator.getDefault().getPreferenceStore();
+		cssThemePreferences.setValue(ThemePreferences.CURRENT_THEME, "org.eclipse.papyrus.css.papyrus_theme");
+		WorkspaceCSSEngine.instance.reset();
+	}
+
+	@Before
+	public void init() throws Exception {
+		ResourceSet resourceSet = houseKeeper.createResourceSet();
+		CSSHelper.installCSSSupport(resourceSet);
+		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true);
+
+		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri);
+		Assert.assertNotNull("Cannot find the model", diagram);
+		Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);
+		this.diagram = (CSSDiagram)diagram;
+	}
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java
index 199bb27ca66..9b4110017e8 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java
@@ -1,109 +1,109 @@
-/*****************************************************************************

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

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;

-

-import java.util.List;

-

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.junit.Assert;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * Test the installation of CSS Support on a standard ResourceSet

- *

- * @author Camille Letavernier

- *

- */

-public class CSSSupportTest extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	/**

-	 * Installs the CSS support on a resource set and check the results

-	 *

-	 * @throws Exception

-	 */

-	@Test

-	public void testCSSSupport() throws Exception {

-		//Resource set with CSS Support installed

-		ResourceSet resourceSetWithCSSSupport = houseKeeper.createResourceSet();

-		CSSHelper.installCSSSupport(resourceSetWithCSSSupport);

-

-		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true);

-

-		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSetWithCSSSupport, uri);

-

-		//The diagram should be a CSSDiagram

-		Assert.assertTrue(diagram instanceof CSSDiagram);

-

-		CSSDiagram cssDiagram = (CSSDiagram)diagram;

-

-		//The CSSDiagram should have a CSSEngine

-		Assert.assertNotNull(cssDiagram.getEngine());

-

-		//Dispose the CSS Engine

-		resourceSetWithCSSSupport.getResources().remove(diagram.eResource());

-	}

-

-	/**

-	 * Tests a standard resource set (without CSS support) and check the results.

-	 *

-	 * @throws Exception

-	 */

-	@Test

-	@SuppressWarnings("unchecked")

-	//GMF Notation model

-	public void testWithoutCSSSupport() throws Exception {

-		//Standard resource set (Without CSS Support installed)

-		ResourceSet resourceSetWithoutCSSSupport = houseKeeper.createResourceSet();

-

-		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true);

-

-		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSetWithoutCSSSupport, uri);

-

-		//The diagram should be a CSSDiagram, even if the CSS Support is not installed (The NotationFactory is a Singleton)

-		Assert.assertTrue(diagram instanceof CSSDiagram);

-

-		Assert.assertFalse(CSSHelper.isCSSSupported(resourceSetWithoutCSSSupport));

-

-		for(View childNode : (List<View>)diagram.getChildren()) {

-			if(childNode instanceof Shape) {

-				Shape child = (Shape)childNode;

-				for(EStructuralFeature feature : child.eClass().getEAllStructuralFeatures()) {

-					if(NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(feature.getEContainingClass())) {

-						//For non-CSS models, this method should always return true (i.e. the value is never computed)

-						Assert.assertTrue(ForceValueHelper.isSet(child, feature, null));

-					}

-				}

-			}

-		}

-

-		resourceSetWithoutCSSSupport.getResources().remove(diagram.eResource());

-	}

-}

+/*****************************************************************************
+ * 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 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;
+
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test the installation of CSS Support on a standard ResourceSet
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class CSSSupportTest extends AbstractPapyrusTest {
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	/**
+	 * Installs the CSS support on a resource set and check the results
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void testCSSSupport() throws Exception {
+		//Resource set with CSS Support installed
+		ResourceSet resourceSetWithCSSSupport = houseKeeper.createResourceSet();
+		CSSHelper.installCSSSupport(resourceSetWithCSSSupport);
+
+		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true);
+
+		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSetWithCSSSupport, uri);
+
+		//The diagram should be a CSSDiagram
+		Assert.assertTrue(diagram instanceof CSSDiagram);
+
+		CSSDiagram cssDiagram = (CSSDiagram)diagram;
+
+		//The CSSDiagram should have a CSSEngine
+		Assert.assertNotNull(cssDiagram.getEngine());
+
+		//Dispose the CSS Engine
+		resourceSetWithCSSSupport.getResources().remove(diagram.eResource());
+	}
+
+	/**
+	 * Tests a standard resource set (without CSS support) and check the results.
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	@SuppressWarnings("unchecked")
+	//GMF Notation model
+	public void testWithoutCSSSupport() throws Exception {
+		//Standard resource set (Without CSS Support installed)
+		ResourceSet resourceSetWithoutCSSSupport = houseKeeper.createResourceSet();
+
+		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true);
+
+		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSetWithoutCSSSupport, uri);
+
+		//The diagram should be a CSSDiagram, even if the CSS Support is not installed (The NotationFactory is a Singleton)
+		Assert.assertTrue(diagram instanceof CSSDiagram);
+
+		Assert.assertFalse(CSSHelper.isCSSSupported(resourceSetWithoutCSSSupport));
+
+		for(View childNode : (List<View>)diagram.getChildren()) {
+			if(childNode instanceof Shape) {
+				Shape child = (Shape)childNode;
+				for(EStructuralFeature feature : child.eClass().getEAllStructuralFeatures()) {
+					if(NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(feature.getEContainingClass())) {
+						//For non-CSS models, this method should always return true (i.e. the value is never computed)
+						Assert.assertTrue(ForceValueHelper.isSet(child, feature, null));
+					}
+				}
+			}
+		}
+
+		resourceSetWithoutCSSSupport.getResources().remove(diagram.eResource());
+	}
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF
index 1e0271ee167..9e74f5fe9fc 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

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

- org.eclipse.gmf.runtime.diagram.ui,

- org.junit,

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

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

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

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: GMF Diagram Menu Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.junit,
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: GMF Diagram Menu Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF
index 6d46492d332..d2c38bcea6d 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.core.resources;bundle-version="3.8.0",

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

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.100,3.0.0)",

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

- org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;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.editor;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.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

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

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-Import-Package: com.google.common.base;version="21.0.0",

- com.google.common.collect;version="21.0.0"

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.100,3.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;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.editor;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.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.launch
index 440c3d62a4d..2016f6a2947 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.launch
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.launch
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2048m"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="false"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2048m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="false"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
index ec015e4cae8..3271b3ebd6a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
@@ -1,15 +1,15 @@
-<?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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.FakeProfile" name="FakeProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests" name="FakeClass">

-    <iconEntry xmi:id="_ubJcsqeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">

-      <stereotypesQualifiedNames>FakeProfile::FakeSto</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.fakeadvice" target="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests">

-    <stereotypesToApply xmi:id="_ubJcyqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="FakeProfile::FakeSto">

-      <requiredProfiles>FakeProfile</requiredProfiles>

-    </stereotypesToApply>

-  </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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.FakeProfile" name="FakeProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests" name="FakeClass">
+    <iconEntry xmi:id="_ubJcsqeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>FakeProfile::FakeSto</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.fakeadvice" target="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests">
+    <stereotypesToApply xmi:id="_ubJcyqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="FakeProfile::FakeSto">
+      <requiredProfiles>FakeProfile</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.paletteconfiguration b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.paletteconfiguration
index 6858b7dce86..96a78244688 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.paletteconfiguration
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.paletteconfiguration
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ASCII"?>

-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="TestFakePaletteConfiguration" label="Test Fake Palette Configuration">

-  <drawerConfigurations id="TestFakePaletteNodesDrawer" label="TestFakePaletteConfigurationNodes" description="Test Fake Paletteconfiguration Nodes">

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="testfakepalettemodel.StoOnClass" label="FakeTool" description="Create a Class With FAke Sto">

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <requiredProfiles>FakeProfile</requiredProfiles>

-</paletteconfiguration:PaletteConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="TestFakePaletteConfiguration" label="Test Fake Palette Configuration">
+  <drawerConfigurations id="TestFakePaletteNodesDrawer" label="TestFakePaletteConfigurationNodes" description="Test Fake Paletteconfiguration Nodes">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="testfakepalettemodel.StoOnClass" label="FakeTool" description="Create a Class With FAke Sto">
+      <elementDescriptors>
+        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <requiredProfiles>FakeProfile</requiredProfiles>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/NoProfile.paletteconfiguration b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/NoProfile.paletteconfiguration
index 24dfeb27fb9..31b577109a4 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/NoProfile.paletteconfiguration
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/NoProfile.paletteconfiguration
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="ASCII"?>

-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="NoProfilePaletteConfiguration" label="Test No Profile  palette Configuration">

-  <drawerConfigurations id="TestNoProfilePaletteNodesDrawer" label="TestNoProfilePaletteConfigurationNodes" description="Test No Profile Paletteconfiguration Nodes">

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="testnoprofile.tool" label="NoProfileCreationTool" description="Create a Class With no rofile">

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-</paletteconfiguration:PaletteConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="NoProfilePaletteConfiguration" label="Test No Profile  palette Configuration">
+  <drawerConfigurations id="TestNoProfilePaletteNodesDrawer" label="TestNoProfilePaletteConfigurationNodes" description="Test No Profile Paletteconfiguration Nodes">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="testnoprofile.tool" label="NoProfileCreationTool" description="Create a Class With no rofile">
+      <elementDescriptors>
+        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
index 3a600f451a1..16bc3a7f2d6 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
@@ -1,15 +1,15 @@
-<?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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.TestPaletteConfiguration" name="TestPaletteConfiguration" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests" name="ClassWithStoOnClass">

-    <iconEntry xmi:id="_ubJcsqeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">

-      <stereotypesQualifiedNames>TestPaletteConfiguration::TPC_StoOnClass</stereotypesQualifiedNames>

-    </matcherConfiguration>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.advice" target="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests">

-    <stereotypesToApply xmi:id="_ubJcyqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="TestPaletteConfiguration::TPC_StoOnClass">

-      <requiredProfiles>TestPaletteConfiguration</requiredProfiles>

-    </stereotypesToApply>

-  </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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.TestPaletteConfiguration" name="TestPaletteConfiguration" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests" name="ClassWithStoOnClass">
+    <iconEntry xmi:id="_ubJcsqeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>TestPaletteConfiguration::TPC_StoOnClass</stereotypesQualifiedNames>
+    </matcherConfiguration>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.advice" target="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests">
+    <stereotypesToApply xmi:id="_ubJcyqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="TestPaletteConfiguration::TPC_StoOnClass">
+      <requiredProfiles>TestPaletteConfiguration</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.paletteconfiguration b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.paletteconfiguration
index 6c24f36c89e..0152452f1d0 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.paletteconfiguration
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.paletteconfiguration
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ASCII"?>

-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="TestPaletteConfiguration" label="Test Palette Configuration">

-  <drawerConfigurations id="TestPaletteNodesDrawer" label="TestPaletteConfigurationNodes" description="Test Paletteconfiguration Nodes">

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="testpalettemodel.StoOnClass" label="StoOnClass" description="Create a Class With StoOnClass" toolClassName="">

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <requiredProfiles>TestPaletteConfiguration</requiredProfiles>

-</paletteconfiguration:PaletteConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="TestPaletteConfiguration" label="Test Palette Configuration">
+  <drawerConfigurations id="TestPaletteNodesDrawer" label="TestPaletteConfigurationNodes" description="Test Paletteconfiguration Nodes">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="testpalettemodel.StoOnClass" label="StoOnClass" description="Create a Class With StoOnClass" toolClassName="">
+      <elementDescriptors>
+        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <requiredProfiles>TestPaletteConfiguration</requiredProfiles>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
index c156ebeb449..d743fceb198 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.welcome.tests

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

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

- org.junit;bundle-version="4.12.0";visibility:=reexport,

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

- org.eclipse.papyrus.junit.utils;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.tools;bundle-version="[3.0.0,4.0.0)",

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

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

- org.eclipse.core.databinding;bundle-version="1.6.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

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

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

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

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

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

-Bundle-ActivationPolicy: lazy

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.welcome.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.welcome.tests
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.editor.welcome;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.12.0";visibility:=reexport,
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;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.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.databinding;bundle-version="1.6.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.gmfdiag.welcome;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.welcome.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF
index 6355deb2f60..505ce336066 100644
--- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

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

-Bundle-Version: 1.100.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.internationalization.tests,

- org.eclipse.papyrus.infra.internationalization.tests.tests

-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- 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.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.100.0,2.0.0)",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-Activator: org.eclipse.papyrus.infra.internationalization.tests.Activator

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.tests;singleton:=true
+Bundle-Version: 1.100.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.internationalization.tests,
+ org.eclipse.papyrus.infra.internationalization.tests.tests
+Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ 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.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.100.0,2.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.infra.internationalization.tests.Activator
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF
index cc71eca165d..210e6854445 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %Bundle-Name

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.common.tests;singleton:=true

-Bundle-Version: 1.2.0.qualifier

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.tests.Activator

-Bundle-Vendor: %Bundle-Vendor

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)",

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

- org.junit;bundle-version="4.12.0",

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

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

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

- org.eclipse.emf.transaction,

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

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

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-Bundle-ActivationPolicy: lazy

-Bundle-Description: %Bundle-Description

-Export-Package: org.eclipse.papyrus.infra.nattable.common.tests

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.common.tests;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.tests.Activator
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
+ org.junit;bundle-version="4.12.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.transaction,
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Bundle-Description: %Bundle-Description
+Export-Package: org.eclipse.papyrus.infra.nattable.common.tests
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.classpath b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.classpath
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.project b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.project
index 1e7ef6ab9bb..6a039ed2e67 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.project
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.model.editor.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.nattable.model.editor.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF
index 0bcf4a058b2..0c365d7e8f2 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

- org.junit;bundle-version="4.11.0",

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

- org.eclipse.emf.transaction,

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.tests,

- org.eclipse.papyrus.infra.nattable.model.editor.tests.tests

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.editor.tests.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.model.editor;bundle-version="[3.0.0,4.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.transaction,
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.tests,
+ org.eclipse.papyrus.infra.nattable.model.editor.tests.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.editor.tests.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/OSGI-INF/l10n/bundle.properties
index 2b1344646ce..e9550e06b6f 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.model.editor.tests

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.model.editor.tests
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Nattable Editor Tests
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/build.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/build.properties
index 750b1c3be21..8f167140018 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/build.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               OSGI-INF/,\

-               resources/,\

-               about.html,\

-               org.eclipse.papyrus.infra.nattable.model.editor.tests.launch

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               resources/,\
+               about.html,\
+               org.eclipse.papyrus.infra.nattable.model.editor.tests.launch
+src.includes = about.html
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/org.eclipse.papyrus.infra.nattable.model.editor.tests.launch b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/org.eclipse.papyrus.infra.nattable.model.editor.tests.launch
index 5e80c967f8a..ccac45d3a1d 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/org.eclipse.papyrus.infra.nattable.model.editor.tests.launch
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/org.eclipse.papyrus.infra.nattable.model.editor.tests.launch
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.infra.nattable.model.editor.tests"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="4"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.papyrus.infra.nattable.model.editor.tests"/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.nattable.model.editor.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms768m -Xmx1024m "/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.infra.nattable.model.editor.tests"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.papyrus.infra.nattable.model.editor.tests"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.nattable.model.editor.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms768m -Xmx1024m "/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattable b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattable
index eceafbc398d..6e96ac007f1 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattable
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattable
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxis b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxis
index 16ad7b23134..8ae13595d20 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxis
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxis
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableaxis:EStructuralFeatureAxis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattableaxis:EStructuralFeatureAxis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxisconfiguration b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxisconfiguration
index baa21916294..cef7fcab2a3 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxisconfiguration
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxisconfiguration
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableaxisconfiguration:AxisManagerConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattableaxisconfiguration:AxisManagerConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxisprovider b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxisprovider
index 278440faf96..8f44e86475f 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxisprovider
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableaxisprovider
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableaxisprovider:MasterObjectAxisProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattableaxisprovider:MasterObjectAxisProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablecell b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablecell
index a258211653b..59d24065a6b 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablecell
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablecell
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattablecell:Cell xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattablecell="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattablecell:Cell xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattablecell="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableconfiguration b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableconfiguration
index ab1821e2b47..eb73e737cab 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableconfiguration
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableconfiguration
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" description="sdsd" iconPath="qsd"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" description="sdsd" iconPath="qsd"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablelabelprovider b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablelabelprovider
index e40fa4a30c1..54efad27700 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablelabelprovider
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablelabelprovider
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattablelabelprovider:FeatureLabelProviderConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattablelabelprovider:FeatureLabelProviderConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableproblem b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableproblem
index c38a42d9fab..8f177fd70b4 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableproblem
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableproblem
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableproblem:Problem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableproblem="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattableproblem:Problem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableproblem="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablestyle b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablestyle
index d56d7bb057e..8f869961269 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablestyle
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablestyle
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattablestyle:CellTextStyle xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattablestyle:CellTextStyle xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattabletester b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattabletester
index 2f97b020e69..f02e57b9771 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattabletester
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattabletester
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattabletester:JavaTableTester xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattabletester:JavaTableTester xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java
index 3dbf0bbf06f..737928c1026 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/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:

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

- *

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

-package org.eclipse.papyrus.infra.nattable.model.editor.tests;

-

-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.model.editor.tests"; //$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)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(plugin);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

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

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 * 

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/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.tests;
+
+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.model.editor.tests"; //$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)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(plugin);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 * 
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/AllTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/AllTests.java
index 6065c435f7f..ece6193d26b 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/AllTests.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/AllTests.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.nattable.model.editor.tests.tests;

-

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({ EditorsTests.class

-

-})

-public class AllTests {

-	//Test Suite

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.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.model.editor.tests.tests;
+
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({ EditorsTests.class
+
+})
+public class AllTests {
+	//Test Suite
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java
index 0dd87500c27..069c93cccae 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.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.editor.tests.tests;

-

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

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

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

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

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

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisproviderEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablecellEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablelabelproviderEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableproblemEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablestyleEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattabletesterEditor;

-import org.eclipse.papyrus.infra.nattable.model.editor.tests.Activator;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.EditorUtils;

-import org.eclipse.papyrus.junit.utils.GenericUtils;

-import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;

-import org.eclipse.papyrus.junit.utils.ProjectUtils;

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

-import org.eclipse.ui.IEditorPart;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-

-/**

- * If some tests of this class doesn't work, the problem comes probably from the plugin.xml of the plugin oep.infra.nattable.model.editor.

- * We replace the initial contributions to org.eclipse.ui.editor by our with our Custom Editor which override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class EditorsTests extends AbstractPapyrusTest {

-

-	private IProject project;

-

-	@Before

-	public void init() throws CoreException {

-		ProjectUtils.removeAllProjectFromTheWorkspace();

-

-	}

-

-	/**

-	 *

-	 * @param projectName

-	 *        the name of the project

-	 * @param modelName

-	 *        the name of the file

-	 * @param bundle

-	 *        the bundle to use

-	 * @return

-	 * @throws Exception

-	 */

-	protected IEditorPart openFile(String projectName, String modelName, final Bundle bundle) throws Exception {

-		project = ProjectUtils.createProject(projectName);

-		final IFile diModelFile = PapyrusProjectUtils.copyIFile(getSourcePath() + modelName, bundle, project, modelName);

-		RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {

-

-			@Override

-			public void run() {

-				setStatus(Status.OK_STATUS);

-				try {

-					IEditorPart editor = EditorUtils.openEditor(diModelFile);

-					setResult(editor);

-				} catch (Exception ex) {

-					Activator.log.error(ex);

-					setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), ex.getMessage()));

-				}

-

-			}

-		};

-

-		Display.getDefault().syncExec(runnableWithResult);

-		Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());

-

-		IEditorPart editor = (IEditorPart)runnableWithResult.getResult();

-		Assert.assertNotNull(editor);

-		return editor;

-	}

-

-	private Bundle getBundle() {

-		return Activator.getDefault().getBundle();

-	}

-

-	@Test

-	public void testOpenNattableFileEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattable", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattableEditor);

-	}

-

-	@Test

-	public void testOpenNattableAxisFileEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattableaxis", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattableaxisEditor);

-	}

-

-	@Test

-	public void testOpenNattableAxisConfigurationFileEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattableaxisconfiguration", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattableaxisconfigurationEditor);

-	}

-

-	@Test

-	public void testOpenNattableAxisProviderFileEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattableaxisprovider", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattableaxisproviderEditor);

-	}

-

-	@Test

-	public void testOpenNattableConfigurationFileEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattableconfiguration", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattableconfigurationEditor);

-	}

-

-

-	@Test

-	public void testOpenNattableLabelProviderFileEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattablelabelprovider", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattablelabelproviderEditor);

-	}

-

-	@Test

-	public void testOpenNattableTesterFileEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattabletester", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattabletesterEditor);

-	}

-

-

-	@Test

-	public void testOpenNattableTesterCellEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattablecell", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattablecellEditor);

-	}

-

-

-	@Test

-	public void testOpenNattableTesterProblemEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattableproblem", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattableproblemEditor);

-	}

-

-	@Test

-	public void testOpenNattableStyleEditor() throws Exception {

-		IEditorPart editor = openFile("testTableConfiguration", "My.nattablestyle", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		Assert.assertTrue(editor instanceof CustomNattablestyleEditor);

-	}

-

-	protected String getSourcePath() {

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

-	}

-

-	@After

-	public void after() {

-		GenericUtils.closeAllEditors();

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/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.tests.tests;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisconfigurationEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablecellEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableconfigurationEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablelabelproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableproblemEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablestyleEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattabletesterEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.tests.Activator;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.EditorUtils;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * If some tests of this class doesn't work, the problem comes probably from the plugin.xml of the plugin oep.infra.nattable.model.editor.
+ * We replace the initial contributions to org.eclipse.ui.editor by our with our Custom Editor which override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class EditorsTests extends AbstractPapyrusTest {
+
+	private IProject project;
+
+	@Before
+	public void init() throws CoreException {
+		ProjectUtils.removeAllProjectFromTheWorkspace();
+
+	}
+
+	/**
+	 *
+	 * @param projectName
+	 *        the name of the project
+	 * @param modelName
+	 *        the name of the file
+	 * @param bundle
+	 *        the bundle to use
+	 * @return
+	 * @throws Exception
+	 */
+	protected IEditorPart openFile(String projectName, String modelName, final Bundle bundle) throws Exception {
+		project = ProjectUtils.createProject(projectName);
+		final IFile diModelFile = PapyrusProjectUtils.copyIFile(getSourcePath() + modelName, bundle, project, modelName);
+		RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {
+
+			@Override
+			public void run() {
+				setStatus(Status.OK_STATUS);
+				try {
+					IEditorPart editor = EditorUtils.openEditor(diModelFile);
+					setResult(editor);
+				} catch (Exception ex) {
+					Activator.log.error(ex);
+					setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), ex.getMessage()));
+				}
+
+			}
+		};
+
+		Display.getDefault().syncExec(runnableWithResult);
+		Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());
+
+		IEditorPart editor = (IEditorPart)runnableWithResult.getResult();
+		Assert.assertNotNull(editor);
+		return editor;
+	}
+
+	private Bundle getBundle() {
+		return Activator.getDefault().getBundle();
+	}
+
+	@Test
+	public void testOpenNattableFileEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattable", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattableEditor);
+	}
+
+	@Test
+	public void testOpenNattableAxisFileEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattableaxis", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattableaxisEditor);
+	}
+
+	@Test
+	public void testOpenNattableAxisConfigurationFileEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattableaxisconfiguration", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattableaxisconfigurationEditor);
+	}
+
+	@Test
+	public void testOpenNattableAxisProviderFileEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattableaxisprovider", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattableaxisproviderEditor);
+	}
+
+	@Test
+	public void testOpenNattableConfigurationFileEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattableconfiguration", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattableconfigurationEditor);
+	}
+
+
+	@Test
+	public void testOpenNattableLabelProviderFileEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattablelabelprovider", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattablelabelproviderEditor);
+	}
+
+	@Test
+	public void testOpenNattableTesterFileEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattabletester", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattabletesterEditor);
+	}
+
+
+	@Test
+	public void testOpenNattableTesterCellEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattablecell", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattablecellEditor);
+	}
+
+
+	@Test
+	public void testOpenNattableTesterProblemEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattableproblem", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattableproblemEditor);
+	}
+
+	@Test
+	public void testOpenNattableStyleEditor() throws Exception {
+		IEditorPart editor = openFile("testTableConfiguration", "My.nattablestyle", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		Assert.assertTrue(editor instanceof CustomNattablestyleEditor);
+	}
+
+	protected String getSourcePath() {
+		return "/resources/"; //$NON-NLS-1$
+	}
+
+	@After
+	public void after() {
+		GenericUtils.closeAllEditors();
+
+	}
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.classpath b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.classpath
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF
index 9398b8f2405..480f89c1e59 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit,

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

-Export-Package: org.eclipse.papyrus.infra.nattable.model.tests,

- org.eclipse.papyrus.infra.nattable.model.tests.tests

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.tests.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: This plugin provides JUnit test for the Papyrus NatTable metamodel

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit,
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.infra.nattable.model.tests,
+ org.eclipse.papyrus.infra.nattable.model.tests.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.tests.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: This plugin provides JUnit test for the Papyrus NatTable metamodel
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/build.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/build.properties
index a8e3182967e..2b112c46131 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/build.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/plugin.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/plugin.properties
index 84485e9c953..c3d31df8fc0 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/plugin.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/plugin.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.model.tests

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.model.tests
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Nattable Model Tests
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/Activator.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/Activator.java
index dbf91d9afc6..ccadd40b088 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/Activator.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/Activator.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.model.tests;

-

-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.model.tests"; //$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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.tests;
+
+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.model.tests"; //$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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/AllTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/AllTests.java
index c32ef567a7a..87a17911d32 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/AllTests.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/AllTests.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * 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.nattable.model.tests.tests;

-

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.runner.Headless;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-@Headless

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({ StyledElementTests.class

-

-})

-public class AllTests {

-	// Test Suite

-}

+/*****************************************************************************
+ * 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.nattable.model.tests.tests;
+
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.runner.Headless;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@Headless
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({ StyledElementTests.class
+
+})
+public class AllTests {
+	// Test Suite
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/StyledElementTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/StyledElementTests.java
index 9f2c71f40e0..95f677fdf8b 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/StyledElementTests.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/StyledElementTests.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:

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

- *

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

-package org.eclipse.papyrus.infra.nattable.model.tests.tests;

-

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

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

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * This class provides some test to verify that NOT generated code has not been destroyed

- *

- * @author Vincent Lorenzo

- *

- */

-public class StyledElementTests extends AbstractPapyrusTest {

-

-	@Test

-	public void test_StyleCreation() {

-		Table table = NattableFactory.eINSTANCE.createTable();

-		Style style = table.createStyle(NattablestylePackage.eINSTANCE.getIntValueStyle());

-		Assert.assertNotNull(style);

-		Assert.assertTrue(style instanceof IntValueStyle);

-		Assert.assertTrue(table.getStyles().contains(style));

-	}

-

-	@Test

-	public void test_getNamedStyle() {

-		Table table = NattableFactory.eINSTANCE.createTable();

-		Style style = table.createStyle(NattablestylePackage.eINSTANCE.getNamedStyle());

-		Assert.assertNotNull(style);

-		Assert.assertTrue(style instanceof NamedStyle);

-		String styleName = "myNiceStyle";

-		((NamedStyle) style).setName(styleName);

-		Style value = table.getNamedStyle(NattablestylePackage.eINSTANCE.getNamedStyle(), styleName);

-		Assert.assertTrue(value == style);

-

-	}

-

-	@Test

-	public void test_getStyle() {

-		Table table = NattableFactory.eINSTANCE.createTable();

-		Style style = table.createStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle());

-		Assert.assertNotNull(style);

-		Assert.assertTrue(style instanceof BooleanValueStyle);

-		Assert.assertTrue(table.getStyles().contains(style));

-		Assert.assertTrue(style == table.getStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle()));

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.tests.tests;
+
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+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.Style;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * This class provides some test to verify that NOT generated code has not been destroyed
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class StyledElementTests extends AbstractPapyrusTest {
+
+	@Test
+	public void test_StyleCreation() {
+		Table table = NattableFactory.eINSTANCE.createTable();
+		Style style = table.createStyle(NattablestylePackage.eINSTANCE.getIntValueStyle());
+		Assert.assertNotNull(style);
+		Assert.assertTrue(style instanceof IntValueStyle);
+		Assert.assertTrue(table.getStyles().contains(style));
+	}
+
+	@Test
+	public void test_getNamedStyle() {
+		Table table = NattableFactory.eINSTANCE.createTable();
+		Style style = table.createStyle(NattablestylePackage.eINSTANCE.getNamedStyle());
+		Assert.assertNotNull(style);
+		Assert.assertTrue(style instanceof NamedStyle);
+		String styleName = "myNiceStyle";
+		((NamedStyle) style).setName(styleName);
+		Style value = table.getNamedStyle(NattablestylePackage.eINSTANCE.getNamedStyle(), styleName);
+		Assert.assertTrue(value == style);
+
+	}
+
+	@Test
+	public void test_getStyle() {
+		Table table = NattableFactory.eINSTANCE.createTable();
+		Style style = table.createStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle());
+		Assert.assertNotNull(style);
+		Assert.assertTrue(style instanceof BooleanValueStyle);
+		Assert.assertTrue(table.getStyles().contains(style));
+		Assert.assertTrue(style == table.getStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle()));
+
+	}
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF
index d24b0b2ebb3..8f3a830fd7a 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.suite.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.suite.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.nattable.common.tests;bundle-version="[1.2.0,2.0.0)",

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

- org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="[1.2.0,2.0.0)",

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

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

+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 0.0.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.suite.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.suite.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.common.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)"
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.project b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.project
index 5ba323d25d3..08afd421c75 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.project
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.nattable.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/about.html b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/about.html
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/build.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/build.properties
index cfe57bc9d15..7be908845f4 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/build.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/build.properties
@@ -1,10 +1,10 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               resources/,\

-               plugin.properties,\

-               build.properties,\

-               NattableCommonTests.launch

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               resources/,\
+               plugin.properties,\
+               build.properties,\
+               NattableCommonTests.launch
+src.includes = about.html
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/plugin.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/plugin.properties
index dccd358f8ac..955077c98b6 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/plugin.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/plugin.properties
@@ -1,4 +1,4 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.tests

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Papyrus Infra Nattable Tests

+#Properties file for org.eclipse.papyrus.infra.nattable.tests
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = Papyrus Infra Nattable Tests
 Bundle-Description = This plugin provides JUnit tests for the common part of Papyrus nattable editors
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/resources/model.di b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/resources/model.di
index 73b19471e7d..7a2cac93e22 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/resources/model.di
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/resources/model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

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

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_5GEJQA2vEeSr6-fzR0LLcA"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_5GEJQA2vEeSr6-fzR0LLcA"/>

-        </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="model.notation#_5GEJQA2vEeSr6-fzR0LLcA"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_5GEJQA2vEeSr6-fzR0LLcA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/resources/model.notation b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/resources/model.notation
index 76a8f157a01..aec9a53027f 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/resources/model.notation
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/resources/model.notation
@@ -1,269 +1,269 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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:uml="http://www.eclipse.org/uml2/4.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" xmi:id="_5GEJQA2vEeSr6-fzR0LLcA" name="GenericTable0" currentRowAxisProvider="_5GEJQg2vEeSr6-fzR0LLcA" currentColumnAxisProvider="_5GEJQQ2vEeSr6-fzR0LLcA">

-  <context xmi:type="uml:Model" href="model.uml#_2rj1sA2vEeSr6-fzR0LLcA"/>

-  <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="_5GEJQQ2vEeSr6-fzR0LLcA" 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="_NERkIA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//NamedElement/clientDependency"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkIQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Namespace/elementImport"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkIg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Namespace/importedMember"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkIw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Namespace/member"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkJA2wEeSr6-fzR0LLcA">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkJQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//NamedElement/nameExpression"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkJg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//NamedElement/namespace"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkJw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Package/nestedPackage"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkKA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Package/nestingPackage"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkKQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Element/ownedComment"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkKg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Element/ownedElement"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkKw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Namespace/ownedMember"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkLA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Namespace/ownedRule"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkLQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Package/ownedStereotype"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkLg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkLw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Package/ownedType"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkMA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Element/owner"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkMQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkMg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Package/packagedElement"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkMw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Namespace/packageImport"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkNA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Package/packageMerge"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkNQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Package/profileApplication"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkNg2wEeSr6-fzR0LLcA">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkNw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkOA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkOQ2wEeSr6-fzR0LLcA">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkOg2wEeSr6-fzR0LLcA">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkOw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/attribute"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkPA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkPQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/collaborationUse"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkPg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Class/extension"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkPw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/feature"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkQA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/general"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkQQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/generalization"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkQg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/inheritedMember"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkQw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkRA2wEeSr6-fzR0LLcA">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkRQ2wEeSr6-fzR0LLcA">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkRg2wEeSr6-fzR0LLcA">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkRw2wEeSr6-fzR0LLcA">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkSA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Class/nestedClassifier"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkSQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkSg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkSw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkTA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Class/ownedOperation"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkTQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkTg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Class/ownedReception"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkTw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkUA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Type/package"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkUQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//StructuredClassifier/part"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkUg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkUw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkVA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkVQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkVg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/representation"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkVw2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//StructuredClassifier/role"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkWA2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/substitution"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkWQ2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Class/superClass"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkWg2wEeSr6-fzR0LLcA">

-      <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/4.0.0/UML#//Classifier/useCase"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_5GEJQg2vEeSr6-fzR0LLcA" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider" disconnectSlave="true">

-    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3oA2wEeSr6-fzR0LLcA">

-      <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:Model" href="model.uml#_2rj1sA2vEeSr6-fzR0LLcA"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3oQ2wEeSr6-fzR0LLcA">

-      <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:Class" href="model.uml#_7xl7YA2vEeSr6-fzR0LLcA"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3og2wEeSr6-fzR0LLcA">

-      <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:Class" href="model.uml#_8rcUgA2vEeSr6-fzR0LLcA"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3ow2wEeSr6-fzR0LLcA">

-      <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:Package" href="model.uml#_BOrPIA2wEeSr6-fzR0LLcA"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3pA2wEeSr6-fzR0LLcA">

-      <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:Class" href="model.uml#_CDf-UA2wEeSr6-fzR0LLcA"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3pQ2wEeSr6-fzR0LLcA">

-      <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:Class" href="model.uml#_CDglYA2wEeSr6-fzR0LLcA"/>

-    </axis>

-  </rowAxisProvidersHistory>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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:uml="http://www.eclipse.org/uml2/4.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" xmi:id="_5GEJQA2vEeSr6-fzR0LLcA" name="GenericTable0" currentRowAxisProvider="_5GEJQg2vEeSr6-fzR0LLcA" currentColumnAxisProvider="_5GEJQQ2vEeSr6-fzR0LLcA">
+  <context xmi:type="uml:Model" href="model.uml#_2rj1sA2vEeSr6-fzR0LLcA"/>
+  <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="_5GEJQQ2vEeSr6-fzR0LLcA" 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="_NERkIA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//NamedElement/clientDependency"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkIQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Namespace/elementImport"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkIg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Namespace/importedMember"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkIw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Namespace/member"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkJA2wEeSr6-fzR0LLcA">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkJQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//NamedElement/nameExpression"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkJg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//NamedElement/namespace"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkJw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Package/nestedPackage"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkKA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Package/nestingPackage"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkKQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Element/ownedComment"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkKg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Element/ownedElement"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkKw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Namespace/ownedMember"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkLA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Namespace/ownedRule"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkLQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Package/ownedStereotype"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkLg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkLw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Package/ownedType"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkMA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Element/owner"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkMQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkMg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Package/packagedElement"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkMw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Namespace/packageImport"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkNA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Package/packageMerge"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkNQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Package/profileApplication"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkNg2wEeSr6-fzR0LLcA">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkNw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkOA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkOQ2wEeSr6-fzR0LLcA">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkOg2wEeSr6-fzR0LLcA">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkOw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/attribute"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkPA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkPQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/collaborationUse"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkPg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Class/extension"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkPw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/feature"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkQA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/general"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkQQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/generalization"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkQg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/inheritedMember"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkQw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkRA2wEeSr6-fzR0LLcA">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkRQ2wEeSr6-fzR0LLcA">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkRg2wEeSr6-fzR0LLcA">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkRw2wEeSr6-fzR0LLcA">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkSA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Class/nestedClassifier"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkSQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkSg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkSw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkTA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Class/ownedOperation"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkTQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkTg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Class/ownedReception"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkTw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkUA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Type/package"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkUQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//StructuredClassifier/part"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkUg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkUw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkVA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkVQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkVg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/representation"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkVw2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//StructuredClassifier/role"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkWA2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/substitution"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkWQ2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Class/superClass"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_NERkWg2wEeSr6-fzR0LLcA">
+      <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/4.0.0/UML#//Classifier/useCase"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_5GEJQg2vEeSr6-fzR0LLcA" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider" disconnectSlave="true">
+    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3oA2wEeSr6-fzR0LLcA">
+      <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:Model" href="model.uml#_2rj1sA2vEeSr6-fzR0LLcA"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3oQ2wEeSr6-fzR0LLcA">
+      <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:Class" href="model.uml#_7xl7YA2vEeSr6-fzR0LLcA"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3og2wEeSr6-fzR0LLcA">
+      <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:Class" href="model.uml#_8rcUgA2vEeSr6-fzR0LLcA"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3ow2wEeSr6-fzR0LLcA">
+      <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:Package" href="model.uml#_BOrPIA2wEeSr6-fzR0LLcA"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3pA2wEeSr6-fzR0LLcA">
+      <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:Class" href="model.uml#_CDf-UA2wEeSr6-fzR0LLcA"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_NjU3pQ2wEeSr6-fzR0LLcA">
+      <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:Class" href="model.uml#_CDglYA2wEeSr6-fzR0LLcA"/>
+    </axis>
+  </rowAxisProvidersHistory>
+</nattable:Table>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/Activator.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/Activator.java
index 40db8d0b5ae..66c65f810e7 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/Activator.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/Activator.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:

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

- *

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

-package org.eclipse.papyrus.infra.nattable.tests;

-

-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.tests"; //$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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.tests;
+
+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.tests"; //$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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/AllTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/AllTests.java
index 8445ce59ab9..2ce3afc880f 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/AllTests.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/AllTests.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

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

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

- *  Christian W. Damus - bug 474467

- *

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

-package org.eclipse.papyrus.infra.nattable.tests.tests;

-

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		TableSelectionProviderTest.class,

-		PasteTreeUtils_Tests.class,

-		TableLabelProviderTest.class,

-})

-public class AllTests {

-	// JUnit 4 test suite

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 474467
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.tests.tests;
+
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		TableSelectionProviderTest.class,
+		PasteTreeUtils_Tests.class,
+		TableLabelProviderTest.class,
+})
+public class AllTests {
+	// JUnit 4 test suite
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/PasteTreeUtils_Tests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/PasteTreeUtils_Tests.java
index b08ad4395dc..b2f84096a27 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/PasteTreeUtils_Tests.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/PasteTreeUtils_Tests.java
@@ -1,462 +1,462 @@
-/*****************************************************************************

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

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.papyrus.infra.nattable.utils.PasteTreeUtils;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class PasteTreeUtils_Tests {

-

-

-	// ----------------- tests with a configuration for the 0 level

-	@Test

-	public void getDepth_H1_H1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(0));

-		hiddenColumns.add(Integer.valueOf(1));

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2; // because we start to depth=0;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {// because read char start to 1

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_H1_H1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(0));

-		hiddenColumns.add(Integer.valueOf(1));

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(2));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_H1_V1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(0));

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_H1_V1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(0));

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));

-		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_V1_H1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(1));

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_V1_H1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(1));

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));

-		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_V1_V1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_V1_V1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));

-		resultMap.put(Integer.valueOf(5), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	// tests with no configuration for the 0 level

-	@Test

-	public void getDepth_Empty_H1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(1));

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2; // because we start to depth=0;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {// because read char start to 1

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, false);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_Empty_H1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(1));

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(2));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, false);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_Empty_V1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, false);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-	@Test

-	public void getDepth_Empty_V1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		int maxDepth = 2;

-		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();

-		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));

-		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));

-		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));

-		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, false);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);

-		}

-	}

-

-

-	// ----------------- tests with a configuration for the 0 level

-	@Test

-	public void isCategory_H1_H1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(0));

-		hiddenColumns.add(Integer.valueOf(1));

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2; // because we start to depth=0;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(1),Boolean.FALSE);

-		resultMap.put(Integer.valueOf(2), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {// because read char start to 1

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_H1_H1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(0));

-		hiddenColumns.add(Integer.valueOf(1));

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(1), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(2), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(3), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_H1_V1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(0));

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(1), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(2), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(3), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_H1_V1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(0));

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(1), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(2), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(3), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(4), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_V1_H1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(1));

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(1), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(2), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(3), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_V1_H1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(1));

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(1), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(2), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(3), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(4), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_V1_V1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(1), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(2), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(3), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(4), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_V1_V1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(1), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(2), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(3), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(4), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(5), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	// tests with no configuration for the 0 level

-	@Test

-	public void isCategory_Empty_H1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(1));

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2; // because we start to depth=0;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(1), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(2), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {// because read char start to 1

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, false);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_Empty_H1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(1));

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(1), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(2), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(3), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, false);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_Empty_V1_H1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		hiddenColumns.add(Integer.valueOf(2));

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(1), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(2), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(3), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, false);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-	@Test

-	public void isCategory_Empty_V1_V1_Test() {

-		List<Integer> hiddenColumns = new ArrayList<Integer>();

-		int maxDepth = 2;

-		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();

-		resultMap.put(Integer.valueOf(0), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(1), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(2), Boolean.FALSE);

-		resultMap.put(Integer.valueOf(3), Boolean.TRUE);

-		resultMap.put(Integer.valueOf(4), Boolean.FALSE);

-		int nbColumns = resultMap.size();

-		for (int i = 1; i <= nbColumns; i++) {

-			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, false);

-			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * 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.tests.tests;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.papyrus.infra.nattable.utils.PasteTreeUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class PasteTreeUtils_Tests {
+
+
+	// ----------------- tests with a configuration for the 0 level
+	@Test
+	public void getDepth_H1_H1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(0));
+		hiddenColumns.add(Integer.valueOf(1));
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2; // because we start to depth=0;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {// because read char start to 1
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_H1_H1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(0));
+		hiddenColumns.add(Integer.valueOf(1));
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(2));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_H1_V1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(0));
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_H1_V1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(0));
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));
+		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_V1_H1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(1));
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_V1_H1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(1));
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));
+		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_V1_V1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_V1_V1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));
+		resultMap.put(Integer.valueOf(5), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	// tests with no configuration for the 0 level
+	@Test
+	public void getDepth_Empty_H1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(1));
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2; // because we start to depth=0;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {// because read char start to 1
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, false);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_Empty_H1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(1));
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(2));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, false);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_Empty_V1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, false);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+	@Test
+	public void getDepth_Empty_V1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		int maxDepth = 2;
+		Map<Integer, Integer> resultMap = new HashMap<Integer, Integer>();
+		resultMap.put(Integer.valueOf(0), Integer.valueOf(0));
+		resultMap.put(Integer.valueOf(1), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(2), Integer.valueOf(1));
+		resultMap.put(Integer.valueOf(3), Integer.valueOf(2));
+		resultMap.put(Integer.valueOf(4), Integer.valueOf(2));
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			int result = PasteTreeUtils.getDepth(i, maxDepth, hiddenColumns, false);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)).intValue(), result);
+		}
+	}
+
+
+	// ----------------- tests with a configuration for the 0 level
+	@Test
+	public void isCategory_H1_H1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(0));
+		hiddenColumns.add(Integer.valueOf(1));
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2; // because we start to depth=0;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(1),Boolean.FALSE);
+		resultMap.put(Integer.valueOf(2), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {// because read char start to 1
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_H1_H1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(0));
+		hiddenColumns.add(Integer.valueOf(1));
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(1), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(2), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(3), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_H1_V1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(0));
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(1), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(2), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(3), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_H1_V1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(0));
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(1), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(2), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(3), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(4), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_V1_H1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(1));
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(1), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(2), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(3), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_V1_H1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(1));
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(1), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(2), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(3), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(4), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_V1_V1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(1), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(2), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(3), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(4), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_V1_V1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(1), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(2), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(3), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(4), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(5), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, true);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	// tests with no configuration for the 0 level
+	@Test
+	public void isCategory_Empty_H1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(1));
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2; // because we start to depth=0;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(1), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(2), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {// because read char start to 1
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, false);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_Empty_H1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(1));
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(1), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(2), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(3), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, false);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_Empty_V1_H1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		hiddenColumns.add(Integer.valueOf(2));
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(1), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(2), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(3), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, false);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+	@Test
+	public void isCategory_Empty_V1_V1_Test() {
+		List<Integer> hiddenColumns = new ArrayList<Integer>();
+		int maxDepth = 2;
+		Map<Integer, Boolean> resultMap = new HashMap<Integer, Boolean>();
+		resultMap.put(Integer.valueOf(0), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(1), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(2), Boolean.FALSE);
+		resultMap.put(Integer.valueOf(3), Boolean.TRUE);
+		resultMap.put(Integer.valueOf(4), Boolean.FALSE);
+		int nbColumns = resultMap.size();
+		for (int i = 1; i <= nbColumns; i++) {
+			boolean result = PasteTreeUtils.isCategory(i, maxDepth, hiddenColumns, false);
+			Assert.assertEquals(resultMap.get(Integer.valueOf(i - 1)), Boolean.valueOf(result));
+		}
+	}
+
+
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.classpath b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.classpath
index 8a8f1668cdc..ad32c83a788 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.classpath
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.project b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.project
index bca8577961f..2078c52f7f4 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.project
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.views.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.nattable.views.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/about.html b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/about.html
index 82d49bf5f81..d35d5aed64c 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/about.html
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/build.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/build.properties
index d0a17ebd1ca..773d47e9b0a 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/build.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               resources/,\

-               plugin.properties

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               resources/,\
+               plugin.properties
+src.includes = about.html
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.di b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.di
index 4c7d9891ae0..dffad0daf08 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.di
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.di
@@ -1,23 +1,23 @@
-<?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="model.notation#_ZHTYcOImEeK3ebxQGrgGhw"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_ZHciYOImEeK3ebxQGrgGhw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_ZHTYcOImEeK3ebxQGrgGhw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="model.notation#_ZHciYOImEeK3ebxQGrgGhw"/>

-        </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="model.notation#_ZHTYcOImEeK3ebxQGrgGhw"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="model.notation#_ZHciYOImEeK3ebxQGrgGhw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_ZHTYcOImEeK3ebxQGrgGhw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="model.notation#_ZHciYOImEeK3ebxQGrgGhw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.notation b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.notation
index 5d92f64374e..3bc09ca7e5c 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.notation
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.notation
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

-  <notation:Diagram xmi:id="_ZHTYcOImEeK3ebxQGrgGhw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

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

-    <element xmi:type="uml:Model" href="model.uml#_ZG2sxOImEeK3ebxQGrgGhw"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_ZHciYOImEeK3ebxQGrgGhw" type="PapyrusUMLComponentDiagram" name="NewDiagram" measurementUnit="Pixel">

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

-    <element xmi:type="uml:Model" href="model.uml#_ZG2sxOImEeK3ebxQGrgGhw"/>

-  </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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <notation:Diagram xmi:id="_ZHTYcOImEeK3ebxQGrgGhw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_ZHTYceImEeK3ebxQGrgGhw"/>
+    <element xmi:type="uml:Model" href="model.uml#_ZG2sxOImEeK3ebxQGrgGhw"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_ZHciYOImEeK3ebxQGrgGhw" type="PapyrusUMLComponentDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_ZHciYeImEeK3ebxQGrgGhw"/>
+    <element xmi:type="uml:Model" href="model.uml#_ZG2sxOImEeK3ebxQGrgGhw"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.uml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.uml
index e6fd4aebbfc..40594daa905 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.uml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model.uml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_ZG2sxOImEeK3ebxQGrgGhw" name="RootModel">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_ZG2sxeImEeK3ebxQGrgGhw">

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

-  </packageImport>

-  <packagedElement xmi:type="uml:Model" xmi:id="_bbLfkOImEeK3ebxQGrgGhw" name="SubModel">

-    <packagedElement xmi:type="uml:Model" xmi:id="_csQs8OImEeK3ebxQGrgGhw" name="SubSubModel"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_hTvOYOImEeK3ebxQGrgGhw" name="SubPackage">

-    <packagedElement xmi:type="uml:Package" xmi:id="_irqqoOImEeK3ebxQGrgGhw" name="SubSubPackage"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_ZG2sxOImEeK3ebxQGrgGhw" name="RootModel">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_ZG2sxeImEeK3ebxQGrgGhw">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Model" xmi:id="_bbLfkOImEeK3ebxQGrgGhw" name="SubModel">
+    <packagedElement xmi:type="uml:Model" xmi:id="_csQs8OImEeK3ebxQGrgGhw" name="SubSubModel"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_hTvOYOImEeK3ebxQGrgGhw" name="SubPackage">
+    <packagedElement xmi:type="uml:Package" xmi:id="_irqqoOImEeK3ebxQGrgGhw" name="SubSubPackage"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.di b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.di
index 02f35ba8724..2a1f59296b6 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.di
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.di
@@ -1,19 +1,19 @@
-<?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="model2.notation#_RhNAkOJkEeKMjtLnLklb5Q"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="model2.notation#_TD14AOJkEeKMjtLnLklb5Q"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="model2.notation#_WCKDQOJkEeKMjtLnLklb5Q"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder"/>

-    </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="model2.notation#_RhNAkOJkEeKMjtLnLklb5Q"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="model2.notation#_TD14AOJkEeKMjtLnLklb5Q"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="model2.notation#_WCKDQOJkEeKMjtLnLklb5Q"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder"/>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.notation b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.notation
index 956133d804b..85854b08cd8 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.notation
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.notation
@@ -1,30 +1,30 @@
-<?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:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/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="_RhNAkOJkEeKMjtLnLklb5Q" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel">

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

-    <element xmi:type="uml:Model" href="model2.uml#_NTXuMOJkEeKMjtLnLklb5Q"/>

-  </notation:Diagram>

-  <nattable:Table xmi:id="_TD14AOJkEeKMjtLnLklb5Q" name="TableOfViews0" currentRowAxisProvider="_TD14BuJkEeKMjtLnLklb5Q" currentColumnAxisProvider="_TD14AeJkEeKMjtLnLklb5Q">

-    <context xmi:type="uml:Model" href="model2.uml#_NTXuMOJkEeKMjtLnLklb5Q"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_TD14AeJkEeKMjtLnLklb5Q" description="Provides the features of the views" name="Papyrus Views feature provider">

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_TD14AuJkEeKMjtLnLklb5Q" element="nattable_editor_pages:/name">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_TD14A-JkEeKMjtLnLklb5Q" element="nattable_editor_pages:/context">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_TD14BOJkEeKMjtLnLklb5Q" element="nattable_editor_pages:/isOpen">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_TD14BeJkEeKMjtLnLklb5Q" element="nattable_editor_pages:/type">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_TD14BuJkEeKMjtLnLklb5Q"/>

-  </nattable:Table>

-  <notation:Diagram xmi:id="_WCKDQOJkEeKMjtLnLklb5Q" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel">

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

-    <element xmi:type="uml:Model" href="model2.uml#_Km1PcOJkEeKMjtLnLklb5Q"/>

-  </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:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/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="_RhNAkOJkEeKMjtLnLklb5Q" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_RhNAkeJkEeKMjtLnLklb5Q"/>
+    <element xmi:type="uml:Model" href="model2.uml#_NTXuMOJkEeKMjtLnLklb5Q"/>
+  </notation:Diagram>
+  <nattable:Table xmi:id="_TD14AOJkEeKMjtLnLklb5Q" name="TableOfViews0" currentRowAxisProvider="_TD14BuJkEeKMjtLnLklb5Q" currentColumnAxisProvider="_TD14AeJkEeKMjtLnLklb5Q">
+    <context xmi:type="uml:Model" href="model2.uml#_NTXuMOJkEeKMjtLnLklb5Q"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_TD14AeJkEeKMjtLnLklb5Q" description="Provides the features of the views" name="Papyrus Views feature provider">
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_TD14AuJkEeKMjtLnLklb5Q" element="nattable_editor_pages:/name">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_TD14A-JkEeKMjtLnLklb5Q" element="nattable_editor_pages:/context">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_TD14BOJkEeKMjtLnLklb5Q" element="nattable_editor_pages:/isOpen">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_TD14BeJkEeKMjtLnLklb5Q" element="nattable_editor_pages:/type">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_TD14BuJkEeKMjtLnLklb5Q"/>
+  </nattable:Table>
+  <notation:Diagram xmi:id="_WCKDQOJkEeKMjtLnLklb5Q" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_WCKDQeJkEeKMjtLnLklb5Q"/>
+    <element xmi:type="uml:Model" href="model2.uml#_Km1PcOJkEeKMjtLnLklb5Q"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.uml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.uml
index bcb0b1e19d2..d49c61af5ae 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.uml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/model2.uml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Km1PcOJkEeKMjtLnLklb5Q" name="model">

-  <packagedElement xmi:type="uml:Model" xmi:id="_NTXuMOJkEeKMjtLnLklb5Q" name="SubModel1"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Km1PcOJkEeKMjtLnLklb5Q" name="model">
+  <packagedElement xmi:type="uml:Model" xmi:id="_NTXuMOJkEeKMjtLnLklb5Q" name="SubModel1"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.di b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.di
index 2217bda8e8f..d0ac0fffaeb 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.di
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.di
@@ -1,29 +1,29 @@
-<?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="modelUMLClass.notation#_IbRcdgKNEeSZ5cZUOQKWkw"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="modelUMLClass.notation#_wPPgkAKNEeSZ5cZUOQKWkw"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="modelUMLClass.notation#_xVcToAKNEeSZ5cZUOQKWkw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="modelUMLClass.notation#_xVcToAKNEeSZ5cZUOQKWkw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="modelUMLClass.notation#_IbRcdgKNEeSZ5cZUOQKWkw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="modelUMLClass.notation#_wPPgkAKNEeSZ5cZUOQKWkw"/>

-        </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="modelUMLClass.notation#_IbRcdgKNEeSZ5cZUOQKWkw"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="modelUMLClass.notation#_wPPgkAKNEeSZ5cZUOQKWkw"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="modelUMLClass.notation#_xVcToAKNEeSZ5cZUOQKWkw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="modelUMLClass.notation#_xVcToAKNEeSZ5cZUOQKWkw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="modelUMLClass.notation#_IbRcdgKNEeSZ5cZUOQKWkw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="modelUMLClass.notation#_wPPgkAKNEeSZ5cZUOQKWkw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.notation b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.notation
index ada89afca8b..eb7404e1903 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.notation
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.notation
@@ -1,1712 +1,1712 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/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="_IbRcdgKNEeSZ5cZUOQKWkw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_Rk1owAKNEeSZ5cZUOQKWkw" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Rk1owgKNEeSZ5cZUOQKWkw" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Rk1owwKNEeSZ5cZUOQKWkw" type="7016">

-        <children xmi:type="notation:Shape" xmi:id="_PYK84QKNEeSZ5cZUOQKWkw" type="2008">

-          <children xmi:type="notation:DecorationNode" xmi:id="_PYK84wKNEeSZ5cZUOQKWkw" type="5029"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK85AKNEeSZ5cZUOQKWkw" type="7017">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK85QKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK85gKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK85wKNEeSZ5cZUOQKWkw"/>

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

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK86QKNEeSZ5cZUOQKWkw" type="7018">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK86gKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK86wKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK87AKNEeSZ5cZUOQKWkw"/>

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

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK87gKNEeSZ5cZUOQKWkw" type="7019">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK87wKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK88AKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK88QKNEeSZ5cZUOQKWkw"/>

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

-          </children>

-          <element xmi:type="uml:Class" href="modelUMLClass.uml#_PYK84AKNEeSZ5cZUOQKWkw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK84gKNEeSZ5cZUOQKWkw" x="16" y="50"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_P-y4AQKNEeSZ5cZUOQKWkw" type="2008">

-          <children xmi:type="notation:DecorationNode" xmi:id="_P-y4AwKNEeSZ5cZUOQKWkw" type="5029"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4BAKNEeSZ5cZUOQKWkw" type="7017">

-            <children xmi:type="notation:Shape" xmi:id="_qU6QIQKNEeSZ5cZUOQKWkw" type="3012">

-              <element xmi:type="uml:Property" href="modelUMLClass.uml#_qU6QIAKNEeSZ5cZUOQKWkw"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_qU6QIgKNEeSZ5cZUOQKWkw"/>

-            </children>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4BQKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4BgKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4BwKNEeSZ5cZUOQKWkw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4CAKNEeSZ5cZUOQKWkw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4CQKNEeSZ5cZUOQKWkw" type="7018">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4CgKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4CwKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4DAKNEeSZ5cZUOQKWkw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4DQKNEeSZ5cZUOQKWkw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4DgKNEeSZ5cZUOQKWkw" type="7019">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4DwKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4EAKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4EQKNEeSZ5cZUOQKWkw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4EgKNEeSZ5cZUOQKWkw"/>

-          </children>

-          <element xmi:type="uml:Class" href="modelUMLClass.uml#_P-y4AAKNEeSZ5cZUOQKWkw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4AgKNEeSZ5cZUOQKWkw" x="350" y="44" width="109" height="119"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Rk1oxAKNEeSZ5cZUOQKWkw"/>

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

-      </children>

-      <element xmi:type="uml:Package" href="modelUMLClass.uml#_RkviIAKNEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rk1owQKNEeSZ5cZUOQKWkw" x="26" y="10" width="499" height="291"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_UdqQAQKNEeSZ5cZUOQKWkw" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_UdqQAwKNEeSZ5cZUOQKWkw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQBAKNEeSZ5cZUOQKWkw" type="7017">

-        <children xmi:type="notation:Shape" xmi:id="_pq7fAQKNEeSZ5cZUOQKWkw" type="3012">

-          <element xmi:type="uml:Property" href="modelUMLClass.uml#_pq7fAAKNEeSZ5cZUOQKWkw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pq7fAgKNEeSZ5cZUOQKWkw"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQBQKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQBgKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQBwKNEeSZ5cZUOQKWkw"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQCQKNEeSZ5cZUOQKWkw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQCgKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQCwKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQDAKNEeSZ5cZUOQKWkw"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQDgKNEeSZ5cZUOQKWkw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQDwKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQEAKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQEQKNEeSZ5cZUOQKWkw"/>

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

-      </children>

-      <element xmi:type="uml:Class" href="modelUMLClass.uml#_UdqQAAKNEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQAgKNEeSZ5cZUOQKWkw" x="581" y="69" width="172" height="178"/>

-    </children>

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

-    <element xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>

-    <edges xmi:type="notation:Connector" xmi:id="_VlqZ4AKNEeSZ5cZUOQKWkw" type="4001" source="_PYK84QKNEeSZ5cZUOQKWkw" target="_P-y4AQKNEeSZ5cZUOQKWkw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ4wKNEeSZ5cZUOQKWkw" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ5AKNEeSZ5cZUOQKWkw" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ5QKNEeSZ5cZUOQKWkw" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ5gKNEeSZ5cZUOQKWkw" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ5wKNEeSZ5cZUOQKWkw" type="6003">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ6AKNEeSZ5cZUOQKWkw" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ6QKNEeSZ5cZUOQKWkw" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ6gKNEeSZ5cZUOQKWkw" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ6wKNEeSZ5cZUOQKWkw" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ7AKNEeSZ5cZUOQKWkw" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ7QKNEeSZ5cZUOQKWkw" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ7gKNEeSZ5cZUOQKWkw" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_VlqZ4QKNEeSZ5cZUOQKWkw"/>

-      <element xmi:type="uml:Association" href="modelUMLClass.uml#_VlkTQwKNEeSZ5cZUOQKWkw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VlqZ4gKNEeSZ5cZUOQKWkw" points="[12, -1, -114, 0]$[107, -3, -19, -2]"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VmncIQKNEeSZ5cZUOQKWkw" id="(0.0,0.46218487394957986)"/>

-    </edges>

-  </notation:Diagram>

-  <nattable:Table xmi:id="_wPPgkAKNEeSZ5cZUOQKWkw" name="TableOfViews0" currentRowAxisProvider="_wPPglgKNEeSZ5cZUOQKWkw" currentColumnAxisProvider="_wPPgkQKNEeSZ5cZUOQKWkw">

-    <context xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_wPPgkQKNEeSZ5cZUOQKWkw" description="Provides the features of the views" name="Papyrus Views feature provider">

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPgkgKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/name">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPgkwKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/context">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPglAKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/isOpen">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPglQKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/type">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_wPPglgKNEeSZ5cZUOQKWkw"/>

-  </nattable:Table>

-  <nattable:Table xmi:id="_xVcToAKNEeSZ5cZUOQKWkw" name="GenericTable0" currentRowAxisProvider="_xVcTogKNEeSZ5cZUOQKWkw" currentColumnAxisProvider="_xVcToQKNEeSZ5cZUOQKWkw">

-    <context xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>

-    <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="_xVcToQKNEeSZ5cZUOQKWkw" 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="_x3AvoAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvoQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packagedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvogKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvowKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestedPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestingPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedType"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/profileApplication"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packageMerge"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvswKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedStereotype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvugKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packagedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestedPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestingPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedType"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/profileApplication"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packageMerge"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedStereotype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9wKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-QKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-gKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-wKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL435AKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL435QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ggKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ConnectableElement/end"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/qualifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--igKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/defaultValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/association"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/interface"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/associationEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/subsettedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/owningAssociation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/class"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ngKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TypedElement/type"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--oAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/redefinedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--oQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/opposite"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ogKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--owKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Feature/featuringClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/datatype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Relationship/relatedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7AKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Association/memberEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8AKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Association/isDerived"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8QKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Association/endType"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Association/navigableOwnedEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_gKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Association/ownedEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5gQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ggKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5gwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5igKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ConnectableElement/end"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/qualifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/defaultValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/association"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/interface"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/associationEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/subsettedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/owningAssociation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ngKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5oAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5oQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ogKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/class"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5owKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TypedElement/type"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/redefinedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/opposite"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Feature/featuringClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/datatype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5rAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPaAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPaQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPagKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPawKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ConnectableElement/end"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/qualifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/defaultValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/association"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/interface"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/associationEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPeAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPeQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/subsettedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPegKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPewKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/owningAssociation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPggKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/class"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TypedElement/type"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/redefinedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/opposite"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPigKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Feature/featuringClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/datatype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPjAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_xVcTogKNEeSZ5cZUOQKWkw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_x26pAAKNEeSZ5cZUOQKWkw">

-        <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:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_ygZq4AKNEeSZ5cZUOQKWkw">

-        <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:Package" href="modelUMLClass.uml#_RkviIAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_ywnRIAKNEeSZ5cZUOQKWkw">

-        <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:Class" href="modelUMLClass.uml#_PYK84AKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_y9G1AAKNEeSZ5cZUOQKWkw">

-        <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:Class" href="modelUMLClass.uml#_P-y4AAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_zL434AKNEeSZ5cZUOQKWkw">

-        <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:Property" href="modelUMLClass.uml#_qU6QIAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_0DlU4AKNEeSZ5cZUOQKWkw">

-        <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:Association" href="modelUMLClass.uml#_VlkTQwKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_0gq5gAKNEeSZ5cZUOQKWkw">

-        <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:Property" href="modelUMLClass.uml#_VlkTRAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_1xKRAAKNEeSZ5cZUOQKWkw">

-        <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:Class" href="modelUMLClass.uml#_UdqQAAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_1-CPYAKNEeSZ5cZUOQKWkw">

-        <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:Property" href="modelUMLClass.uml#_pq7fAAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-    </rowAxisProvidersHistory>

-  </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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/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="_IbRcdgKNEeSZ5cZUOQKWkw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Rk1owAKNEeSZ5cZUOQKWkw" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Rk1owgKNEeSZ5cZUOQKWkw" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Rk1owwKNEeSZ5cZUOQKWkw" type="7016">
+        <children xmi:type="notation:Shape" xmi:id="_PYK84QKNEeSZ5cZUOQKWkw" type="2008">
+          <children xmi:type="notation:DecorationNode" xmi:id="_PYK84wKNEeSZ5cZUOQKWkw" type="5029"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK85AKNEeSZ5cZUOQKWkw" type="7017">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK85QKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK85gKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK85wKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK86AKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK86QKNEeSZ5cZUOQKWkw" type="7018">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK86gKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK86wKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK87AKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK87QKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK87gKNEeSZ5cZUOQKWkw" type="7019">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK87wKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK88AKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK88QKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK88gKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <element xmi:type="uml:Class" href="modelUMLClass.uml#_PYK84AKNEeSZ5cZUOQKWkw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK84gKNEeSZ5cZUOQKWkw" x="16" y="50"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_P-y4AQKNEeSZ5cZUOQKWkw" type="2008">
+          <children xmi:type="notation:DecorationNode" xmi:id="_P-y4AwKNEeSZ5cZUOQKWkw" type="5029"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4BAKNEeSZ5cZUOQKWkw" type="7017">
+            <children xmi:type="notation:Shape" xmi:id="_qU6QIQKNEeSZ5cZUOQKWkw" type="3012">
+              <element xmi:type="uml:Property" href="modelUMLClass.uml#_qU6QIAKNEeSZ5cZUOQKWkw"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_qU6QIgKNEeSZ5cZUOQKWkw"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4BQKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4BgKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4BwKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4CAKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4CQKNEeSZ5cZUOQKWkw" type="7018">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4CgKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4CwKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4DAKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4DQKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4DgKNEeSZ5cZUOQKWkw" type="7019">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4DwKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4EAKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4EQKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4EgKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <element xmi:type="uml:Class" href="modelUMLClass.uml#_P-y4AAKNEeSZ5cZUOQKWkw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4AgKNEeSZ5cZUOQKWkw" x="350" y="44" width="109" height="119"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Rk1oxAKNEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rk1oxQKNEeSZ5cZUOQKWkw"/>
+      </children>
+      <element xmi:type="uml:Package" href="modelUMLClass.uml#_RkviIAKNEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rk1owQKNEeSZ5cZUOQKWkw" x="26" y="10" width="499" height="291"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UdqQAQKNEeSZ5cZUOQKWkw" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UdqQAwKNEeSZ5cZUOQKWkw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQBAKNEeSZ5cZUOQKWkw" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_pq7fAQKNEeSZ5cZUOQKWkw" type="3012">
+          <element xmi:type="uml:Property" href="modelUMLClass.uml#_pq7fAAKNEeSZ5cZUOQKWkw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_pq7fAgKNEeSZ5cZUOQKWkw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQBQKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQBgKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQBwKNEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQCAKNEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQCQKNEeSZ5cZUOQKWkw" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQCgKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQCwKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQDAKNEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQDQKNEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQDgKNEeSZ5cZUOQKWkw" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQDwKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQEAKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQEQKNEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQEgKNEeSZ5cZUOQKWkw"/>
+      </children>
+      <element xmi:type="uml:Class" href="modelUMLClass.uml#_UdqQAAKNEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQAgKNEeSZ5cZUOQKWkw" x="581" y="69" width="172" height="178"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_IbRcdwKNEeSZ5cZUOQKWkw"/>
+    <element xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_VlqZ4AKNEeSZ5cZUOQKWkw" type="4001" source="_PYK84QKNEeSZ5cZUOQKWkw" target="_P-y4AQKNEeSZ5cZUOQKWkw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ4wKNEeSZ5cZUOQKWkw" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ5AKNEeSZ5cZUOQKWkw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ5QKNEeSZ5cZUOQKWkw" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ5gKNEeSZ5cZUOQKWkw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ5wKNEeSZ5cZUOQKWkw" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ6AKNEeSZ5cZUOQKWkw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ6QKNEeSZ5cZUOQKWkw" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ6gKNEeSZ5cZUOQKWkw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ6wKNEeSZ5cZUOQKWkw" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ7AKNEeSZ5cZUOQKWkw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ7QKNEeSZ5cZUOQKWkw" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ7gKNEeSZ5cZUOQKWkw" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_VlqZ4QKNEeSZ5cZUOQKWkw"/>
+      <element xmi:type="uml:Association" href="modelUMLClass.uml#_VlkTQwKNEeSZ5cZUOQKWkw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VlqZ4gKNEeSZ5cZUOQKWkw" points="[12, -1, -114, 0]$[107, -3, -19, -2]"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VmncIQKNEeSZ5cZUOQKWkw" id="(0.0,0.46218487394957986)"/>
+    </edges>
+  </notation:Diagram>
+  <nattable:Table xmi:id="_wPPgkAKNEeSZ5cZUOQKWkw" name="TableOfViews0" currentRowAxisProvider="_wPPglgKNEeSZ5cZUOQKWkw" currentColumnAxisProvider="_wPPgkQKNEeSZ5cZUOQKWkw">
+    <context xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_wPPgkQKNEeSZ5cZUOQKWkw" description="Provides the features of the views" name="Papyrus Views feature provider">
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPgkgKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/name">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPgkwKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/context">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPglAKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/isOpen">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPglQKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/type">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_wPPglgKNEeSZ5cZUOQKWkw"/>
+  </nattable:Table>
+  <nattable:Table xmi:id="_xVcToAKNEeSZ5cZUOQKWkw" name="GenericTable0" currentRowAxisProvider="_xVcTogKNEeSZ5cZUOQKWkw" currentColumnAxisProvider="_xVcToQKNEeSZ5cZUOQKWkw">
+    <context xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>
+    <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="_xVcToQKNEeSZ5cZUOQKWkw" 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="_x3AvoAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvoQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packagedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvogKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvowKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestedPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestingPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedType"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/profileApplication"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packageMerge"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvswKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedStereotype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvugKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packagedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestedPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestingPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedType"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/profileApplication"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packageMerge"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedStereotype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9wKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-QKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-gKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-wKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL435AKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL435QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ggKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ConnectableElement/end"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/qualifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--igKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/defaultValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/association"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/interface"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/associationEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/subsettedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/owningAssociation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/class"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ngKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TypedElement/type"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--oAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/redefinedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--oQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/opposite"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ogKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--owKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Feature/featuringClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/datatype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Relationship/relatedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7AKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Association/memberEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8AKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Association/isDerived"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8QKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Association/endType"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Association/navigableOwnedEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_gKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Association/ownedEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5gQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ggKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5gwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5igKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ConnectableElement/end"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/qualifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/defaultValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/association"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/interface"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/associationEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/subsettedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/owningAssociation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ngKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5oAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5oQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ogKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/class"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5owKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TypedElement/type"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/redefinedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/opposite"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Feature/featuringClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/datatype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5rAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPaAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPaQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPagKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPawKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ConnectableElement/end"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/qualifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/defaultValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/association"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/interface"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/associationEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPeAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPeQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/subsettedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPegKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPewKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/owningAssociation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPggKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/class"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TypedElement/type"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/redefinedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/opposite"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPigKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Feature/featuringClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/datatype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPjAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_xVcTogKNEeSZ5cZUOQKWkw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_x26pAAKNEeSZ5cZUOQKWkw">
+        <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:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_ygZq4AKNEeSZ5cZUOQKWkw">
+        <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:Package" href="modelUMLClass.uml#_RkviIAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_ywnRIAKNEeSZ5cZUOQKWkw">
+        <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:Class" href="modelUMLClass.uml#_PYK84AKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_y9G1AAKNEeSZ5cZUOQKWkw">
+        <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:Class" href="modelUMLClass.uml#_P-y4AAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_zL434AKNEeSZ5cZUOQKWkw">
+        <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:Property" href="modelUMLClass.uml#_qU6QIAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_0DlU4AKNEeSZ5cZUOQKWkw">
+        <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:Association" href="modelUMLClass.uml#_VlkTQwKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_0gq5gAKNEeSZ5cZUOQKWkw">
+        <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:Property" href="modelUMLClass.uml#_VlkTRAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_1xKRAAKNEeSZ5cZUOQKWkw">
+        <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:Class" href="modelUMLClass.uml#_UdqQAAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_1-CPYAKNEeSZ5cZUOQKWkw">
+        <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:Property" href="modelUMLClass.uml#_pq7fAAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+    </rowAxisProvidersHistory>
+  </nattable:Table>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.uml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.uml
index 43c57333080..2412b76831b 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.uml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/modelUMLClass.uml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_IbRcdAKNEeSZ5cZUOQKWkw" name="Model">

-  <packagedElement xmi:type="uml:Package" xmi:id="_RkviIAKNEeSZ5cZUOQKWkw" name="Package1">

-    <packagedElement xmi:type="uml:Class" xmi:id="_PYK84AKNEeSZ5cZUOQKWkw" name="Class1">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VlkTQAKNEeSZ5cZUOQKWkw" name="class2" type="_P-y4AAKNEeSZ5cZUOQKWkw" association="_VlkTQwKNEeSZ5cZUOQKWkw">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VlkTQQKNEeSZ5cZUOQKWkw" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VlkTQgKNEeSZ5cZUOQKWkw" value="1"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_P-y4AAKNEeSZ5cZUOQKWkw" name="Class2">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_qU6QIAKNEeSZ5cZUOQKWkw" name="Attribute2.1" visibility="public">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qg758AKNEeSZ5cZUOQKWkw" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qhCAkAKNEeSZ5cZUOQKWkw" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_qhCAkQKNEeSZ5cZUOQKWkw">

-          <value xsi:nil="true"/>

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_VlkTQwKNEeSZ5cZUOQKWkw" name="class1_class2_1" memberEnd="_VlkTRAKNEeSZ5cZUOQKWkw _VlkTQAKNEeSZ5cZUOQKWkw">

-      <ownedEnd xmi:type="uml:Property" xmi:id="_VlkTRAKNEeSZ5cZUOQKWkw" name="class1" type="_PYK84AKNEeSZ5cZUOQKWkw" association="_VlkTQwKNEeSZ5cZUOQKWkw">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VlkTRQKNEeSZ5cZUOQKWkw" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VlkTRgKNEeSZ5cZUOQKWkw" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_UdqQAAKNEeSZ5cZUOQKWkw" name="Class3">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_pq7fAAKNEeSZ5cZUOQKWkw" name="Attribute3.1" visibility="public">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p4ZTQAKNEeSZ5cZUOQKWkw" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p4ZTQQKNEeSZ5cZUOQKWkw" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_p4fZ4AKNEeSZ5cZUOQKWkw">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_IbRcdAKNEeSZ5cZUOQKWkw" name="Model">
+  <packagedElement xmi:type="uml:Package" xmi:id="_RkviIAKNEeSZ5cZUOQKWkw" name="Package1">
+    <packagedElement xmi:type="uml:Class" xmi:id="_PYK84AKNEeSZ5cZUOQKWkw" name="Class1">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VlkTQAKNEeSZ5cZUOQKWkw" name="class2" type="_P-y4AAKNEeSZ5cZUOQKWkw" association="_VlkTQwKNEeSZ5cZUOQKWkw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VlkTQQKNEeSZ5cZUOQKWkw" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VlkTQgKNEeSZ5cZUOQKWkw" value="1"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_P-y4AAKNEeSZ5cZUOQKWkw" name="Class2">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_qU6QIAKNEeSZ5cZUOQKWkw" name="Attribute2.1" visibility="public">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qg758AKNEeSZ5cZUOQKWkw" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qhCAkAKNEeSZ5cZUOQKWkw" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_qhCAkQKNEeSZ5cZUOQKWkw">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_VlkTQwKNEeSZ5cZUOQKWkw" name="class1_class2_1" memberEnd="_VlkTRAKNEeSZ5cZUOQKWkw _VlkTQAKNEeSZ5cZUOQKWkw">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VlkTRAKNEeSZ5cZUOQKWkw" name="class1" type="_PYK84AKNEeSZ5cZUOQKWkw" association="_VlkTQwKNEeSZ5cZUOQKWkw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VlkTRQKNEeSZ5cZUOQKWkw" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VlkTRgKNEeSZ5cZUOQKWkw" value="1"/>
+      </ownedEnd>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_UdqQAAKNEeSZ5cZUOQKWkw" name="Class3">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_pq7fAAKNEeSZ5cZUOQKWkw" name="Attribute3.1" visibility="public">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p4ZTQAKNEeSZ5cZUOQKWkw" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p4ZTQQKNEeSZ5cZUOQKWkw" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_p4fZ4AKNEeSZ5cZUOQKWkw">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.di b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.di
index 7ff6b1b1083..523a6f70a01 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.di
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.di
@@ -1,13 +1,13 @@
-<?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="openTest.notation#_t84AgOIjEeKndr3wY-HJQw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder"/>

-    </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="openTest.notation#_t84AgOIjEeKndr3wY-HJQw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder"/>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.notation b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.notation
index 6ccd832110f..6d644e3608a 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.notation
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.notation
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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:uml="http://www.eclipse.org/uml2/4.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" xmi:id="_t84AgOIjEeKndr3wY-HJQw" name="TableOfViews0" currentRowAxisProvider="_t84AhuIjEeKndr3wY-HJQw" currentColumnAxisProvider="_t84AgeIjEeKndr3wY-HJQw">

-  <context xmi:type="uml:Model" href="openTest.uml#_syVgAOIjEeKndr3wY-HJQw"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_t84AgeIjEeKndr3wY-HJQw" description="Provides the features of the views" name="Papyrus Views feature provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_t84AguIjEeKndr3wY-HJQw" element="nattable_editor_pages:/name">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-    </axis>

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_t84Ag-IjEeKndr3wY-HJQw" element="nattable_editor_pages:/context">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-    </axis>

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_t84AhOIjEeKndr3wY-HJQw" element="nattable_editor_pages:/isOpen">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-    </axis>

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_t84AheIjEeKndr3wY-HJQw" element="nattable_editor_pages:/type">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_t84AhuIjEeKndr3wY-HJQw"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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:uml="http://www.eclipse.org/uml2/4.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" xmi:id="_t84AgOIjEeKndr3wY-HJQw" name="TableOfViews0" currentRowAxisProvider="_t84AhuIjEeKndr3wY-HJQw" currentColumnAxisProvider="_t84AgeIjEeKndr3wY-HJQw">
+  <context xmi:type="uml:Model" href="openTest.uml#_syVgAOIjEeKndr3wY-HJQw"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_t84AgeIjEeKndr3wY-HJQw" description="Provides the features of the views" name="Papyrus Views feature provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_t84AguIjEeKndr3wY-HJQw" element="nattable_editor_pages:/name">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+    </axis>
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_t84Ag-IjEeKndr3wY-HJQw" element="nattable_editor_pages:/context">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+    </axis>
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_t84AhOIjEeKndr3wY-HJQw" element="nattable_editor_pages:/isOpen">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+    </axis>
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_t84AheIjEeKndr3wY-HJQw" element="nattable_editor_pages:/type">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_t84AhuIjEeKndr3wY-HJQw"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.uml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.uml
index 1ffccd12eda..b2a269f1ab0 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.uml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/resources/openTest.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_syVgAOIjEeKndr3wY-HJQw" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_syVgAOIjEeKndr3wY-HJQw" name="model"/>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/Activator.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/Activator.java
index aa4db9a1c0f..7e801abd1e6 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/Activator.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/Activator.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:

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

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr

- *

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

-package org.eclipse.papyrus.infra.nattable.views.tests;

-

-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.tests"; //$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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.tests;
+
+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.tests"; //$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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/AllTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/AllTests.java
index 2476b1be641..1f83f45bded 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/AllTests.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/AllTests.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:

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

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr

- *

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

-package org.eclipse.papyrus.infra.nattable.views.tests.tests;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({ RevealViewsTableTest.class, TableCreationTest.class, OpenTableTest.class, TableVerifyContents.class, TableCreationTest2.class })

-public class AllTests {

-

-	// JUnit 4 test suite

-

-	/** The type of the requirement table */

-	public static final String VIEWS_TABLE_ID = "PapyrusViewsTable"; //$NON-NLS-1$

-

-	/** the creation command tested for the requirement table */

-	public static final String COMMAND_ID = "org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"; //$NON-NLS-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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.tests.tests;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({ RevealViewsTableTest.class, TableCreationTest.class, OpenTableTest.class, TableVerifyContents.class, TableCreationTest2.class })
+public class AllTests {
+
+	// JUnit 4 test suite
+
+	/** The type of the requirement table */
+	public static final String VIEWS_TABLE_ID = "PapyrusViewsTable"; //$NON-NLS-1$
+
+	/** the creation command tested for the requirement table */
+	public static final String COMMAND_ID = "org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"; //$NON-NLS-1$
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/DisplayUtils.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/DisplayUtils.java
index 9b66d8cbe6c..982e1502567 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/DisplayUtils.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/DisplayUtils.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.views.tests.tests;

-

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

-

-

-public class DisplayUtils {

-

-

-	private DisplayUtils() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * a safe version of the call while(Display.getDefault().readAndDispatch());

-	 */

-	//FIXME move me in an upper plugin if i works fine

-	public static void safeReadAndDispatch() {

-		while(true) {

-			boolean res = true;

-			try {

-				res = Display.getDefault().readAndDispatch();

-			} catch (Exception e) {

-				//nothing to do

-			}

-			if(res == false) {

-				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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.tests.tests;
+
+import org.eclipse.swt.widgets.Display;
+
+
+public class DisplayUtils {
+
+
+	private DisplayUtils() {
+		//to prevent instanciation
+	}
+
+	/**
+	 * a safe version of the call while(Display.getDefault().readAndDispatch());
+	 */
+	//FIXME move me in an upper plugin if i works fine
+	public static void safeReadAndDispatch() {
+		while(true) {
+			boolean res = true;
+			try {
+				res = Display.getDefault().readAndDispatch();
+			} catch (Exception e) {
+				//nothing to do
+			}
+			if(res == false) {
+				return;
+			}
+		}
+	}
+
+
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableCreationTest.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableCreationTest.java
index e4dccf8c6a3..01b6fcbd8be 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableCreationTest.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableCreationTest.java
@@ -1,263 +1,263 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus (CEA) - bug 434993

- *

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

-package org.eclipse.papyrus.infra.nattable.views.tests.tests;

-

-import java.io.IOException;

-import java.util.Collection;

-

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

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

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

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

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

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

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.views.tests.Activator;

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

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.EditorUtils;

-import org.eclipse.papyrus.junit.utils.GenericUtils;

-import org.eclipse.papyrus.junit.utils.ModelExplorerUtils;

-import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;

-import org.eclipse.papyrus.junit.utils.ProjectUtils;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;

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

-import org.eclipse.ui.PartInitException;

-import org.eclipse.uml2.uml.Model;

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

-import org.junit.AfterClass;

-import org.junit.Assert;

-import org.junit.BeforeClass;

-import org.junit.ClassRule;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleException;

-

-public class TableCreationTest extends AbstractPapyrusTest {

-

-	@ClassRule

-	public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();

-	

-	private static final String MODEL_PATH = "/resources/model"; //$NON-NLS-1$

-

-	private static final String SOURCE_PATH = "/resources/"; //$NON-NLS-1$

-

-	private static final String FILE_ROOT_NAME = "model"; //$NON-NLS-1$

-

-	private static final String PROJECT_NAME = "test"; //$NON-NLS-1$

-

-	private static IMultiDiagramEditor papyrusEditor;

-

-	private static final String BUNDLE_ID = Activator.getDefault().getBundle().getSymbolicName();

-

-	protected static Model rootModel;

-

-	private static Model subModel;

-

-	private static Model subSubModel;

-

-	private static Package subPackage;

-

-	private static Package subSubPackage;

-

-	protected static ModelExplorerView view;

-

-	@BeforeClass

-	public static void init() {

-		try {

-			initTests(Activator.getDefault().getBundle(), PROJECT_NAME, MODEL_PATH);

-

-		} catch (CoreException e) {

-			Activator.log.error(e);

-		} catch (IOException e) {

-			Activator.log.error(e);

-		} catch (BundleException e) {

-			Activator.log.error(e);

-		}

-	}

-

-	public static void initTests(final Bundle bundle, final String projectName, final String papyrusModelPath) throws CoreException, IOException, BundleException {

-		ProjectUtils.removeAllProjectFromTheWorkspace();

-		IProject testProject = houseKeeper.createProject(projectName);

-		final IFile file = PapyrusProjectUtils.copyPapyrusModel(testProject, bundle, SOURCE_PATH, FILE_ROOT_NAME);

-		RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {

-

-			@Override

-			public void run() {

-				try {

-					papyrusEditor = houseKeeper.cleanUpLater(EditorUtils.openPapyrusEditor(file));

-				} catch (PartInitException e) {

-					setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), e.getMessage()));

-				}

-				try {

-					TableCreationTest.view = ModelExplorerUtils.openModelExplorerView();

-				} catch (PartInitException e) {

-					setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), e.getMessage()));

-				}

-				EObject root = ModelExplorerUtils.getRootInModelExplorer(TableCreationTest.view);

-				TableCreationTest.rootModel = (Model)root;

-				subModel = (Model)TableCreationTest.rootModel.getMember("SubModel"); //$NON-NLS-1$

-				subPackage = (Package)TableCreationTest.rootModel.getMember("SubPackage"); //$NON-NLS-1$

-				if(subModel != null && subPackage != null) {

-					subSubModel = (Model)TableCreationTest.subModel.getMember("SubSubModel"); //$NON-NLS-1$

-					subSubPackage = (Package)TableCreationTest.subPackage.getMember("SubSubPackage");

-

-					setStatus(Status.OK_STATUS);

-

-				} else {

-					setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), "Requirement1 not found")); //$NON-NLS-1$

-				}

-

-			}

-

-		};

-		Display.getDefault().syncExec(runnableWithResult);

-		Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());

-		Assert.assertNotNull(subModel);

-		Assert.assertNotNull(subPackage);

-		Assert.assertNotNull(subSubModel);

-		Assert.assertNotNull(subPackage);

-

-		Assert.assertNotNull(TableCreationTest.rootModel);

-

-

-

-	}

-

-	@Test

-	public void testCreationHandlerStatusOnRootModel() {

-		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, TableCreationTest.rootModel, true);

-	}

-

-	@Test

-	public void testCreationHandlerStatusOnSubModel() {

-		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, subModel, true);

-	}

-

-	@Test

-	public void testCreationHandlerStatusOnSubSubModel() {

-		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, subSubModel, true);

-	}

-

-	@Test

-	public void testCreationHandlerStatusOnSubPackage() {

-		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, subPackage, true);

-	}

-

-	@Test

-	public void testCreationHandlerStatusOnSubSubPackage() {

-		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, subSubPackage, true);

-	}

-

-

-	@Test

-	public void testCreationAndSynchronization() {

-		final Object result1 = ModelExplorerUtils.executeCreateNestedEditorHandlerInModelExplorer(papyrusEditor, TableCreationTest.view, AllTests.COMMAND_ID, TableCreationTest.subSubPackage, BUNDLE_ID);

-		Assert.assertTrue(result1 instanceof NatTableEditor);

-		final NatTableEditor editor1 = (NatTableEditor)result1;

-		final NattableModelManager manager1 = (NattableModelManager)editor1.getAdapter(INattableModelManager.class);

-		Assert.assertNotNull(manager1);

-		final Table subSubPackageTable1 = manager1.getTable();

-		Assert.assertEquals(AllTests.VIEWS_TABLE_ID, subSubPackageTable1.getTableConfiguration().getType());

-

-		final IAxisManager rowAxisManager = manager1.getRowAxisManager();

-		final Collection<Object> managedAxis_subSubPackageTable1 = rowAxisManager.getAllManagedAxis();

-		Assert.assertEquals(1, managedAxis_subSubPackageTable1.size());

-		Assert.assertTrue(managedAxis_subSubPackageTable1.contains(subSubPackageTable1));

-		Assert.assertEquals(managedAxis_subSubPackageTable1.size(), rowAxisManager.getTableManager().getRowElementsList().size());

-		Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(subSubPackageTable1));

-

-

-		//we create a second table. This one must be added to the content of the first one

-		final Object result2 = ModelExplorerUtils.executeCreateNestedEditorHandlerInModelExplorer(papyrusEditor, TableCreationTest.view, AllTests.COMMAND_ID, TableCreationTest.subSubPackage, BUNDLE_ID);

-

-		Assert.assertTrue(result2 instanceof NatTableEditor);

-		final NatTableEditor editor2 = (NatTableEditor)result2;

-		final NattableModelManager manager2 = (NattableModelManager)editor2.getAdapter(INattableModelManager.class);

-		Assert.assertNotNull(manager2);

-		final Table subSubPackageTable2 = manager2.getTable();

-		Assert.assertEquals(AllTests.VIEWS_TABLE_ID, subSubPackageTable2.getTableConfiguration().getType());

-

-		//we verify the contents of the second table

-		final IAxisManager rowAxisManager2 = manager2.getRowAxisManager();

-		Collection<Object> managedAxis2 = rowAxisManager2.getAllManagedAxis();

-		Assert.assertEquals(2, managedAxis2.size());

-		Assert.assertTrue(managedAxis2.contains(subSubPackageTable1));

-		Assert.assertTrue(managedAxis2.contains(subSubPackageTable2));

-

-		DisplayUtils.safeReadAndDispatch();

-

-		Assert.assertEquals(managedAxis2.size(), rowAxisManager2.getTableManager().getRowElementsList().size());

-		Assert.assertTrue(rowAxisManager2.getTableManager().getRowElementsList().contains(subSubPackageTable1));

-		Assert.assertTrue(rowAxisManager2.getTableManager().getRowElementsList().contains(subSubPackageTable2));

-

-

-		//we verify the contents of the first table

-		final Collection<Object> managedAxis_subSubPackageTable1_1 = rowAxisManager.getAllManagedAxis();

-		Assert.assertEquals(2, managedAxis_subSubPackageTable1_1.size());

-		Assert.assertTrue(managedAxis_subSubPackageTable1_1.contains(subSubPackageTable1));

-		Assert.assertTrue(managedAxis_subSubPackageTable1_1.contains(subSubPackageTable2));

-		Assert.assertEquals(managedAxis_subSubPackageTable1_1.size(), rowAxisManager.getTableManager().getRowElementsList().size());

-		Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(subSubPackageTable1));

-		Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(subSubPackageTable2));

-

-

-		//-----------------we create a table in subModel. This table must contains only itself and the others table muse not contains it

-		final Object result3 = ModelExplorerUtils.executeCreateNestedEditorHandlerInModelExplorer(papyrusEditor, TableCreationTest.view, AllTests.COMMAND_ID, TableCreationTest.subModel, BUNDLE_ID);

-		Assert.assertTrue(result3 instanceof NatTableEditor);

-		final NatTableEditor editor3 = (NatTableEditor)result3;

-		final NattableModelManager manager3 = (NattableModelManager)editor3.getAdapter(INattableModelManager.class);

-		Assert.assertNotNull(manager3);

-		final Table subModelTable3 = manager3.getTable();

-		Assert.assertEquals(AllTests.VIEWS_TABLE_ID, subModelTable3.getTableConfiguration().getType());

-		DisplayUtils.safeReadAndDispatch();

-		final IAxisManager rowAxisManager3 = manager3.getRowAxisManager();

-		final Collection<Object> managedAxis_SubPackageTable3 = rowAxisManager3.getAllManagedAxis();

-		Assert.assertEquals(1, managedAxis_SubPackageTable3.size());

-		Assert.assertTrue(managedAxis_SubPackageTable3.contains(subModelTable3));

-		Assert.assertEquals(managedAxis_SubPackageTable3.size(), rowAxisManager3.getTableManager().getRowElementsList().size());

-		Assert.assertTrue(rowAxisManager3.getTableManager().getRowElementsList().contains(subModelTable3));

-

-		//we verify that the other tables don't reference it

-		//verify in table 1

-		IAxisManager rowAxisManagerTable1 = manager1.getRowAxisManager();

-		Collection<Object> managedAxisTable1 = rowAxisManagerTable1.getAllManagedAxis();

-		Assert.assertEquals(2, managedAxisTable1.size());

-		Assert.assertFalse(managedAxisTable1.contains(subModelTable3));

-		Assert.assertEquals(managedAxisTable1.size(), rowAxisManagerTable1.getTableManager().getRowElementsList().size());

-		Assert.assertFalse(rowAxisManagerTable1.getTableManager().getRowElementsList().contains(subModelTable3));

-

-		//verify in table 2

-		IAxisManager rowAxisManagerTable2 = manager2.getRowAxisManager();

-		Collection<Object> managedAxisTable2 = rowAxisManagerTable2.getAllManagedAxis();

-		Assert.assertEquals(2, managedAxisTable2.size());

-		Assert.assertFalse(managedAxisTable2.contains(subModelTable3));

-		Assert.assertEquals(managedAxisTable2.size(), rowAxisManagerTable2.getTableManager().getRowElementsList().size());

-		Assert.assertFalse(rowAxisManagerTable2.getTableManager().getRowElementsList().contains(subModelTable3));

-	}

-

-	@AfterClass

-	public static void endOfTest() {

-		GenericUtils.closeAllEditors();

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 434993
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.tests.tests;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.views.tests.Activator;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.EditorUtils;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.ModelExplorerUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Package;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
+
+public class TableCreationTest extends AbstractPapyrusTest {
+
+	@ClassRule
+	public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
+	
+	private static final String MODEL_PATH = "/resources/model"; //$NON-NLS-1$
+
+	private static final String SOURCE_PATH = "/resources/"; //$NON-NLS-1$
+
+	private static final String FILE_ROOT_NAME = "model"; //$NON-NLS-1$
+
+	private static final String PROJECT_NAME = "test"; //$NON-NLS-1$
+
+	private static IMultiDiagramEditor papyrusEditor;
+
+	private static final String BUNDLE_ID = Activator.getDefault().getBundle().getSymbolicName();
+
+	protected static Model rootModel;
+
+	private static Model subModel;
+
+	private static Model subSubModel;
+
+	private static Package subPackage;
+
+	private static Package subSubPackage;
+
+	protected static ModelExplorerView view;
+
+	@BeforeClass
+	public static void init() {
+		try {
+			initTests(Activator.getDefault().getBundle(), PROJECT_NAME, MODEL_PATH);
+
+		} catch (CoreException e) {
+			Activator.log.error(e);
+		} catch (IOException e) {
+			Activator.log.error(e);
+		} catch (BundleException e) {
+			Activator.log.error(e);
+		}
+	}
+
+	public static void initTests(final Bundle bundle, final String projectName, final String papyrusModelPath) throws CoreException, IOException, BundleException {
+		ProjectUtils.removeAllProjectFromTheWorkspace();
+		IProject testProject = houseKeeper.createProject(projectName);
+		final IFile file = PapyrusProjectUtils.copyPapyrusModel(testProject, bundle, SOURCE_PATH, FILE_ROOT_NAME);
+		RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {
+
+			@Override
+			public void run() {
+				try {
+					papyrusEditor = houseKeeper.cleanUpLater(EditorUtils.openPapyrusEditor(file));
+				} catch (PartInitException e) {
+					setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), e.getMessage()));
+				}
+				try {
+					TableCreationTest.view = ModelExplorerUtils.openModelExplorerView();
+				} catch (PartInitException e) {
+					setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), e.getMessage()));
+				}
+				EObject root = ModelExplorerUtils.getRootInModelExplorer(TableCreationTest.view);
+				TableCreationTest.rootModel = (Model)root;
+				subModel = (Model)TableCreationTest.rootModel.getMember("SubModel"); //$NON-NLS-1$
+				subPackage = (Package)TableCreationTest.rootModel.getMember("SubPackage"); //$NON-NLS-1$
+				if(subModel != null && subPackage != null) {
+					subSubModel = (Model)TableCreationTest.subModel.getMember("SubSubModel"); //$NON-NLS-1$
+					subSubPackage = (Package)TableCreationTest.subPackage.getMember("SubSubPackage");
+
+					setStatus(Status.OK_STATUS);
+
+				} else {
+					setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), "Requirement1 not found")); //$NON-NLS-1$
+				}
+
+			}
+
+		};
+		Display.getDefault().syncExec(runnableWithResult);
+		Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());
+		Assert.assertNotNull(subModel);
+		Assert.assertNotNull(subPackage);
+		Assert.assertNotNull(subSubModel);
+		Assert.assertNotNull(subPackage);
+
+		Assert.assertNotNull(TableCreationTest.rootModel);
+
+
+
+	}
+
+	@Test
+	public void testCreationHandlerStatusOnRootModel() {
+		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, TableCreationTest.rootModel, true);
+	}
+
+	@Test
+	public void testCreationHandlerStatusOnSubModel() {
+		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, subModel, true);
+	}
+
+	@Test
+	public void testCreationHandlerStatusOnSubSubModel() {
+		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, subSubModel, true);
+	}
+
+	@Test
+	public void testCreationHandlerStatusOnSubPackage() {
+		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, subPackage, true);
+	}
+
+	@Test
+	public void testCreationHandlerStatusOnSubSubPackage() {
+		ModelExplorerUtils.testHandlerStatusInModelExplorer(TableCreationTest.view, AllTests.COMMAND_ID, subSubPackage, true);
+	}
+
+
+	@Test
+	public void testCreationAndSynchronization() {
+		final Object result1 = ModelExplorerUtils.executeCreateNestedEditorHandlerInModelExplorer(papyrusEditor, TableCreationTest.view, AllTests.COMMAND_ID, TableCreationTest.subSubPackage, BUNDLE_ID);
+		Assert.assertTrue(result1 instanceof NatTableEditor);
+		final NatTableEditor editor1 = (NatTableEditor)result1;
+		final NattableModelManager manager1 = (NattableModelManager)editor1.getAdapter(INattableModelManager.class);
+		Assert.assertNotNull(manager1);
+		final Table subSubPackageTable1 = manager1.getTable();
+		Assert.assertEquals(AllTests.VIEWS_TABLE_ID, subSubPackageTable1.getTableConfiguration().getType());
+
+		final IAxisManager rowAxisManager = manager1.getRowAxisManager();
+		final Collection<Object> managedAxis_subSubPackageTable1 = rowAxisManager.getAllManagedAxis();
+		Assert.assertEquals(1, managedAxis_subSubPackageTable1.size());
+		Assert.assertTrue(managedAxis_subSubPackageTable1.contains(subSubPackageTable1));
+		Assert.assertEquals(managedAxis_subSubPackageTable1.size(), rowAxisManager.getTableManager().getRowElementsList().size());
+		Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(subSubPackageTable1));
+
+
+		//we create a second table. This one must be added to the content of the first one
+		final Object result2 = ModelExplorerUtils.executeCreateNestedEditorHandlerInModelExplorer(papyrusEditor, TableCreationTest.view, AllTests.COMMAND_ID, TableCreationTest.subSubPackage, BUNDLE_ID);
+
+		Assert.assertTrue(result2 instanceof NatTableEditor);
+		final NatTableEditor editor2 = (NatTableEditor)result2;
+		final NattableModelManager manager2 = (NattableModelManager)editor2.getAdapter(INattableModelManager.class);
+		Assert.assertNotNull(manager2);
+		final Table subSubPackageTable2 = manager2.getTable();
+		Assert.assertEquals(AllTests.VIEWS_TABLE_ID, subSubPackageTable2.getTableConfiguration().getType());
+
+		//we verify the contents of the second table
+		final IAxisManager rowAxisManager2 = manager2.getRowAxisManager();
+		Collection<Object> managedAxis2 = rowAxisManager2.getAllManagedAxis();
+		Assert.assertEquals(2, managedAxis2.size());
+		Assert.assertTrue(managedAxis2.contains(subSubPackageTable1));
+		Assert.assertTrue(managedAxis2.contains(subSubPackageTable2));
+
+		DisplayUtils.safeReadAndDispatch();
+
+		Assert.assertEquals(managedAxis2.size(), rowAxisManager2.getTableManager().getRowElementsList().size());
+		Assert.assertTrue(rowAxisManager2.getTableManager().getRowElementsList().contains(subSubPackageTable1));
+		Assert.assertTrue(rowAxisManager2.getTableManager().getRowElementsList().contains(subSubPackageTable2));
+
+
+		//we verify the contents of the first table
+		final Collection<Object> managedAxis_subSubPackageTable1_1 = rowAxisManager.getAllManagedAxis();
+		Assert.assertEquals(2, managedAxis_subSubPackageTable1_1.size());
+		Assert.assertTrue(managedAxis_subSubPackageTable1_1.contains(subSubPackageTable1));
+		Assert.assertTrue(managedAxis_subSubPackageTable1_1.contains(subSubPackageTable2));
+		Assert.assertEquals(managedAxis_subSubPackageTable1_1.size(), rowAxisManager.getTableManager().getRowElementsList().size());
+		Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(subSubPackageTable1));
+		Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(subSubPackageTable2));
+
+
+		//-----------------we create a table in subModel. This table must contains only itself and the others table muse not contains it
+		final Object result3 = ModelExplorerUtils.executeCreateNestedEditorHandlerInModelExplorer(papyrusEditor, TableCreationTest.view, AllTests.COMMAND_ID, TableCreationTest.subModel, BUNDLE_ID);
+		Assert.assertTrue(result3 instanceof NatTableEditor);
+		final NatTableEditor editor3 = (NatTableEditor)result3;
+		final NattableModelManager manager3 = (NattableModelManager)editor3.getAdapter(INattableModelManager.class);
+		Assert.assertNotNull(manager3);
+		final Table subModelTable3 = manager3.getTable();
+		Assert.assertEquals(AllTests.VIEWS_TABLE_ID, subModelTable3.getTableConfiguration().getType());
+		DisplayUtils.safeReadAndDispatch();
+		final IAxisManager rowAxisManager3 = manager3.getRowAxisManager();
+		final Collection<Object> managedAxis_SubPackageTable3 = rowAxisManager3.getAllManagedAxis();
+		Assert.assertEquals(1, managedAxis_SubPackageTable3.size());
+		Assert.assertTrue(managedAxis_SubPackageTable3.contains(subModelTable3));
+		Assert.assertEquals(managedAxis_SubPackageTable3.size(), rowAxisManager3.getTableManager().getRowElementsList().size());
+		Assert.assertTrue(rowAxisManager3.getTableManager().getRowElementsList().contains(subModelTable3));
+
+		//we verify that the other tables don't reference it
+		//verify in table 1
+		IAxisManager rowAxisManagerTable1 = manager1.getRowAxisManager();
+		Collection<Object> managedAxisTable1 = rowAxisManagerTable1.getAllManagedAxis();
+		Assert.assertEquals(2, managedAxisTable1.size());
+		Assert.assertFalse(managedAxisTable1.contains(subModelTable3));
+		Assert.assertEquals(managedAxisTable1.size(), rowAxisManagerTable1.getTableManager().getRowElementsList().size());
+		Assert.assertFalse(rowAxisManagerTable1.getTableManager().getRowElementsList().contains(subModelTable3));
+
+		//verify in table 2
+		IAxisManager rowAxisManagerTable2 = manager2.getRowAxisManager();
+		Collection<Object> managedAxisTable2 = rowAxisManagerTable2.getAllManagedAxis();
+		Assert.assertEquals(2, managedAxisTable2.size());
+		Assert.assertFalse(managedAxisTable2.contains(subModelTable3));
+		Assert.assertEquals(managedAxisTable2.size(), rowAxisManagerTable2.getTableManager().getRowElementsList().size());
+		Assert.assertFalse(rowAxisManagerTable2.getTableManager().getRowElementsList().contains(subModelTable3));
+	}
+
+	@AfterClass
+	public static void endOfTest() {
+		GenericUtils.closeAllEditors();
+	}
+
+
+}
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF
index 309a89313ba..860c11d49cf 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.filters.tests

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

- org.junit;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.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,

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

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.filters.tests
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit;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.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.filters.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/META-INF/MANIFEST.MF
index 70a87b1fe77..8bb619c3298 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.newchild.tests

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

- org.junit;bundle-version="4.12.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

- org.eclipse.emf.transaction;bundle-version="1.9.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.newchild.tests
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
+ org.junit;bundle-version="4.12.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.transaction;bundle-version="1.9.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/models/DeployUndeployTests.creationmenumodel b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/models/DeployUndeployTests.creationmenumodel
index a5984615fb0..f6e9fd3fb73 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/models/DeployUndeployTests.creationmenumodel
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/models/DeployUndeployTests.creationmenumodel
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="ASCII"?>

-<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" label="DeployUndeployTest">

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="MyClass" icon="">

-    <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="pathmap:/resource/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </menu>

-</ElementCreationMenuModel:Folder>

+<?xml version="1.0" encoding="ASCII"?>
+<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" label="DeployUndeployTest">
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="MyClass" icon="">
+    <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="pathmap:/resource/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </menu>
+</ElementCreationMenuModel:Folder>
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/models/NewChildExtensionPointTests.creationmenumodel b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/models/NewChildExtensionPointTests.creationmenumodel
index 7b67593ceaa..0f0ce6ce348 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/models/NewChildExtensionPointTests.creationmenumodel
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/models/NewChildExtensionPointTests.creationmenumodel
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="ASCII"?>

-<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" label="NewChildExtensionPointTest">

-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="MyComponent" icon="">

-    <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="pathmap:/resource/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>

-  </menu>

-</ElementCreationMenuModel:Folder>

+<?xml version="1.0" encoding="ASCII"?>
+<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" label="NewChildExtensionPointTest">
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="MyComponent" icon="">
+    <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="pathmap:/resource/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
+  </menu>
+</ElementCreationMenuModel:Folder>
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF
index 9fcc4b6ac8c..e1b58be93ca 100755
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF
@@ -1,41 +1,41 @@
-Manifest-Version: 1.0

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.suite.tests.Activator

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

- org.eclipse.papyrus.infra.services.edit.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.edit.ui.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",

- org.eclipse.papyrus.infra.emf.gmf.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.ui.emf.tests;bundle-version="[1.2.0,2.0.0)",

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

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

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

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

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

- org.eclipse.papyrus.infra.emf.readonly.tests;bundle-version="[1.2.0,2.0.0)",

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

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

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

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

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

- org.eclipse.papyrus.infra.services.resourceloading.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="[1.4.0,2.0.0)",

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

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

- org.eclipse.papyrus.infra.emf.expressions.tests;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.internationalization.tests;bundle-version="[1.0.0,2.0.0)"

+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 0.0.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.suite.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.suite.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.tools.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit.ui.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui.emf.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.types.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.ui.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.welcome.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.properties.ui.tests;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.filters.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.assistant.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.resourceloading.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.expressions.tests;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization.tests;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF
index 6f0cf973fc4..36af7fb0a3d 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

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

- org.eclipse.swt;bundle-version="3.100.0",

- org.eclipse.core.runtime;bundle-version="3.10.0",

- org.eclipse.core.databinding;bundle-version="1.4.0",

- org.eclipse.core.databinding.beans;bundle-version="1.2.0",

- org.eclipse.core.databinding.property;bundle-version="1.4.0",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.infra.tools.databinding,

- org.eclipse.papyrus.infra.tools.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Papyrus Infrastructure Tools Tests

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Import-Package: com.google.common.collect;version="21.0.0"

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.swt;bundle-version="3.100.0",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.core.databinding;bundle-version="1.4.0",
+ org.eclipse.core.databinding.beans;bundle-version="1.2.0",
+ org.eclipse.core.databinding.property;bundle-version="1.4.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.infra.tools.databinding,
+ org.eclipse.papyrus.infra.tools.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Papyrus Infrastructure Tools Tests
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.tools.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF
index 0736807c947..2bc1a455913 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

- org.eclipse.ui;bundle-version="3.100.0",

- org.eclipse.core.runtime;bundle-version="3.10.0",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.tools;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.core;bundle-version="[3.0.0,4.0.0)",

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

- org.eclipse.emf.ecore;bundle-version="2.12.0"

-Export-Package: org.eclipse.papyrus.infra.ui.lifecycleevents,

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

- org.eclipse.papyrus.infra.ui.tests,

- org.eclipse.papyrus.infra.ui.util

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Papyrus Infrastructure UI Tests

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui;bundle-version="3.100.0",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.tools;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.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="2.12.0"
+Export-Package: org.eclipse.papyrus.infra.ui.lifecycleevents,
+ org.eclipse.papyrus.infra.ui.providers,
+ org.eclipse.papyrus.infra.ui.tests,
+ org.eclipse.papyrus.infra.ui.util
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Papyrus Infrastructure UI Tests
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePageTest.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePageTest.java
index e7ee69d698b..8e1a8f58208 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePageTest.java
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePageTest.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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

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

-package org.eclipse.papyrus.infra.ui.contentoutline;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.fail;

-

-import java.lang.reflect.Field;

-

-import org.eclipse.papyrus.infra.ui.contentoutline.NestedEditorDelegatedOutlinePage;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

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

-import org.junit.Test;

-

-

-/**

- * Test the {@link NestedEditorDelegatedOutlinePage} class

- */

-public class NestedEditorDelegatedOutlinePageTest extends AbstractPapyrusTest {

-

-	@Test

-	public void testExistingMethod() {

-		// usage of java reflexive API to get a field. check this field is still present.

-		Field parentSiteField = null;

-		try {

-			parentSiteField = PageSite.class.getDeclaredField("parentSite");

-			parentSiteField.setAccessible(true);

-		} catch (SecurityException e) {

-			fail(e.getLocalizedMessage());

-		} catch (NoSuchFieldException e) {

-			fail(e.getLocalizedMessage());

-		}

-

-		assertNotNull("Impossible to find parent site field", parentSiteField);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.contentoutline;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Field;
+
+import org.eclipse.papyrus.infra.ui.contentoutline.NestedEditorDelegatedOutlinePage;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.ui.part.PageSite;
+import org.junit.Test;
+
+
+/**
+ * Test the {@link NestedEditorDelegatedOutlinePage} class
+ */
+public class NestedEditorDelegatedOutlinePageTest extends AbstractPapyrusTest {
+
+	@Test
+	public void testExistingMethod() {
+		// usage of java reflexive API to get a field. check this field is still present.
+		Field parentSiteField = null;
+		try {
+			parentSiteField = PageSite.class.getDeclaredField("parentSite");
+			parentSiteField.setAccessible(true);
+		} catch (SecurityException e) {
+			fail(e.getLocalizedMessage());
+		} catch (NoSuchFieldException e) {
+			fail(e.getLocalizedMessage());
+		}
+
+		assertNotNull("Impossible to find parent site field", parentSiteField);
+	}
+
+}
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/FakeSaveEvent.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/FakeSaveEvent.java
index b35ef887960..422c51892cc 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/FakeSaveEvent.java
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/FakeSaveEvent.java
@@ -1,25 +1,25 @@
-/**

- * 

- */

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;

-

-/**

- * @author dumoulin

- *

- */

-public class FakeSaveEvent extends DoSaveEvent {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param serviceRegistry

-	 * @param multiDiagramEditor

-	 */

-	public FakeSaveEvent() {

-		super(null, null);

-		

-	}

-

-}

+/**
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;
+
+/**
+ * @author dumoulin
+ *
+ */
+public class FakeSaveEvent extends DoSaveEvent {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param serviceRegistry
+	 * @param multiDiagramEditor
+	 */
+	public FakeSaveEvent() {
+		super(null, null);
+		
+	}
+
+}
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/FakeSaveEventListener.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/FakeSaveEventListener.java
index 7c801621502..380a8448e0e 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/FakeSaveEventListener.java
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/FakeSaveEventListener.java
@@ -1,58 +1,58 @@
-/**

- * 

- */

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;

-

-

-/**

- * @author dumoulin

- *

- */

-public class FakeSaveEventListener implements ISaveEventListener {

-

-	List<DoSaveEvent> receivedEvents = new ArrayList<DoSaveEvent>();

-	

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener#doSave(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)

-	 *

-	 * @param event

-	 */

-	public void doSave(DoSaveEvent event) {

-		receivedEvents.add(event);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener#doSaveAs(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)

-	 *

-	 * @param event

-	 */

-	public void doSaveAs(DoSaveEvent event) {

-		receivedEvents.add(event);

-

-	}

-

-	/**

-	 * Return true if the event has been received.

-	 * @param event

-	 * @return

-	 */

-	public boolean isEventReceived(DoSaveEvent event) {

-		return receivedEvents.contains(event);

-	}

-

-	

-	/**

-	 * @return the receivedEvents

-	 */

-	public List<DoSaveEvent> getReceivedEvents() {

-		return receivedEvents;

-	}

-

-}

+/**
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;
+
+
+/**
+ * @author dumoulin
+ *
+ */
+public class FakeSaveEventListener implements ISaveEventListener {
+
+	List<DoSaveEvent> receivedEvents = new ArrayList<DoSaveEvent>();
+	
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener#doSave(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)
+	 *
+	 * @param event
+	 */
+	public void doSave(DoSaveEvent event) {
+		receivedEvents.add(event);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener#doSaveAs(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)
+	 *
+	 * @param event
+	 */
+	public void doSaveAs(DoSaveEvent event) {
+		receivedEvents.add(event);
+
+	}
+
+	/**
+	 * Return true if the event has been received.
+	 * @param event
+	 * @return
+	 */
+	public boolean isEventReceived(DoSaveEvent event) {
+		return receivedEvents.contains(event);
+	}
+
+	
+	/**
+	 * @return the receivedEvents
+	 */
+	public List<DoSaveEvent> getReceivedEvents() {
+		return receivedEvents;
+	}
+
+}
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderTest.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderTest.java
index 5b5c917b957..4ce440605ce 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderTest.java
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderTest.java
@@ -1,281 +1,281 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.junit.Before;

-import org.junit.Test;

-

-

-/**

- * @author cedric dumoulin

- *

- */

-public class LifeCycleEventsProviderTest extends AbstractPapyrusTest {

-

-	/**

-	 * Object under test.

-	 */

-	protected LifeCycleEventsProvider eventProvider;

-

-	/**

-	 * @see junit.framework.TestCase#setUp()

-	 *

-	 * @throws Exception

-	 */

-	@Before

-	public void setUp() throws Exception {

-		eventProvider = new LifeCycleEventsProvider();

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#addDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}

-	 * .

-	 */

-	@Test

-	public void testAddSaveListener() {

-

-		ISaveEventListener listener = new FakeSaveEventListener();

-

-		try {

-			eventProvider.addDoSaveListener(listener);

-		} catch (Exception e) {

-			fail("Add listener");

-		}

-

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#removeDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}

-	 * .

-	 */

-	@Test

-	public void testRemoveSaveListener() {

-		ISaveEventListener listener = new FakeSaveEventListener();

-

-		try {

-			eventProvider.addDoSaveListener(listener);

-			eventProvider.removeDoSaveListener(listener);

-		} catch (Exception e) {

-			fail("Remove listener");

-		}

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#addAboutToDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}

-	 * .

-	 */

-	@Test

-	public void testAddAboutToSaveListener() {

-		ISaveEventListener listener = new FakeSaveEventListener();

-

-		try {

-			eventProvider.addAboutToDoSaveListener(listener);

-		} catch (Exception e) {

-			fail("Add listener");

-		}

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#removeAboutToDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}

-	 * .

-	 */

-	@Test

-	public void testRemoveAboutToSaveListener() {

-		ISaveEventListener listener = new FakeSaveEventListener();

-

-		try {

-			eventProvider.addAboutToDoSaveListener(listener);

-			eventProvider.removeAboutToDoSaveListener(listener);

-		} catch (Exception e) {

-			fail("Remove listener");

-		}

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#addPostDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}

-	 * .

-	 */

-	@Test

-	public void testAddPostSaveListener() {

-		ISaveEventListener listener = new FakeSaveEventListener();

-

-		try {

-			eventProvider.addPostDoSaveListener(listener);

-		} catch (Exception e) {

-			fail("Add listener");

-		}

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#removePostDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}

-	 * .

-	 */

-	@Test

-	public void testRemovePostSaveListener() {

-		ISaveEventListener listener = new FakeSaveEventListener();

-

-		try {

-			eventProvider.addPostDoSaveListener(listener);

-			eventProvider.removePostDoSaveListener(listener);

-		} catch (Exception e) {

-			fail("Remove listener");

-		}

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}

-	 * .

-	 */

-	@Test

-	public void testFireAboutToSaveEvent() {

-		FakeSaveEventListener listener = new FakeSaveEventListener();

-

-		eventProvider.addAboutToDoSaveListener(listener);

-		DoSaveEvent event = new FakeSaveEvent();

-		eventProvider.fireAboutToDoSaveEvent(event);

-

-		assertTrue("event received", listener.isEventReceived(event));

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveAsEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}

-	 * .

-	 */

-	@Test

-	public void testFireAboutToSaveAsEvent() {

-		FakeSaveEventListener listener = new FakeSaveEventListener();

-

-		eventProvider.addAboutToDoSaveListener(listener);

-		DoSaveEvent event = new FakeSaveEvent();

-		eventProvider.fireAboutToDoSaveAsEvent(event);

-

-		assertTrue("event received", listener.isEventReceived(event));

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireDoSaveEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}

-	 * .

-	 */

-	@Test

-	public void testFireSaveEvent() {

-		FakeSaveEventListener listener = new FakeSaveEventListener();

-

-		eventProvider.addDoSaveListener(listener);

-		DoSaveEvent event = new FakeSaveEvent();

-		eventProvider.fireDoSaveEvent(event);

-

-		assertTrue("event received", listener.isEventReceived(event));

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireDoSaveAsEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}

-	 * .

-	 */

-	@Test

-	public void testFireSaveAsEvent() {

-		FakeSaveEventListener listener = new FakeSaveEventListener();

-

-		eventProvider.addDoSaveListener(listener);

-		DoSaveEvent event = new FakeSaveEvent();

-		eventProvider.fireDoSaveAsEvent(event);

-

-		assertTrue("event received", listener.isEventReceived(event));

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}

-	 * .

-	 */

-	@Test

-	public void testFirePostSaveEvent() {

-		FakeSaveEventListener listener = new FakeSaveEventListener();

-

-		eventProvider.addPostDoSaveListener(listener);

-		DoSaveEvent event = new FakeSaveEvent();

-		eventProvider.firePostDoSaveEvent(event);

-

-		assertTrue("event received", listener.isEventReceived(event));

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveAsEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}

-	 * .

-	 */

-	@Test

-	public void testFirePostSaveAsEvent() {

-		FakeSaveEventListener listener = new FakeSaveEventListener();

-

-		eventProvider.addPostDoSaveListener(listener);

-		DoSaveEvent event = new FakeSaveEvent();

-		eventProvider.firePostDoSaveAsEvent(event);

-

-		assertTrue("event received", listener.isEventReceived(event));

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}

-	 * .

-	 */

-	@Test

-	public void testFireAllSaveEvent() {

-		FakeSaveEventListener preListener = new FakeSaveEventListener();

-		FakeSaveEventListener listener = new FakeSaveEventListener();

-		FakeSaveEventListener postListener = new FakeSaveEventListener();

-

-		eventProvider.addAboutToDoSaveListener(preListener);

-		eventProvider.addDoSaveListener(listener);

-		eventProvider.addPostDoSaveListener(postListener);

-

-		DoSaveEvent event = new FakeSaveEvent();

-		eventProvider.fireAllDoSaveEvent(event);

-

-		assertTrue("event received", preListener.isEventReceived(event));

-		assertTrue("event received", listener.isEventReceived(event));

-		assertTrue("event received", postListener.isEventReceived(event));

-	}

-

-	/**

-	 * Test method for

-	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveAsEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}

-	 * .

-	 */

-	@Test

-	public void testFireAllSaveAsEvent() {

-		FakeSaveEventListener preListener = new FakeSaveEventListener();

-		FakeSaveEventListener listener = new FakeSaveEventListener();

-		FakeSaveEventListener postListener = new FakeSaveEventListener();

-

-		eventProvider.addAboutToDoSaveListener(preListener);

-		eventProvider.addDoSaveListener(listener);

-		eventProvider.addPostDoSaveListener(postListener);

-

-		DoSaveEvent event = new FakeSaveEvent();

-		eventProvider.fireAllDoSaveAsEvent(event);

-

-		assertTrue("event received", preListener.isEventReceived(event));

-		assertTrue("event received", listener.isEventReceived(event));

-		assertTrue("event received", postListener.isEventReceived(event));

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.Before;
+import org.junit.Test;
+
+
+/**
+ * @author cedric dumoulin
+ *
+ */
+public class LifeCycleEventsProviderTest extends AbstractPapyrusTest {
+
+	/**
+	 * Object under test.
+	 */
+	protected LifeCycleEventsProvider eventProvider;
+
+	/**
+	 * @see junit.framework.TestCase#setUp()
+	 *
+	 * @throws Exception
+	 */
+	@Before
+	public void setUp() throws Exception {
+		eventProvider = new LifeCycleEventsProvider();
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#addDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}
+	 * .
+	 */
+	@Test
+	public void testAddSaveListener() {
+
+		ISaveEventListener listener = new FakeSaveEventListener();
+
+		try {
+			eventProvider.addDoSaveListener(listener);
+		} catch (Exception e) {
+			fail("Add listener");
+		}
+
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#removeDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}
+	 * .
+	 */
+	@Test
+	public void testRemoveSaveListener() {
+		ISaveEventListener listener = new FakeSaveEventListener();
+
+		try {
+			eventProvider.addDoSaveListener(listener);
+			eventProvider.removeDoSaveListener(listener);
+		} catch (Exception e) {
+			fail("Remove listener");
+		}
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#addAboutToDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}
+	 * .
+	 */
+	@Test
+	public void testAddAboutToSaveListener() {
+		ISaveEventListener listener = new FakeSaveEventListener();
+
+		try {
+			eventProvider.addAboutToDoSaveListener(listener);
+		} catch (Exception e) {
+			fail("Add listener");
+		}
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#removeAboutToDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}
+	 * .
+	 */
+	@Test
+	public void testRemoveAboutToSaveListener() {
+		ISaveEventListener listener = new FakeSaveEventListener();
+
+		try {
+			eventProvider.addAboutToDoSaveListener(listener);
+			eventProvider.removeAboutToDoSaveListener(listener);
+		} catch (Exception e) {
+			fail("Remove listener");
+		}
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#addPostDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}
+	 * .
+	 */
+	@Test
+	public void testAddPostSaveListener() {
+		ISaveEventListener listener = new FakeSaveEventListener();
+
+		try {
+			eventProvider.addPostDoSaveListener(listener);
+		} catch (Exception e) {
+			fail("Add listener");
+		}
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#removePostDoSaveListener(org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener)}
+	 * .
+	 */
+	@Test
+	public void testRemovePostSaveListener() {
+		ISaveEventListener listener = new FakeSaveEventListener();
+
+		try {
+			eventProvider.addPostDoSaveListener(listener);
+			eventProvider.removePostDoSaveListener(listener);
+		} catch (Exception e) {
+			fail("Remove listener");
+		}
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}
+	 * .
+	 */
+	@Test
+	public void testFireAboutToSaveEvent() {
+		FakeSaveEventListener listener = new FakeSaveEventListener();
+
+		eventProvider.addAboutToDoSaveListener(listener);
+		DoSaveEvent event = new FakeSaveEvent();
+		eventProvider.fireAboutToDoSaveEvent(event);
+
+		assertTrue("event received", listener.isEventReceived(event));
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveAsEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}
+	 * .
+	 */
+	@Test
+	public void testFireAboutToSaveAsEvent() {
+		FakeSaveEventListener listener = new FakeSaveEventListener();
+
+		eventProvider.addAboutToDoSaveListener(listener);
+		DoSaveEvent event = new FakeSaveEvent();
+		eventProvider.fireAboutToDoSaveAsEvent(event);
+
+		assertTrue("event received", listener.isEventReceived(event));
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireDoSaveEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}
+	 * .
+	 */
+	@Test
+	public void testFireSaveEvent() {
+		FakeSaveEventListener listener = new FakeSaveEventListener();
+
+		eventProvider.addDoSaveListener(listener);
+		DoSaveEvent event = new FakeSaveEvent();
+		eventProvider.fireDoSaveEvent(event);
+
+		assertTrue("event received", listener.isEventReceived(event));
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireDoSaveAsEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}
+	 * .
+	 */
+	@Test
+	public void testFireSaveAsEvent() {
+		FakeSaveEventListener listener = new FakeSaveEventListener();
+
+		eventProvider.addDoSaveListener(listener);
+		DoSaveEvent event = new FakeSaveEvent();
+		eventProvider.fireDoSaveAsEvent(event);
+
+		assertTrue("event received", listener.isEventReceived(event));
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}
+	 * .
+	 */
+	@Test
+	public void testFirePostSaveEvent() {
+		FakeSaveEventListener listener = new FakeSaveEventListener();
+
+		eventProvider.addPostDoSaveListener(listener);
+		DoSaveEvent event = new FakeSaveEvent();
+		eventProvider.firePostDoSaveEvent(event);
+
+		assertTrue("event received", listener.isEventReceived(event));
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveAsEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}
+	 * .
+	 */
+	@Test
+	public void testFirePostSaveAsEvent() {
+		FakeSaveEventListener listener = new FakeSaveEventListener();
+
+		eventProvider.addPostDoSaveListener(listener);
+		DoSaveEvent event = new FakeSaveEvent();
+		eventProvider.firePostDoSaveAsEvent(event);
+
+		assertTrue("event received", listener.isEventReceived(event));
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}
+	 * .
+	 */
+	@Test
+	public void testFireAllSaveEvent() {
+		FakeSaveEventListener preListener = new FakeSaveEventListener();
+		FakeSaveEventListener listener = new FakeSaveEventListener();
+		FakeSaveEventListener postListener = new FakeSaveEventListener();
+
+		eventProvider.addAboutToDoSaveListener(preListener);
+		eventProvider.addDoSaveListener(listener);
+		eventProvider.addPostDoSaveListener(postListener);
+
+		DoSaveEvent event = new FakeSaveEvent();
+		eventProvider.fireAllDoSaveEvent(event);
+
+		assertTrue("event received", preListener.isEventReceived(event));
+		assertTrue("event received", listener.isEventReceived(event));
+		assertTrue("event received", postListener.isEventReceived(event));
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveAsEvent(org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent)}
+	 * .
+	 */
+	@Test
+	public void testFireAllSaveAsEvent() {
+		FakeSaveEventListener preListener = new FakeSaveEventListener();
+		FakeSaveEventListener listener = new FakeSaveEventListener();
+		FakeSaveEventListener postListener = new FakeSaveEventListener();
+
+		eventProvider.addAboutToDoSaveListener(preListener);
+		eventProvider.addDoSaveListener(listener);
+		eventProvider.addPostDoSaveListener(postListener);
+
+		DoSaveEvent event = new FakeSaveEvent();
+		eventProvider.fireAllDoSaveAsEvent(event);
+
+		assertTrue("event received", preListener.isEventReceived(event));
+		assertTrue("event received", listener.isEventReceived(event));
+		assertTrue("event received", postListener.isEventReceived(event));
+	}
+
+}
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyServiceTest.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyServiceTest.java
index 9561a655183..0c9a52ab230 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyServiceTest.java
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyServiceTest.java
@@ -1,103 +1,103 @@
-/*****************************************************************************

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

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

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

-

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-import static org.junit.Assert.fail;

-

-import org.eclipse.papyrus.junit.framework.classification.NotImplemented;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-

-/**

- * @author dumoulin

- *

- */

-@NotImplemented("Placeholder for test suite")

-public class SaveAndDirtyServiceTest extends AbstractPapyrusTest {

-

-	/**

-	 * @throws java.lang.Exception

-	 */

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	/**

-	 * @throws java.lang.Exception

-	 */

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#doSave(org.eclipse.core.runtime.IProgressMonitor)}.

-	 */

-	@Test

-	public void testDoSave() {

-		fail("Not yet implemented");

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#doSaveAs()}.

-	 */

-	@Test

-	public void testDoSaveAs() {

-		fail("Not yet implemented");

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#isDirty()}.

-	 */

-	@Test

-	public void testIsDirty() {

-		fail("Not yet implemented");

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#isSaveAsAllowed()}.

-	 */

-	@Test

-	public void testIsSaveAsAllowed() {

-		fail("Not yet implemented");

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#isSaveOnCloseNeeded()}.

-	 */

-	@Test

-	public void testIsSaveOnCloseNeeded() {

-		fail("Not yet implemented");

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#registerIsaveablePart(org.eclipse.ui.ISaveablePart)}.

-	 */

-	@Test

-	public void testRegisterIsaveablePart() {

-		fail("Not yet implemented");

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#removeIsaveablePart(org.eclipse.ui.ISaveablePart)}.

-	 */

-	@Test

-	public void testRemoveIsaveablePart() {

-		fail("Not yet implemented");

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.junit.framework.classification.NotImplemented;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+/**
+ * @author dumoulin
+ *
+ */
+@NotImplemented("Placeholder for test suite")
+public class SaveAndDirtyServiceTest extends AbstractPapyrusTest {
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@Before
+	public void setUp() throws Exception {
+	}
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@After
+	public void tearDown() throws Exception {
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#doSave(org.eclipse.core.runtime.IProgressMonitor)}.
+	 */
+	@Test
+	public void testDoSave() {
+		fail("Not yet implemented");
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#doSaveAs()}.
+	 */
+	@Test
+	public void testDoSaveAs() {
+		fail("Not yet implemented");
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#isDirty()}.
+	 */
+	@Test
+	public void testIsDirty() {
+		fail("Not yet implemented");
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#isSaveAsAllowed()}.
+	 */
+	@Test
+	public void testIsSaveAsAllowed() {
+		fail("Not yet implemented");
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#isSaveOnCloseNeeded()}.
+	 */
+	@Test
+	public void testIsSaveOnCloseNeeded() {
+		fail("Not yet implemented");
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#registerIsaveablePart(org.eclipse.ui.ISaveablePart)}.
+	 */
+	@Test
+	public void testRegisterIsaveablePart() {
+		fail("Not yet implemented");
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService#removeIsaveablePart(org.eclipse.ui.ISaveablePart)}.
+	 */
+	@Test
+	public void testRemoveIsaveablePart() {
+		fail("Not yet implemented");
+	}
+
+}
diff --git a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
index c3b678b6c3f..6213293eb21 100644
--- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

-Export-Package: org.eclipse.papyrus.infra.properties.ui.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: Papyrus Properties UI Tests

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)"
+Export-Package: org.eclipse.papyrus.infra.properties.ui.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: Papyrus Properties UI Tests
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.properties.ui.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.project b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.project
index 5aa3666a956..a88a360155a 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.project
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.services.controlmode.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.services.controlmode.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
index d5231323e2d..a645743082b 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",

- org.junit;bundle-version="4.11.0",

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

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

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

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

- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",

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

- org.eclipse.emf.transaction,

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

- org.eclipse.papyrus.junit.utils;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.widgets;bundle-version="[3.0.0,4.0.0)",

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

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

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",

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

-Export-Package: org.eclipse.papyrus.infra.services.controlmode.tests,

- org.eclipse.papyrus.infra.services.controlmode.tests.control,

- org.eclipse.papyrus.infra.services.controlmode.tests.uncontrol

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.4.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.tests.control.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.emf.transaction,
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;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.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.ui.navigator;bundle-version="3.5.500",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.infra.services.controlmode.tests,
+ org.eclipse.papyrus.infra.services.controlmode.tests.control,
+ org.eclipse.papyrus.infra.services.controlmode.tests.uncontrol
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.4.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.tests.control.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/OSGI-INF/l10n/bundle.properties
index 2d0965554f2..88bd7044863 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.services.controlmode.tests

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.services.controlmode.tests
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Control Mode Tests
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/about.html b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/about.html
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/build.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/build.properties
index 878b084add3..4c54eda2e4d 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/build.properties
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/build.properties
@@ -1,10 +1,10 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               model/,\

-               build.properties,\

-               about.html,\

-               OSGI-INF/,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               model/,\
+               build.properties,\
+               about.html,\
+               OSGI-INF/,\
+               plugin.xml
+src.includes = about.html
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/ControlModeWithProfileTestModel.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/ControlModeWithProfileTestModel.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/ControlModeWithProfileTestModel.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/ControlModeWithProfileTestModel.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/ControlModeWithProfileTestModel.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/ControlModeWithProfileTestModel.notation
index 029ca2065e3..f4e1f4e8b0e 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/ControlModeWithProfileTestModel.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/ControlModeWithProfileTestModel.notation
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_VTrFwLpyEeOiIqA0Y8pjRA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_zQoBsLpyEeOiIqA0Y8pjRA" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_zQoowLpyEeOiIqA0Y8pjRA" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_zQoowbpyEeOiIqA0Y8pjRA" type="7017">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoowrpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zQoow7pyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQooxLpyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_zQooxrpyEeOiIqA0Y8pjRA" type="7018">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoox7pyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zQooyLpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQooybpyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_zQooy7pyEeOiIqA0Y8pjRA" type="7019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoozLpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zQoozbpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQpP0LpyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <element xmi:type="uml:Class" href="ControlModeWithProfileTestModel.uml#_zQQOQLpyEeOiIqA0Y8pjRA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQoBsbpyEeOiIqA0Y8pjRA" x="292" y="260"/>

-  </children>

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

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_VTrFwrpyEeOiIqA0Y8pjRA">

-    <owner xmi:type="uml:Model" href="ControlModeWithProfileTestModel.uml#_zf8FgLpxEeOiIqA0Y8pjRA"/>

-  </styles>

-  <element xmi:type="uml:Model" href="ControlModeWithProfileTestModel.uml#_zf8FgLpxEeOiIqA0Y8pjRA"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_VTrFwLpyEeOiIqA0Y8pjRA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_zQoBsLpyEeOiIqA0Y8pjRA" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_zQoowLpyEeOiIqA0Y8pjRA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_zQoowbpyEeOiIqA0Y8pjRA" type="7017">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoowrpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zQoow7pyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQooxLpyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQooxbpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_zQooxrpyEeOiIqA0Y8pjRA" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoox7pyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zQooyLpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQooybpyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQooyrpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_zQooy7pyEeOiIqA0Y8pjRA" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoozLpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zQoozbpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQpP0LpyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQpP0bpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <element xmi:type="uml:Class" href="ControlModeWithProfileTestModel.uml#_zQQOQLpyEeOiIqA0Y8pjRA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQoBsbpyEeOiIqA0Y8pjRA" x="292" y="260"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_VTrFwbpyEeOiIqA0Y8pjRA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_VTrFwrpyEeOiIqA0Y8pjRA">
+    <owner xmi:type="uml:Model" href="ControlModeWithProfileTestModel.uml#_zf8FgLpxEeOiIqA0Y8pjRA"/>
+  </styles>
+  <element xmi:type="uml:Model" href="ControlModeWithProfileTestModel.uml#_zf8FgLpxEeOiIqA0Y8pjRA"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.notation
index 94dd5e30272..66be488ae94 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.notation
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOdAYLpyEeOiIqA0Y8pjRA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_MTfesLpyEeOiIqA0Y8pjRA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_MTgFwLpyEeOiIqA0Y8pjRA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs0LpyEeOiIqA0Y8pjRA" type="1071">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs0bpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs0rpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs07pyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs1bpyEeOiIqA0Y8pjRA" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs1rpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs17pyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs2LpyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_MTPnELpyEeOiIqA0Y8pjRA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTfesbpyEeOiIqA0Y8pjRA" x="327" y="185"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_P1ovwLpyEeOiIqA0Y8pjRA" type="1031">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P1qk8LpyEeOiIqA0Y8pjRA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMALpyEeOiIqA0Y8pjRA" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMAbpyEeOiIqA0Y8pjRA" key="StereotypeList" value="StandardProfile::Metaclass"/>

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

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rzELpyEeOiIqA0Y8pjRA" key="PropStereoDisplay" value=""/>

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

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_P1pW0LpyEeOiIqA0Y8pjRA" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P1pW0bpyEeOiIqA0Y8pjRA" x="703" y="240"/>

-  </children>

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

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_JOdAYrpyEeOiIqA0Y8pjRA">

-    <owner xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>

-  </styles>

-  <element xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_Qo5_wLpyEeOiIqA0Y8pjRA" type="1013" source="_MTfesLpyEeOiIqA0Y8pjRA" target="_P1ovwLpyEeOiIqA0Y8pjRA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_Qo5_wbpyEeOiIqA0Y8pjRA"/>

-    <element xmi:type="uml:Extension" href="testProfile.profile.uml#_QoqIILpyEeOiIqA0Y8pjRA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qo5_wrpyEeOiIqA0Y8pjRA" points="[50, 4, -295, -24]$[326, 26, -19, -2]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qpa9ILpyEeOiIqA0Y8pjRA" id="(0.19,0.46)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOdAYLpyEeOiIqA0Y8pjRA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_MTfesLpyEeOiIqA0Y8pjRA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_MTgFwLpyEeOiIqA0Y8pjRA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs0LpyEeOiIqA0Y8pjRA" type="1071">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs0bpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs0rpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs07pyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTgs1LpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs1bpyEeOiIqA0Y8pjRA" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs1rpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs17pyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs2LpyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTgs2bpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_MTPnELpyEeOiIqA0Y8pjRA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTfesbpyEeOiIqA0Y8pjRA" x="327" y="185"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_P1ovwLpyEeOiIqA0Y8pjRA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P1qk8LpyEeOiIqA0Y8pjRA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMALpyEeOiIqA0Y8pjRA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMAbpyEeOiIqA0Y8pjRA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMArpyEeOiIqA0Y8pjRA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rzELpyEeOiIqA0Y8pjRA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rzEbpyEeOiIqA0Y8pjRA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_P1pW0LpyEeOiIqA0Y8pjRA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P1pW0bpyEeOiIqA0Y8pjRA" x="703" y="240"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_JOdAYbpyEeOiIqA0Y8pjRA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_JOdAYrpyEeOiIqA0Y8pjRA">
+    <owner xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_Qo5_wLpyEeOiIqA0Y8pjRA" type="1013" source="_MTfesLpyEeOiIqA0Y8pjRA" target="_P1ovwLpyEeOiIqA0Y8pjRA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_Qo5_wbpyEeOiIqA0Y8pjRA"/>
+    <element xmi:type="uml:Extension" href="testProfile.profile.uml#_QoqIILpyEeOiIqA0Y8pjRA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qo5_wrpyEeOiIqA0Y8pjRA" points="[50, 4, -295, -24]$[326, 26, -19, -2]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qpa9ILpyEeOiIqA0Y8pjRA" id="(0.19,0.46)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.uml
index 6a1d15dad77..fdb01808011 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ControlModeWithProfileTest/testProfile.profile.uml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOBikLpyEeOiIqA0Y8pjRA" name="profile" metaclassReference="_P1j3QLpyEeOiIqA0Y8pjRA">

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

-    <contents xmi:type="ecore:EPackage" xmi:id="_RtfCMLpyEeOiIqA0Y8pjRA" name="profile" nsURI="http:///schemas/profile/_Rtcl8LpyEeOiIqA0Y8pjRA/0" nsPrefix="profile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtiFgLpyEeOiIqA0Y8pjRA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFgbpyEeOiIqA0Y8pjRA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFgrpyEeOiIqA0Y8pjRA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFg7pyEeOiIqA0Y8pjRA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFhLpyEeOiIqA0Y8pjRA" key="Date" value="2014-04-02"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFhbpyEeOiIqA0Y8pjRA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_RtfCMbpyEeOiIqA0Y8pjRA" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtfCMrpyEeOiIqA0Y8pjRA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_MTPnELpyEeOiIqA0Y8pjRA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_RtfCM7pyEeOiIqA0Y8pjRA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_P1j3QLpyEeOiIqA0Y8pjRA" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_MTPnELpyEeOiIqA0Y8pjRA" name="Stereotype1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Qoo6ALpyEeOiIqA0Y8pjRA" name="base_Class" association="_QoqIILpyEeOiIqA0Y8pjRA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_QoqIILpyEeOiIqA0Y8pjRA" name="E_Stereotype1_Class1" memberEnd="_QoqIIbpyEeOiIqA0Y8pjRA _Qoo6ALpyEeOiIqA0Y8pjRA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_QoqIIbpyEeOiIqA0Y8pjRA" name="extension_Stereotype1" type="_MTPnELpyEeOiIqA0Y8pjRA" aggregation="composite" association="_QoqIILpyEeOiIqA0Y8pjRA"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOBikLpyEeOiIqA0Y8pjRA" name="profile" metaclassReference="_P1j3QLpyEeOiIqA0Y8pjRA">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtebILpyEeOiIqA0Y8pjRA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_RtfCMLpyEeOiIqA0Y8pjRA" name="profile" nsURI="http:///schemas/profile/_Rtcl8LpyEeOiIqA0Y8pjRA/0" nsPrefix="profile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtiFgLpyEeOiIqA0Y8pjRA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFgbpyEeOiIqA0Y8pjRA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFgrpyEeOiIqA0Y8pjRA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFg7pyEeOiIqA0Y8pjRA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFhLpyEeOiIqA0Y8pjRA" key="Date" value="2014-04-02"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFhbpyEeOiIqA0Y8pjRA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_RtfCMbpyEeOiIqA0Y8pjRA" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtfCMrpyEeOiIqA0Y8pjRA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_MTPnELpyEeOiIqA0Y8pjRA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_RtfCM7pyEeOiIqA0Y8pjRA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_P1j3QLpyEeOiIqA0Y8pjRA" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_MTPnELpyEeOiIqA0Y8pjRA" name="Stereotype1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Qoo6ALpyEeOiIqA0Y8pjRA" name="base_Class" association="_QoqIILpyEeOiIqA0Y8pjRA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_QoqIILpyEeOiIqA0Y8pjRA" name="E_Stereotype1_Class1" memberEnd="_QoqIIbpyEeOiIqA0Y8pjRA _Qoo6ALpyEeOiIqA0Y8pjRA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_QoqIIbpyEeOiIqA0Y8pjRA" name="extension_Stereotype1" type="_MTPnELpyEeOiIqA0Y8pjRA" aggregation="composite" association="_QoqIILpyEeOiIqA0Y8pjRA"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/submodel.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/submodel.di
index 9c61b75f345..cac982021da 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/submodel.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/submodel.di
@@ -1,8 +1,8 @@
-<?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">

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder"/>

-    </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">
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder"/>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/submodel.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/submodel.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/submodel.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/submodel.notation
@@ -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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.notation
index 94dd5e30272..66be488ae94 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.notation
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOdAYLpyEeOiIqA0Y8pjRA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_MTfesLpyEeOiIqA0Y8pjRA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_MTgFwLpyEeOiIqA0Y8pjRA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs0LpyEeOiIqA0Y8pjRA" type="1071">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs0bpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs0rpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs07pyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs1bpyEeOiIqA0Y8pjRA" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs1rpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs17pyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs2LpyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_MTPnELpyEeOiIqA0Y8pjRA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTfesbpyEeOiIqA0Y8pjRA" x="327" y="185"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_P1ovwLpyEeOiIqA0Y8pjRA" type="1031">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P1qk8LpyEeOiIqA0Y8pjRA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMALpyEeOiIqA0Y8pjRA" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMAbpyEeOiIqA0Y8pjRA" key="StereotypeList" value="StandardProfile::Metaclass"/>

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

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rzELpyEeOiIqA0Y8pjRA" key="PropStereoDisplay" value=""/>

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

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_P1pW0LpyEeOiIqA0Y8pjRA" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P1pW0bpyEeOiIqA0Y8pjRA" x="703" y="240"/>

-  </children>

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

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_JOdAYrpyEeOiIqA0Y8pjRA">

-    <owner xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>

-  </styles>

-  <element xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_Qo5_wLpyEeOiIqA0Y8pjRA" type="1013" source="_MTfesLpyEeOiIqA0Y8pjRA" target="_P1ovwLpyEeOiIqA0Y8pjRA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_Qo5_wbpyEeOiIqA0Y8pjRA"/>

-    <element xmi:type="uml:Extension" href="testProfile.profile.uml#_QoqIILpyEeOiIqA0Y8pjRA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qo5_wrpyEeOiIqA0Y8pjRA" points="[50, 4, -295, -24]$[326, 26, -19, -2]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qpa9ILpyEeOiIqA0Y8pjRA" id="(0.19,0.46)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOdAYLpyEeOiIqA0Y8pjRA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_MTfesLpyEeOiIqA0Y8pjRA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_MTgFwLpyEeOiIqA0Y8pjRA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs0LpyEeOiIqA0Y8pjRA" type="1071">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs0bpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs0rpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs07pyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTgs1LpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs1bpyEeOiIqA0Y8pjRA" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs1rpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs17pyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs2LpyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTgs2bpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_MTPnELpyEeOiIqA0Y8pjRA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTfesbpyEeOiIqA0Y8pjRA" x="327" y="185"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_P1ovwLpyEeOiIqA0Y8pjRA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P1qk8LpyEeOiIqA0Y8pjRA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMALpyEeOiIqA0Y8pjRA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMAbpyEeOiIqA0Y8pjRA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMArpyEeOiIqA0Y8pjRA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rzELpyEeOiIqA0Y8pjRA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rzEbpyEeOiIqA0Y8pjRA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_P1pW0LpyEeOiIqA0Y8pjRA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P1pW0bpyEeOiIqA0Y8pjRA" x="703" y="240"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_JOdAYbpyEeOiIqA0Y8pjRA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_JOdAYrpyEeOiIqA0Y8pjRA">
+    <owner xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_Qo5_wLpyEeOiIqA0Y8pjRA" type="1013" source="_MTfesLpyEeOiIqA0Y8pjRA" target="_P1ovwLpyEeOiIqA0Y8pjRA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_Qo5_wbpyEeOiIqA0Y8pjRA"/>
+    <element xmi:type="uml:Extension" href="testProfile.profile.uml#_QoqIILpyEeOiIqA0Y8pjRA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qo5_wrpyEeOiIqA0Y8pjRA" points="[50, 4, -295, -24]$[326, 26, -19, -2]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qpa9ILpyEeOiIqA0Y8pjRA" id="(0.19,0.46)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.uml
index 3c81e91ae6c..d8cf651408c 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/ShardedWithProfileTest/testProfile.profile.uml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOBikLpyEeOiIqA0Y8pjRA" name="profile" metaclassReference="_P1j3QLpyEeOiIqA0Y8pjRA">

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

-    <contents xmi:type="ecore:EPackage" xmi:id="_RtfCMLpyEeOiIqA0Y8pjRA" name="profile" nsURI="http:///schemas/profile/_Rtcl8LpyEeOiIqA0Y8pjRA/0" nsPrefix="profile">

-      <eAnnotations xmi:id="_RtiFgLpyEeOiIqA0Y8pjRA" source="PapyrusVersion">

-        <details xmi:id="_RtiFgbpyEeOiIqA0Y8pjRA" key="Version" value="0.0.1"/>

-        <details xmi:id="_RtiFgrpyEeOiIqA0Y8pjRA" key="Comment" value=""/>

-        <details xmi:id="_RtiFg7pyEeOiIqA0Y8pjRA" key="Copyright" value=""/>

-        <details xmi:id="_RtiFhLpyEeOiIqA0Y8pjRA" key="Date" value="2014-04-02"/>

-        <details xmi:id="_RtiFhbpyEeOiIqA0Y8pjRA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_RtfCMbpyEeOiIqA0Y8pjRA" name="Stereotype1">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_RtfCM7pyEeOiIqA0Y8pjRA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:id="_P1j3QLpyEeOiIqA0Y8pjRA" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_MTPnELpyEeOiIqA0Y8pjRA" name="Stereotype1">

-    <ownedAttribute xmi:id="_Qoo6ALpyEeOiIqA0Y8pjRA" name="base_Class" association="_QoqIILpyEeOiIqA0Y8pjRA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_QoqIILpyEeOiIqA0Y8pjRA" name="E_Stereotype1_Class1" memberEnd="_QoqIIbpyEeOiIqA0Y8pjRA _Qoo6ALpyEeOiIqA0Y8pjRA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_QoqIIbpyEeOiIqA0Y8pjRA" name="extension_Stereotype1" type="_MTPnELpyEeOiIqA0Y8pjRA" aggregation="composite" association="_QoqIILpyEeOiIqA0Y8pjRA"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOBikLpyEeOiIqA0Y8pjRA" name="profile" metaclassReference="_P1j3QLpyEeOiIqA0Y8pjRA">
+  <eAnnotations xmi:id="_RtebILpyEeOiIqA0Y8pjRA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_RtfCMLpyEeOiIqA0Y8pjRA" name="profile" nsURI="http:///schemas/profile/_Rtcl8LpyEeOiIqA0Y8pjRA/0" nsPrefix="profile">
+      <eAnnotations xmi:id="_RtiFgLpyEeOiIqA0Y8pjRA" source="PapyrusVersion">
+        <details xmi:id="_RtiFgbpyEeOiIqA0Y8pjRA" key="Version" value="0.0.1"/>
+        <details xmi:id="_RtiFgrpyEeOiIqA0Y8pjRA" key="Comment" value=""/>
+        <details xmi:id="_RtiFg7pyEeOiIqA0Y8pjRA" key="Copyright" value=""/>
+        <details xmi:id="_RtiFhLpyEeOiIqA0Y8pjRA" key="Date" value="2014-04-02"/>
+        <details xmi:id="_RtiFhbpyEeOiIqA0Y8pjRA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_RtfCMbpyEeOiIqA0Y8pjRA" name="Stereotype1">
+        <eAnnotations xmi:id="_RtfCMrpyEeOiIqA0Y8pjRA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_MTPnELpyEeOiIqA0Y8pjRA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_RtfCM7pyEeOiIqA0Y8pjRA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:id="_P1j3QLpyEeOiIqA0Y8pjRA" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_MTPnELpyEeOiIqA0Y8pjRA" name="Stereotype1">
+    <ownedAttribute xmi:id="_Qoo6ALpyEeOiIqA0Y8pjRA" name="base_Class" association="_QoqIILpyEeOiIqA0Y8pjRA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_QoqIILpyEeOiIqA0Y8pjRA" name="E_Stereotype1_Class1" memberEnd="_QoqIIbpyEeOiIqA0Y8pjRA _Qoo6ALpyEeOiIqA0Y8pjRA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_QoqIIbpyEeOiIqA0Y8pjRA" name="extension_Stereotype1" type="_MTPnELpyEeOiIqA0Y8pjRA" aggregation="composite" association="_QoqIILpyEeOiIqA0Y8pjRA"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.notation
index 9670f0f2c61..29c31a0b7ad 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.notation
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_VTrFwLpyEeOiIqA0Y8pjRA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_zQoBsLpyEeOiIqA0Y8pjRA" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_zQoowLpyEeOiIqA0Y8pjRA" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_zQoowbpyEeOiIqA0Y8pjRA" type="7017">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoowrpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zQoow7pyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQooxLpyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_zQooxrpyEeOiIqA0Y8pjRA" type="7018">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoox7pyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zQooyLpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQooybpyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_zQooy7pyEeOiIqA0Y8pjRA" type="7019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoozLpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zQoozbpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQpP0LpyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <element xmi:type="uml:Class" href="submodel.uml#_zQQOQLpyEeOiIqA0Y8pjRA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQoBsbpyEeOiIqA0Y8pjRA" x="292" y="260"/>

-  </children>

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

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_VTrFwrpyEeOiIqA0Y8pjRA">

-    <owner xmi:type="uml:Model" href="UncontrolModeWithProfileTestModel.uml#_zf8FgLpxEeOiIqA0Y8pjRA"/>

-  </styles>

-  <element xmi:type="uml:Model" href="UncontrolModeWithProfileTestModel.uml#_zf8FgLpxEeOiIqA0Y8pjRA"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_VTrFwLpyEeOiIqA0Y8pjRA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_zQoBsLpyEeOiIqA0Y8pjRA" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_zQoowLpyEeOiIqA0Y8pjRA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_zQoowbpyEeOiIqA0Y8pjRA" type="7017">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoowrpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zQoow7pyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQooxLpyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQooxbpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_zQooxrpyEeOiIqA0Y8pjRA" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoox7pyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zQooyLpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQooybpyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQooyrpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_zQooy7pyEeOiIqA0Y8pjRA" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zQoozLpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zQoozbpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zQpP0LpyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQpP0bpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <element xmi:type="uml:Class" href="submodel.uml#_zQQOQLpyEeOiIqA0Y8pjRA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zQoBsbpyEeOiIqA0Y8pjRA" x="292" y="260"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_VTrFwbpyEeOiIqA0Y8pjRA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_VTrFwrpyEeOiIqA0Y8pjRA">
+    <owner xmi:type="uml:Model" href="UncontrolModeWithProfileTestModel.uml#_zf8FgLpxEeOiIqA0Y8pjRA"/>
+  </styles>
+  <element xmi:type="uml:Model" href="UncontrolModeWithProfileTestModel.uml#_zf8FgLpxEeOiIqA0Y8pjRA"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.uml
index f4032dc144a..01a88968c69 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/UncontrolModeWithProfileTestModel.uml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_zf8FgLpxEeOiIqA0Y8pjRA" name="model">

-  <packagedElement xmi:type="uml:Package" href="submodel.uml#_BRaDULsMEeO75-I_oucZEA"/>

-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_uf2E8LsPEeOBNLJQ9YB1Vw">

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

-      <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_RtfCMLpyEeOiIqA0Y8pjRA"/>

-    </eAnnotations>

-    <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>

-  </profileApplication>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_zf8FgLpxEeOiIqA0Y8pjRA" name="model">
+  <packagedElement xmi:type="uml:Package" href="submodel.uml#_BRaDULsMEeO75-I_oucZEA"/>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_uf2E8LsPEeOBNLJQ9YB1Vw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uf8yoLsPEeOBNLJQ9YB1Vw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_RtfCMLpyEeOiIqA0Y8pjRA"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>
+  </profileApplication>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/submodel.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/submodel.di
index 9c61b75f345..cac982021da 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/submodel.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/submodel.di
@@ -1,8 +1,8 @@
-<?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">

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder"/>

-    </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">
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder"/>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/submodel.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/submodel.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/submodel.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/submodel.notation
@@ -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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.notation
index 94dd5e30272..66be488ae94 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.notation
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOdAYLpyEeOiIqA0Y8pjRA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_MTfesLpyEeOiIqA0Y8pjRA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_MTgFwLpyEeOiIqA0Y8pjRA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs0LpyEeOiIqA0Y8pjRA" type="1071">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs0bpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs0rpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs07pyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs1bpyEeOiIqA0Y8pjRA" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs1rpyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs17pyEeOiIqA0Y8pjRA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs2LpyEeOiIqA0Y8pjRA"/>

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

-    </children>

-    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_MTPnELpyEeOiIqA0Y8pjRA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTfesbpyEeOiIqA0Y8pjRA" x="327" y="185"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_P1ovwLpyEeOiIqA0Y8pjRA" type="1031">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P1qk8LpyEeOiIqA0Y8pjRA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMALpyEeOiIqA0Y8pjRA" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMAbpyEeOiIqA0Y8pjRA" key="StereotypeList" value="StandardProfile::Metaclass"/>

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

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rzELpyEeOiIqA0Y8pjRA" key="PropStereoDisplay" value=""/>

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

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_P1pW0LpyEeOiIqA0Y8pjRA" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P1pW0bpyEeOiIqA0Y8pjRA" x="703" y="240"/>

-  </children>

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

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_JOdAYrpyEeOiIqA0Y8pjRA">

-    <owner xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>

-  </styles>

-  <element xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_Qo5_wLpyEeOiIqA0Y8pjRA" type="1013" source="_MTfesLpyEeOiIqA0Y8pjRA" target="_P1ovwLpyEeOiIqA0Y8pjRA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_Qo5_wbpyEeOiIqA0Y8pjRA"/>

-    <element xmi:type="uml:Extension" href="testProfile.profile.uml#_QoqIILpyEeOiIqA0Y8pjRA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qo5_wrpyEeOiIqA0Y8pjRA" points="[50, 4, -295, -24]$[326, 26, -19, -2]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qpa9ILpyEeOiIqA0Y8pjRA" id="(0.19,0.46)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOdAYLpyEeOiIqA0Y8pjRA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_MTfesLpyEeOiIqA0Y8pjRA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_MTgFwLpyEeOiIqA0Y8pjRA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs0LpyEeOiIqA0Y8pjRA" type="1071">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs0bpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs0rpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs07pyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTgs1LpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MTgs1bpyEeOiIqA0Y8pjRA" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MTgs1rpyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_MTgs17pyEeOiIqA0Y8pjRA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_MTgs2LpyEeOiIqA0Y8pjRA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTgs2bpyEeOiIqA0Y8pjRA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_MTPnELpyEeOiIqA0Y8pjRA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTfesbpyEeOiIqA0Y8pjRA" x="327" y="185"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_P1ovwLpyEeOiIqA0Y8pjRA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P1qk8LpyEeOiIqA0Y8pjRA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMALpyEeOiIqA0Y8pjRA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMAbpyEeOiIqA0Y8pjRA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rMArpyEeOiIqA0Y8pjRA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rzELpyEeOiIqA0Y8pjRA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P1rzEbpyEeOiIqA0Y8pjRA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_P1pW0LpyEeOiIqA0Y8pjRA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P1pW0bpyEeOiIqA0Y8pjRA" x="703" y="240"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_JOdAYbpyEeOiIqA0Y8pjRA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_JOdAYrpyEeOiIqA0Y8pjRA">
+    <owner xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="testProfile.profile.uml#_JOBikLpyEeOiIqA0Y8pjRA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_Qo5_wLpyEeOiIqA0Y8pjRA" type="1013" source="_MTfesLpyEeOiIqA0Y8pjRA" target="_P1ovwLpyEeOiIqA0Y8pjRA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_Qo5_wbpyEeOiIqA0Y8pjRA"/>
+    <element xmi:type="uml:Extension" href="testProfile.profile.uml#_QoqIILpyEeOiIqA0Y8pjRA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qo5_wrpyEeOiIqA0Y8pjRA" points="[50, 4, -295, -24]$[326, 26, -19, -2]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qpa9ILpyEeOiIqA0Y8pjRA" id="(0.19,0.46)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.uml
index 6a1d15dad77..fdb01808011 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModeWithProfileTest/testProfile.profile.uml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOBikLpyEeOiIqA0Y8pjRA" name="profile" metaclassReference="_P1j3QLpyEeOiIqA0Y8pjRA">

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

-    <contents xmi:type="ecore:EPackage" xmi:id="_RtfCMLpyEeOiIqA0Y8pjRA" name="profile" nsURI="http:///schemas/profile/_Rtcl8LpyEeOiIqA0Y8pjRA/0" nsPrefix="profile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtiFgLpyEeOiIqA0Y8pjRA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFgbpyEeOiIqA0Y8pjRA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFgrpyEeOiIqA0Y8pjRA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFg7pyEeOiIqA0Y8pjRA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFhLpyEeOiIqA0Y8pjRA" key="Date" value="2014-04-02"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFhbpyEeOiIqA0Y8pjRA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_RtfCMbpyEeOiIqA0Y8pjRA" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtfCMrpyEeOiIqA0Y8pjRA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_MTPnELpyEeOiIqA0Y8pjRA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_RtfCM7pyEeOiIqA0Y8pjRA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_P1j3QLpyEeOiIqA0Y8pjRA" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_MTPnELpyEeOiIqA0Y8pjRA" name="Stereotype1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Qoo6ALpyEeOiIqA0Y8pjRA" name="base_Class" association="_QoqIILpyEeOiIqA0Y8pjRA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_QoqIILpyEeOiIqA0Y8pjRA" name="E_Stereotype1_Class1" memberEnd="_QoqIIbpyEeOiIqA0Y8pjRA _Qoo6ALpyEeOiIqA0Y8pjRA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_QoqIIbpyEeOiIqA0Y8pjRA" name="extension_Stereotype1" type="_MTPnELpyEeOiIqA0Y8pjRA" aggregation="composite" association="_QoqIILpyEeOiIqA0Y8pjRA"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_JOBikLpyEeOiIqA0Y8pjRA" name="profile" metaclassReference="_P1j3QLpyEeOiIqA0Y8pjRA">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtebILpyEeOiIqA0Y8pjRA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_RtfCMLpyEeOiIqA0Y8pjRA" name="profile" nsURI="http:///schemas/profile/_Rtcl8LpyEeOiIqA0Y8pjRA/0" nsPrefix="profile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtiFgLpyEeOiIqA0Y8pjRA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFgbpyEeOiIqA0Y8pjRA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFgrpyEeOiIqA0Y8pjRA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFg7pyEeOiIqA0Y8pjRA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFhLpyEeOiIqA0Y8pjRA" key="Date" value="2014-04-02"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RtiFhbpyEeOiIqA0Y8pjRA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_RtfCMbpyEeOiIqA0Y8pjRA" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RtfCMrpyEeOiIqA0Y8pjRA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_MTPnELpyEeOiIqA0Y8pjRA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_RtfCM7pyEeOiIqA0Y8pjRA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_P1j3QLpyEeOiIqA0Y8pjRA" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_MTPnELpyEeOiIqA0Y8pjRA" name="Stereotype1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Qoo6ALpyEeOiIqA0Y8pjRA" name="base_Class" association="_QoqIILpyEeOiIqA0Y8pjRA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_QoqIILpyEeOiIqA0Y8pjRA" name="E_Stereotype1_Class1" memberEnd="_QoqIIbpyEeOiIqA0Y8pjRA _Qoo6ALpyEeOiIqA0Y8pjRA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_QoqIIbpyEeOiIqA0Y8pjRA" name="extension_Stereotype1" type="_MTPnELpyEeOiIqA0Y8pjRA" aggregation="composite" association="_QoqIILpyEeOiIqA0Y8pjRA"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.notation
index f1aea4b3161..a159b3eccbe 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.notation
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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">

-  <notation:Diagram xmi:id="_dbCnALT3EeOlI9v8xMQjlA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_JjMfcLaPEeOoHZCEMkR4pQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_JjR_ALaPEeOoHZCEMkR4pQ" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_JjVpYLaPEeOoHZCEMkR4pQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_JjVpYbaPEeOoHZCEMkR4pQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_JjVpYraPEeOoHZCEMkR4pQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_JjVpY7aPEeOoHZCEMkR4pQ"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_JjWQcLaPEeOoHZCEMkR4pQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_JjWQcbaPEeOoHZCEMkR4pQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_JjWQcraPEeOoHZCEMkR4pQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_JjWQc7aPEeOoHZCEMkR4pQ"/>

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

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_JjWQdbaPEeOoHZCEMkR4pQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_JjWQdraPEeOoHZCEMkR4pQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_JjWQd7aPEeOoHZCEMkR4pQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_JjWQeLaPEeOoHZCEMkR4pQ"/>

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

-      </children>

-      <element xmi:type="uml:Class" href="ReintegrateTestModel.uml#_JhXTcLaPEeOoHZCEMkR4pQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JjNGgLaPEeOoHZCEMkR4pQ" x="984" y="206"/>

-    </children>

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

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_dbCnArT3EeOlI9v8xMQjlA">

-      <owner xmi:type="uml:Model" href="ReintegrateTestModel.uml#_dZLl0LT3EeOlI9v8xMQjlA"/>

-    </styles>

-    <element xmi:type="uml:Model" href="ReintegrateTestModel.uml#_dZLl0LT3EeOlI9v8xMQjlA"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_Lnst0LaPEeOoHZCEMkR4pQ" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

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

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Lnst0raPEeOoHZCEMkR4pQ">

-      <owner xmi:type="uml:Package" href="Subpackage.uml#_sMwu4LT3EeOlI9v8xMQjlA"/>

-    </styles>

-    <element xmi:type="uml:Package" href="Subpackage.uml#_sMwu4LT3EeOlI9v8xMQjlA"/>

-  </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: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">
+  <notation:Diagram xmi:id="_dbCnALT3EeOlI9v8xMQjlA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_JjMfcLaPEeOoHZCEMkR4pQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_JjR_ALaPEeOoHZCEMkR4pQ" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JjVpYLaPEeOoHZCEMkR4pQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JjVpYbaPEeOoHZCEMkR4pQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_JjVpYraPEeOoHZCEMkR4pQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_JjVpY7aPEeOoHZCEMkR4pQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JjVpZLaPEeOoHZCEMkR4pQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JjWQcLaPEeOoHZCEMkR4pQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JjWQcbaPEeOoHZCEMkR4pQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_JjWQcraPEeOoHZCEMkR4pQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_JjWQc7aPEeOoHZCEMkR4pQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JjWQdLaPEeOoHZCEMkR4pQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JjWQdbaPEeOoHZCEMkR4pQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JjWQdraPEeOoHZCEMkR4pQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_JjWQd7aPEeOoHZCEMkR4pQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_JjWQeLaPEeOoHZCEMkR4pQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JjWQebaPEeOoHZCEMkR4pQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="ReintegrateTestModel.uml#_JhXTcLaPEeOoHZCEMkR4pQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JjNGgLaPEeOoHZCEMkR4pQ" x="984" y="206"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_dbCnAbT3EeOlI9v8xMQjlA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_dbCnArT3EeOlI9v8xMQjlA">
+      <owner xmi:type="uml:Model" href="ReintegrateTestModel.uml#_dZLl0LT3EeOlI9v8xMQjlA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="ReintegrateTestModel.uml#_dZLl0LT3EeOlI9v8xMQjlA"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_Lnst0LaPEeOoHZCEMkR4pQ" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_Lnst0baPEeOoHZCEMkR4pQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Lnst0raPEeOoHZCEMkR4pQ">
+      <owner xmi:type="uml:Package" href="Subpackage.uml#_sMwu4LT3EeOlI9v8xMQjlA"/>
+    </styles>
+    <element xmi:type="uml:Package" href="Subpackage.uml#_sMwu4LT3EeOlI9v8xMQjlA"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.uml
index 70df566534a..ab40c425a20 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/ReintegrateTestModel.uml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_dZLl0LT3EeOlI9v8xMQjlA" name="model">

-  <packagedElement xmi:type="uml:Package" href="Subpackage.uml#_sMwu4LT3EeOlI9v8xMQjlA"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_JhXTcLaPEeOoHZCEMkR4pQ" name="Class1"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_dZLl0LT3EeOlI9v8xMQjlA" name="model">
+  <packagedElement xmi:type="uml:Package" href="Subpackage.uml#_sMwu4LT3EeOlI9v8xMQjlA"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_JhXTcLaPEeOoHZCEMkR4pQ" name="Class1"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.di
index 9c61b75f345..cac982021da 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.di
@@ -1,8 +1,8 @@
-<?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">

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder"/>

-    </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">
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder"/>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.notation
@@ -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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.uml
index 62a9b96f26e..a68eff40eb4 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/model/UncontrolModelTest/Subpackage.uml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Package xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_sMwu4LT3EeOlI9v8xMQjlA" name="Subpackage">

-  <packagedElement xmi:type="uml:Class" xmi:id="_upzZELT3EeOlI9v8xMQjlA" name="Class"/>

-</uml:Package>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Package xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_sMwu4LT3EeOlI9v8xMQjlA" name="Subpackage">
+  <packagedElement xmi:type="uml:Class" xmi:id="_upzZELT3EeOlI9v8xMQjlA" name="Class"/>
+</uml:Package>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/Messages.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/Messages.java
index f4c7f6dc611..0a349519e62 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/Messages.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/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:

- *     Juan Cadavid <juan.cadavid@cea.fr> implementation

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

-package org.eclipse.papyrus.infra.services.controlmode.tests;

-

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

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.controlmode.tests.messages"; //$NON-NLS-1$

-

-	public static String AbstractControlModeTest_1;

-

-	public static String AbstractUncontrolModelTest_1;

-

-	public static String ControlModelTest_4;

-

-	public static String ControlModelWithProfileTest_4;

-

-	public static String ExistingResourceControlModeTest_5;

-

-	public static String UncontrolModelTest_4;

-

-	public static String UncontrolModelWithProfileTest_5;

-	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:
+ *     Juan Cadavid <juan.cadavid@cea.fr> implementation
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode.tests;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.controlmode.tests.messages"; //$NON-NLS-1$
+
+	public static String AbstractControlModeTest_1;
+
+	public static String AbstractUncontrolModelTest_1;
+
+	public static String ControlModelTest_4;
+
+	public static String ControlModelWithProfileTest_4;
+
+	public static String ExistingResourceControlModeTest_5;
+
+	public static String UncontrolModelTest_4;
+
+	public static String UncontrolModelWithProfileTest_5;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/Activator.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/Activator.java
index e3ea14f542c..a3aa7053eee 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/Activator.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/Activator.java
@@ -1,66 +1,66 @@
-/*******************************************************************************

- * Copyright (c) 2014 CEA LIST.

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

- *     Juan Cadavid <juan.cadavid@cea.fr> implementation

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

-package org.eclipse.papyrus.infra.services.controlmode.tests.control;

-

-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.controlmode.tests"; //$NON-NLS-1$

-

-	public static LogHelper log;

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

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

-	 */

-	public void start(BundleContext context) throws Exception {

-		log = new LogHelper(this);

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

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 <juan.cadavid@cea.fr> implementation
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode.tests.control;
+
+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.controlmode.tests"; //$NON-NLS-1$
+
+	public static LogHelper log;
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		log = new LogHelper(this);
+		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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/messages.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/messages.properties
index 3f3ee7590b1..ec41dec0418 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/messages.properties
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/messages.properties
@@ -1,7 +1,7 @@
-AbstractControlModeTest_1=The model and submodel are not in different resources

-AbstractUncontrolModelTest_1=The model and submodel do not belong to the same resource after reintegration

-ControlModelTest_4=The handler for control mode is not enabled\!

-ControlModelWithProfileTest_4=The handler for control mode is not enabled\!

-ExistingResourceControlModeTest_5=The handler for control mode is not enabled\!

-UncontrolModelTest_4=The handler for reintegrate model is not enabled\!

-UncontrolModelWithProfileTest_5=The handler for reintegrate model is not enabled\!

+AbstractControlModeTest_1=The model and submodel are not in different resources
+AbstractUncontrolModelTest_1=The model and submodel do not belong to the same resource after reintegration
+ControlModelTest_4=The handler for control mode is not enabled\!
+ControlModelWithProfileTest_4=The handler for control mode is not enabled\!
+ExistingResourceControlModeTest_5=The handler for control mode is not enabled\!
+UncontrolModelTest_4=The handler for reintegrate model is not enabled\!
+UncontrolModelWithProfileTest_5=The handler for reintegrate model is not enabled\!
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.classpath b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.classpath
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.project b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.project
index 7afd1891f3b..45a573fa985 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.project
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.services.edit.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.services.edit.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF
index 71242bbab2f..3dad062669f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui.ide;bundle-version="3.8.0",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;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.services.validation;bundle-version="[3.0.0,4.0.0)",

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

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

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.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.core.log;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.infra.services.edit.tests,

- org.eclipse.papyrus.infra.services.edit.tests.commands,

- org.eclipse.papyrus.infra.services.edit.tests.context,

- org.eclipse.papyrus.infra.services.edit.tests.edit.advice,

- org.eclipse.papyrus.infra.services.edit.tests.edit.helper,

- org.eclipse.papyrus.infra.services.edit.tests.service,

- org.eclipse.papyrus.infra.services.edit.tests.suites,

- org.eclipse.papyrus.infra.services.edit.tests.utils

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;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.services.validation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.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.core.log;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.infra.services.edit.tests,
+ org.eclipse.papyrus.infra.services.edit.tests.commands,
+ org.eclipse.papyrus.infra.services.edit.tests.context,
+ org.eclipse.papyrus.infra.services.edit.tests.edit.advice,
+ org.eclipse.papyrus.infra.services.edit.tests.edit.helper,
+ org.eclipse.papyrus.infra.services.edit.tests.service,
+ org.eclipse.papyrus.infra.services.edit.tests.suites,
+ org.eclipse.papyrus.infra.services.edit.tests.utils
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/about.html b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/about.html
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/build.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/build.properties
index 4e910046ed0..9b250d62559 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/build.properties
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               model/,\

-               plugin.properties

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               model/,\
+               plugin.properties
+src.includes = about.html
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.di
index 67cd21c0e77..9bddb6f752a 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.di
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="ASCII"?>

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

-  <pageList/>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder"/>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList/>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder"/>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.notation
@@ -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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.uml
index d208fdf1a1f..586da2e5473 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/EmptyModel.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_UV0P8EAREeCMpNWxgNcrog" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_UV0P8EAREeCMpNWxgNcrog" name="model"/>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/plugin.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/plugin.properties
index 6c9b87724ec..032b0877eeb 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/plugin.properties
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/plugin.properties
@@ -1,14 +1,14 @@
-#################################################################################

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

-#

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

-pluginName=Papyrus Edit Service Tests

-providerName=Eclipse Modeling Project

+#################################################################################
+# 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.
+#
+##################################################################################
+pluginName=Papyrus Edit Service Tests
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/helper/EPackageEditHelper.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/helper/EPackageEditHelper.java
index 75bc95b3b76..c6a36df03ee 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/helper/EPackageEditHelper.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/helper/EPackageEditHelper.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:

- * 

- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

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

-package org.eclipse.papyrus.infra.services.edit.tests.edit.helper;

-

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

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-

-public class EPackageEditHelper extends AbstractEditHelper {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getConfigureCommand(ConfigureRequest req) {

-		if (req.getParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID) != null) {

-			IConfigureCommandFactory factory = (IConfigureCommandFactory) req.getParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID);

-			return factory.create(req);

-		}

-		return super.getConfigureCommand(req);

-	}

-}

+/*****************************************************************************
+ * 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:
+ * 
+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.tests.edit.helper;
+
+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.ConfigureRequest;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+
+public class EPackageEditHelper extends AbstractEditHelper {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getConfigureCommand(ConfigureRequest req) {
+		if (req.getParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID) != null) {
+			IConfigureCommandFactory factory = (IConfigureCommandFactory) req.getParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID);
+			return factory.create(req);
+		}
+		return super.getConfigureCommand(req);
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/suites/AllTests.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/suites/AllTests.java
index 9127ecd54bd..4da38895fcc 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/suites/AllTests.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/suites/AllTests.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

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

- * 

- *   Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *   Christian W. Damus (CEA) - bug 431618

- *   Christian W. Damus - bug 485220

- *

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

-package org.eclipse.papyrus.infra.services.edit.tests.suites;

-

-import org.eclipse.papyrus.infra.services.edit.tests.commands.TestConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.tests.commands.TestConfigureFeatureListCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.tests.context.TestClientContext;

-import org.eclipse.papyrus.infra.services.edit.tests.edit.advice.MarkerDeletionAdviceTest;

-import org.eclipse.papyrus.infra.services.edit.tests.service.TestElementEditService;

-import org.eclipse.papyrus.infra.services.edit.tests.service.TestElementEditServiceProvider;

-import org.eclipse.papyrus.infra.services.edit.tests.service.TestElementEditServiceProviderFactory;

-import org.eclipse.papyrus.infra.services.edit.tests.service.TestElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.tests.utils.TestGMFCommandUtils;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * Main Test suite.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		TestClientContext.class,

-		TestElementEditService.class,

-		TestElementEditServiceProvider.class,

-		TestElementEditServiceProviderFactory.class,

-		TestElementEditServiceUtils.class,

-		TestGMFCommandUtils.class,

-		TestConfigureFeatureCommandFactory.class,

-		TestConfigureFeatureListCommandFactory.class,

-		MarkerDeletionAdviceTest.class

-})

-public class AllTests {

-

-}

+/*****************************************************************************
+ * 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:
+ * 
+ *   Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 431618
+ *   Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.tests.suites;
+
+import org.eclipse.papyrus.infra.services.edit.tests.commands.TestConfigureFeatureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.tests.commands.TestConfigureFeatureListCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.tests.context.TestClientContext;
+import org.eclipse.papyrus.infra.services.edit.tests.edit.advice.MarkerDeletionAdviceTest;
+import org.eclipse.papyrus.infra.services.edit.tests.service.TestElementEditService;
+import org.eclipse.papyrus.infra.services.edit.tests.service.TestElementEditServiceProvider;
+import org.eclipse.papyrus.infra.services.edit.tests.service.TestElementEditServiceProviderFactory;
+import org.eclipse.papyrus.infra.services.edit.tests.service.TestElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.tests.utils.TestGMFCommandUtils;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Main Test suite.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		TestClientContext.class,
+		TestElementEditService.class,
+		TestElementEditServiceProvider.class,
+		TestElementEditServiceProviderFactory.class,
+		TestElementEditServiceUtils.class,
+		TestGMFCommandUtils.class,
+		TestConfigureFeatureCommandFactory.class,
+		TestConfigureFeatureListCommandFactory.class,
+		MarkerDeletionAdviceTest.class
+})
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF
index 256320bad4d..8895d0eeb50 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

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

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

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.services.edit.tests;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.infra.services.edit.ui.dialogs.tests,

- org.eclipse.papyrus.infra.services.edit.ui.tests

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.ui.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.services.edit.tests;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.infra.services.edit.ui.dialogs.tests,
+ org.eclipse.papyrus.infra.services.edit.ui.tests
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.ui.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.project b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.project
index cd354123765..2f68bcf7221 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.project
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.services.labelprovider.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.services.labelprovider.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF
index 96a8962e9f5..bc8a785340a 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.labelprovider;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.core.log;bundle-version="[1.2.0,2.0.0)",

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

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

- org.eclipse.emf.ecore;bundle-version="2.8.1",

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

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

- org.junit;bundle-version="4.10.0",

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

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

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

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

-Export-Package: org.eclipse.papyrus.infra.services.labelprovider.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.1.qualifier

-Bundle-Name: LabelProvider Service Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.labelprovider.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.services.labelprovider;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.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="2.8.1",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.infra.services.labelprovider.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.1.qualifier
+Bundle-Name: LabelProvider Service Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.labelprovider.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/about.html b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/about.html
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/build.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/build.properties
index e0e105b23b5..e5a949cc43c 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/build.properties
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/org.eclipse.papyrus.infra.services.labelprovider.tests.launch b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/org.eclipse.papyrus.infra.services.labelprovider.tests.launch
index 6e158195170..74c05d7f41d 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/org.eclipse.papyrus.infra.services.labelprovider.tests.launch
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/org.eclipse.papyrus.infra.services.labelprovider.tests.launch
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">

-<listEntry value="=org.eclipse.papyrus.infra.services.labelprovider/src"/>

-</listAttribute>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.services.labelprovider.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx4086m"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">
+<listEntry value="=org.eclipse.papyrus.infra.services.labelprovider/src"/>
+</listAttribute>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.services.labelprovider.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx4086m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/plugin.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/plugin.xml
index f837c3a624f..384b95f1c21 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/plugin.xml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/plugin.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-      <context

-            description="A context for testing EMF Label Provider"

-            id="org.eclipse.papyrus.infra.services.labelprovider.tests.EMFContext">

-      </context>

-      <context

-            description="A context for testing EMF and UML Label Providers"

-            id="org.eclipse.papyrus.infra.services.labelprovider.tests.UMLContext">

-      </context>

-      <labelProvider

-            priority="5"

-            provider="org.eclipse.papyrus.infra.services.labelprovider.tests.providers.EMFLabelProviderTest">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.services.labelprovider.tests.EMFContext">

-         </labelProviderContext>

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.services.labelprovider.tests.UMLContext">

-         </labelProviderContext>

-      </labelProvider>

-      <labelProvider

-            priority="1"

-            provider="org.eclipse.papyrus.infra.services.labelprovider.tests.providers.UMLLabelProviderTest">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.services.labelprovider.tests.UMLContext">

-         </labelProviderContext>

-      </labelProvider>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
+      <context
+            description="A context for testing EMF Label Provider"
+            id="org.eclipse.papyrus.infra.services.labelprovider.tests.EMFContext">
+      </context>
+      <context
+            description="A context for testing EMF and UML Label Providers"
+            id="org.eclipse.papyrus.infra.services.labelprovider.tests.UMLContext">
+      </context>
+      <labelProvider
+            priority="5"
+            provider="org.eclipse.papyrus.infra.services.labelprovider.tests.providers.EMFLabelProviderTest">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.services.labelprovider.tests.EMFContext">
+         </labelProviderContext>
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.services.labelprovider.tests.UMLContext">
+         </labelProviderContext>
+      </labelProvider>
+      <labelProvider
+            priority="1"
+            provider="org.eclipse.papyrus.infra.services.labelprovider.tests.providers.UMLLabelProviderTest">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.services.labelprovider.tests.UMLContext">
+         </labelProviderContext>
+      </labelProvider>
+   </extension>
+
+</plugin>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/Activator.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/Activator.java
index 81a5a2d23ea..f1fa6009885 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/Activator.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/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.tests;

-

-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.tests"; //$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.tests;
+
+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.tests"; //$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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.java
index 1cd41d17d70..a6982fec9c5 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.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.services.labelprovider.tests;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({ LabelProviderServiceTest.class

-

-})

-public class AllTests {

-	//TestSuite

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.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.tests;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({ LabelProviderServiceTest.class
+
+})
+public class AllTests {
+	//TestSuite
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/LabelProviderServiceTest.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/LabelProviderServiceTest.java
index 272c19e97a0..582aa0c83c2 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/LabelProviderServiceTest.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/LabelProviderServiceTest.java
@@ -1,158 +1,158 @@
-/*****************************************************************************

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

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

-package org.eclipse.papyrus.infra.services.labelprovider.tests;

-

-import static org.hamcrest.CoreMatchers.hasItem;

-import static org.hamcrest.MatcherAssert.assertThat;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-

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

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

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

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-

-/**

- * Basic tests on LabelProviderService contributions

- *

- * - Test contexts (scope)

- * - Test priorities

- *

- * @author Camille Letavernier

- *

- */

-public class LabelProviderServiceTest extends AbstractPapyrusTest {

-

-	public static final String TEST_EMF_CONTEXT = "org.eclipse.papyrus.infra.services.labelprovider.tests.EMFContext";

-

-	public static final String TEST_UML_CONTEXT = "org.eclipse.papyrus.infra.services.labelprovider.tests.UMLContext";

-

-	public static final String TEST_INVALID_CONTEXT = "org.eclipse.papyrus.infra.services.labelprovider.tests.InvalidContext";

-

-	public static final String EXPECTED_EMF_VALUE = "Test_label";

-

-	public static final String EXPECTED_UML_VALUE = "Test_testComment";

-

-	private ServicesRegistry registry;

-

-	@Before

-	public void init() {

-		try {

-			registry = new ServicesRegistry();

-			registry.add(LabelProviderService.class, 1, new LabelProviderServiceImpl());

-			registry.startRegistry();

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-			Assert.fail("Cannot instantiate the ServicesRegistry");

-		}

-	}

-

-	@Test

-	public void testDefaultLabelProvider() throws ServiceException {

-		LabelProviderService service = registry.getService(LabelProviderService.class);

-		ILabelProvider generalProvider = service.getLabelProvider();

-

-		// getLabelProvider() and getLabelProvider(DEFAULT_LABEL_PROVIDER) should always return the same label provider

-		Assert.assertNotNull(generalProvider);

-		Assert.assertEquals(generalProvider, service.getLabelProvider(LabelProviderService.DEFAULT_LABEL_PROVIDER));

-

-		// We don't know what the default labelProvider will return, but it shouldn't return the providers from EMF_CONTEXT nor UML_CONTEXT

-		Assert.assertNotSame("The default label provider should not return Test EMF values", EXPECTED_EMF_VALUE, generalProvider.getText(null));

-

-		Comment comment = createTestComment();

-

-		Assert.assertNotSame("The default label provider should not return Test UML values", EXPECTED_UML_VALUE, generalProvider.getText(comment));

-	}

-

-	private Comment createTestComment() {

-		Comment comment = UMLFactory.eINSTANCE.createComment();

-		comment.setBody("testComment");

-		return comment;

-	}

-

-	@Test

-	public void testEMFLabelProvider() throws ServiceException {

-		// This test may fail if a new contribution with a higher priority is defined in Papyrus. Test contributions are defined with priorities 5 and 10

-

-		LabelProviderService service = registry.getService(LabelProviderService.class);

-		ILabelProvider emfProvider = service.getLabelProvider(TEST_EMF_CONTEXT);

-

-		Assert.assertEquals("The EMF Label Provider didn't return the expected value", EXPECTED_EMF_VALUE, emfProvider.getText(null));

-

-		Comment comment = createTestComment();

-

-		Assert.assertEquals("The EMF Label Provider didn't return the expected value", EXPECTED_EMF_VALUE, emfProvider.getText(comment));

-	}

-

-	@Test

-	public void testUMLLabelProvider() throws ServiceException {

-		// This test may fail if a new contribution with a higher priority is defined in Papyrus. Test contributions are defined with priorities 5 and 10

-

-		LabelProviderService service = registry.getService(LabelProviderService.class);

-		ILabelProvider umlProvider = service.getLabelProvider(TEST_UML_CONTEXT);

-

-		Comment comment = createTestComment();

-

-		Assert.assertEquals("The UML Label Provider didn't return the expected value", EXPECTED_UML_VALUE, umlProvider.getText(comment));

-	}

-

-	@Test

-	public void testUMLLabelProviderChangeEvents() throws ServiceException {

-		LabelProviderService service = registry.getService(LabelProviderService.class);

-		// We are not testing the provider registration/priority mechanism, but

-		// the UMLLabelProvider, itself

-		ILabelProvider umlProvider = service.getLabelProvider();

-

-		Comment comment = createTestComment();

-		umlProvider.getText(comment);

-

-		List<Object> updates = new ArrayList<>();

-

-		umlProvider.addListener(event -> {

-			if (event.getSource() == umlProvider) {

-				updates.addAll(Arrays.asList(event.getElements()));

-			}

-		});

-

-		comment.setBody("Hello, world.");

-

-		assertThat("No notification received", updates, hasItem(comment));

-	}

-

-	@Test

-	public void testInvalidContext() throws ServiceException {

-		LabelProviderService service = registry.getService(LabelProviderService.class);

-		ILabelProvider invalidContextProvider = service.getLabelProvider(TEST_INVALID_CONTEXT);

-

-		// The label provider instance is not guaranteed to be equal. We should test and compare a set of values

-		Assert.assertEquals(invalidContextProvider, service.getLabelProvider());

-	}

-

-	@After

-	public void dispose() throws ServiceException {

-		registry.disposeRegistry();

-		registry = null;

-	}

-

-}

+/*****************************************************************************
+ * 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 508629
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.labelprovider.tests;
+
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+/**
+ * Basic tests on LabelProviderService contributions
+ *
+ * - Test contexts (scope)
+ * - Test priorities
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class LabelProviderServiceTest extends AbstractPapyrusTest {
+
+	public static final String TEST_EMF_CONTEXT = "org.eclipse.papyrus.infra.services.labelprovider.tests.EMFContext";
+
+	public static final String TEST_UML_CONTEXT = "org.eclipse.papyrus.infra.services.labelprovider.tests.UMLContext";
+
+	public static final String TEST_INVALID_CONTEXT = "org.eclipse.papyrus.infra.services.labelprovider.tests.InvalidContext";
+
+	public static final String EXPECTED_EMF_VALUE = "Test_label";
+
+	public static final String EXPECTED_UML_VALUE = "Test_testComment";
+
+	private ServicesRegistry registry;
+
+	@Before
+	public void init() {
+		try {
+			registry = new ServicesRegistry();
+			registry.add(LabelProviderService.class, 1, new LabelProviderServiceImpl());
+			registry.startRegistry();
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+			Assert.fail("Cannot instantiate the ServicesRegistry");
+		}
+	}
+
+	@Test
+	public void testDefaultLabelProvider() throws ServiceException {
+		LabelProviderService service = registry.getService(LabelProviderService.class);
+		ILabelProvider generalProvider = service.getLabelProvider();
+
+		// getLabelProvider() and getLabelProvider(DEFAULT_LABEL_PROVIDER) should always return the same label provider
+		Assert.assertNotNull(generalProvider);
+		Assert.assertEquals(generalProvider, service.getLabelProvider(LabelProviderService.DEFAULT_LABEL_PROVIDER));
+
+		// We don't know what the default labelProvider will return, but it shouldn't return the providers from EMF_CONTEXT nor UML_CONTEXT
+		Assert.assertNotSame("The default label provider should not return Test EMF values", EXPECTED_EMF_VALUE, generalProvider.getText(null));
+
+		Comment comment = createTestComment();
+
+		Assert.assertNotSame("The default label provider should not return Test UML values", EXPECTED_UML_VALUE, generalProvider.getText(comment));
+	}
+
+	private Comment createTestComment() {
+		Comment comment = UMLFactory.eINSTANCE.createComment();
+		comment.setBody("testComment");
+		return comment;
+	}
+
+	@Test
+	public void testEMFLabelProvider() throws ServiceException {
+		// This test may fail if a new contribution with a higher priority is defined in Papyrus. Test contributions are defined with priorities 5 and 10
+
+		LabelProviderService service = registry.getService(LabelProviderService.class);
+		ILabelProvider emfProvider = service.getLabelProvider(TEST_EMF_CONTEXT);
+
+		Assert.assertEquals("The EMF Label Provider didn't return the expected value", EXPECTED_EMF_VALUE, emfProvider.getText(null));
+
+		Comment comment = createTestComment();
+
+		Assert.assertEquals("The EMF Label Provider didn't return the expected value", EXPECTED_EMF_VALUE, emfProvider.getText(comment));
+	}
+
+	@Test
+	public void testUMLLabelProvider() throws ServiceException {
+		// This test may fail if a new contribution with a higher priority is defined in Papyrus. Test contributions are defined with priorities 5 and 10
+
+		LabelProviderService service = registry.getService(LabelProviderService.class);
+		ILabelProvider umlProvider = service.getLabelProvider(TEST_UML_CONTEXT);
+
+		Comment comment = createTestComment();
+
+		Assert.assertEquals("The UML Label Provider didn't return the expected value", EXPECTED_UML_VALUE, umlProvider.getText(comment));
+	}
+
+	@Test
+	public void testUMLLabelProviderChangeEvents() throws ServiceException {
+		LabelProviderService service = registry.getService(LabelProviderService.class);
+		// We are not testing the provider registration/priority mechanism, but
+		// the UMLLabelProvider, itself
+		ILabelProvider umlProvider = service.getLabelProvider();
+
+		Comment comment = createTestComment();
+		umlProvider.getText(comment);
+
+		List<Object> updates = new ArrayList<>();
+
+		umlProvider.addListener(event -> {
+			if (event.getSource() == umlProvider) {
+				updates.addAll(Arrays.asList(event.getElements()));
+			}
+		});
+
+		comment.setBody("Hello, world.");
+
+		assertThat("No notification received", updates, hasItem(comment));
+	}
+
+	@Test
+	public void testInvalidContext() throws ServiceException {
+		LabelProviderService service = registry.getService(LabelProviderService.class);
+		ILabelProvider invalidContextProvider = service.getLabelProvider(TEST_INVALID_CONTEXT);
+
+		// The label provider instance is not guaranteed to be equal. We should test and compare a set of values
+		Assert.assertEquals(invalidContextProvider, service.getLabelProvider());
+	}
+
+	@After
+	public void dispose() throws ServiceException {
+		registry.disposeRegistry();
+		registry = null;
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/providers/EMFLabelProviderTest.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/providers/EMFLabelProviderTest.java
index 979af058c9d..be4b3291bde 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/providers/EMFLabelProviderTest.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/providers/EMFLabelProviderTest.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

- * http://www.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.tests.providers;

-

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

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.tests.LabelProviderServiceTest;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * 

- * A basic LabelProvider for testing the TEST_EMF_CONTEXT

- * 

- * @author Camille Letavernier

- * 

- */

-public class EMFLabelProviderTest extends LabelProvider implements IFilteredLabelProvider {

-

-	public boolean accept(Object element) {

-		return true;

-	}

-

-	@Override

-	public String getText(Object element) {

-		return LabelProviderServiceTest.EXPECTED_EMF_VALUE;

-	}

-

-	@Override

-	public Image getImage(Object element) {

-		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.services.labelprovider.tests.providers;
+
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.tests.LabelProviderServiceTest;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * 
+ * A basic LabelProvider for testing the TEST_EMF_CONTEXT
+ * 
+ * @author Camille Letavernier
+ * 
+ */
+public class EMFLabelProviderTest extends LabelProvider implements IFilteredLabelProvider {
+
+	public boolean accept(Object element) {
+		return true;
+	}
+
+	@Override
+	public String getText(Object element) {
+		return LabelProviderServiceTest.EXPECTED_EMF_VALUE;
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		return null;
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/providers/UMLLabelProviderTest.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/providers/UMLLabelProviderTest.java
index df499dc47ce..7dd4be5f0e7 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/providers/UMLLabelProviderTest.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/providers/UMLLabelProviderTest.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

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

-package org.eclipse.papyrus.infra.services.labelprovider.tests.providers;

-

-import org.eclipse.papyrus.uml.tools.providers.UMLFilteredLabelProvider;

-import org.eclipse.uml2.uml.Comment;

-

-

-public class UMLLabelProviderTest extends UMLFilteredLabelProvider {

-

-	@Override

-	public boolean accept(Object element) {

-		return super.accept(element);

-	}

-

-	@Override

-	public String getText(Object element) {

-		if(element instanceof Comment) {

-			return getText((Comment)element);

-		}

-		return super.getText(element);

-	}

-

-	public String getText(Comment comment) {

-		return "Test_" + comment.getBody();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.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.tests.providers;
+
+import org.eclipse.papyrus.uml.tools.providers.UMLFilteredLabelProvider;
+import org.eclipse.uml2.uml.Comment;
+
+
+public class UMLLabelProviderTest extends UMLFilteredLabelProvider {
+
+	@Override
+	public boolean accept(Object element) {
+		return super.accept(element);
+	}
+
+	@Override
+	public String getText(Object element) {
+		if(element instanceof Comment) {
+			return getText((Comment)element);
+		}
+		return super.getText(element);
+	}
+
+	public String getText(Comment comment) {
+		return "Test_" + comment.getBody();
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.classpath b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.classpath
index 046bda900d2..969b4034060 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.classpath
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.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="test"/>

-	<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="test"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.project b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.project
index 62a3598e06b..b6c8497898f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.project
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.services.resourceloading.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.services.resourceloading.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
index 322058f261b..a0e8372a911 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

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

- org.junit;bundle-version="4.10.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",

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

-Export-Package: org.eclipse.papyrus.infra.services.resourceloading.tests,

- org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1,

- org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %fragmentName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.resourceloading.profile;bundle-version="[1.2.0,2.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.services.resourceloading.tests,
+ org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1,
+ org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %fragmentName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/about.html b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/about.html
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/plugin.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/plugin.properties
index cf08034680c..73ad7eb097f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/plugin.properties
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/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:

-#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation

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

-fragmentName=Tests for Resource Loading Plugin

-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:
+#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
+##################################################################################
+fragmentName=Tests for Resource Loading Plugin
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/.project b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/.project
index 60eef8df6e7..c79a29d5281 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/.project
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/.project
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>TestModel1</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-	</buildSpec>

-	<natures>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>TestModel1</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/MyProfile.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/MyProfile.uml
index c3524336a36..3c21c4027de 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/MyProfile.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/MyProfile.uml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_XkGiwB07Ed-QQ4mYkrb7Gg" name="MyProfile">

-  <eAnnotations xmi:id="_G-2QMVEOEd-HP48oAvsvCg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_G-2QMlEOEd-HP48oAvsvCg" name="MyProfile" nsURI="http:///schemas/MyProfile/_G-2QMFEOEd-HP48oAvsvCg/0" nsPrefix="MyProfile">

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_G-2QM1EOEd-HP48oAvsvCg" name="Stereotype1">

-        <eAnnotations xmi:id="_G-2QNFEOEd-HP48oAvsvCg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EFy_cFEOEd-HP48oAvsvCg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_G-2QNVEOEd-HP48oAvsvCg" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_G-2QN1EOEd-HP48oAvsvCg" name="Stereotype2">

-        <eAnnotations xmi:id="_G-2QOFEOEd-HP48oAvsvCg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ESBdlVEOEd-HP48oAvsvCg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_G-2QOVEOEd-HP48oAvsvCg" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:id="_EqUBwFEOEd-HP48oAvsvCg">

-    <eAnnotations xmi:id="_EqUBwVEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">

-      <details xmi:id="_EqUBwlEOEd-HP48oAvsvCg" key="author" value="EPO"/>

-    </eAnnotations>

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-  </elementImport>

-  <packageImport xmi:id="_b3qnYCWuEd62NaW46C6lHg">

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

-  </packageImport>

-  <packageImport xmi:id="_YlKXIB07Ed-QQ4mYkrb7Gg">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_EFy_cFEOEd-HP48oAvsvCg" name="Stereotype1">

-    <eAnnotations xmi:id="_EF8wcFEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">

-      <details xmi:id="_EF8wcVEOEd-HP48oAvsvCg" key="author" value="EPO"/>

-    </eAnnotations>

-    <ownedAttribute xmi:id="_GN-M5VEOEd-HP48oAvsvCg" name="base_Element" association="_GN-M41EOEd-HP48oAvsvCg">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_ESBdlVEOEd-HP48oAvsvCg" name="Stereotype2">

-    <eAnnotations xmi:id="_ESBdllEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">

-      <details xmi:id="_ESBdl1EOEd-HP48oAvsvCg" key="author" value="EPO"/>

-    </eAnnotations>

-    <ownedAttribute xmi:id="_GiGCxlEOEd-HP48oAvsvCg" name="base_Element" association="_GiGCxFEOEd-HP48oAvsvCg">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_GN-M41EOEd-HP48oAvsvCg" name="Element_Stereotype1" memberEnd="_GN-M5FEOEd-HP48oAvsvCg _GN-M5VEOEd-HP48oAvsvCg">

-    <eAnnotations xmi:id="_GN-M5lEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">

-      <details xmi:id="_GN-M51EOEd-HP48oAvsvCg" key="author" value="EPO"/>

-    </eAnnotations>

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_GN-M5FEOEd-HP48oAvsvCg" name="extension_Stereotype1" type="_EFy_cFEOEd-HP48oAvsvCg" aggregation="composite" association="_GN-M41EOEd-HP48oAvsvCg"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_GiGCxFEOEd-HP48oAvsvCg" name="Element_Stereotype2" memberEnd="_GiGCxVEOEd-HP48oAvsvCg _GiGCxlEOEd-HP48oAvsvCg">

-    <eAnnotations xmi:id="_GiPMsFEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">

-      <details xmi:id="_GiPMsVEOEd-HP48oAvsvCg" key="author" value="EPO"/>

-    </eAnnotations>

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_GiGCxVEOEd-HP48oAvsvCg" name="extension_Stereotype2" type="_ESBdlVEOEd-HP48oAvsvCg" aggregation="composite" association="_GiGCxFEOEd-HP48oAvsvCg"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_XkGiwB07Ed-QQ4mYkrb7Gg" name="MyProfile">
+  <eAnnotations xmi:id="_G-2QMVEOEd-HP48oAvsvCg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_G-2QMlEOEd-HP48oAvsvCg" name="MyProfile" nsURI="http:///schemas/MyProfile/_G-2QMFEOEd-HP48oAvsvCg/0" nsPrefix="MyProfile">
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_G-2QM1EOEd-HP48oAvsvCg" name="Stereotype1">
+        <eAnnotations xmi:id="_G-2QNFEOEd-HP48oAvsvCg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_EFy_cFEOEd-HP48oAvsvCg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_G-2QNVEOEd-HP48oAvsvCg" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_G-2QN1EOEd-HP48oAvsvCg" name="Stereotype2">
+        <eAnnotations xmi:id="_G-2QOFEOEd-HP48oAvsvCg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ESBdlVEOEd-HP48oAvsvCg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_G-2QOVEOEd-HP48oAvsvCg" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:id="_EqUBwFEOEd-HP48oAvsvCg">
+    <eAnnotations xmi:id="_EqUBwVEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">
+      <details xmi:id="_EqUBwlEOEd-HP48oAvsvCg" key="author" value="EPO"/>
+    </eAnnotations>
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+  </elementImport>
+  <packageImport xmi:id="_b3qnYCWuEd62NaW46C6lHg">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:id="_YlKXIB07Ed-QQ4mYkrb7Gg">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_EFy_cFEOEd-HP48oAvsvCg" name="Stereotype1">
+    <eAnnotations xmi:id="_EF8wcFEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">
+      <details xmi:id="_EF8wcVEOEd-HP48oAvsvCg" key="author" value="EPO"/>
+    </eAnnotations>
+    <ownedAttribute xmi:id="_GN-M5VEOEd-HP48oAvsvCg" name="base_Element" association="_GN-M41EOEd-HP48oAvsvCg">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_ESBdlVEOEd-HP48oAvsvCg" name="Stereotype2">
+    <eAnnotations xmi:id="_ESBdllEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">
+      <details xmi:id="_ESBdl1EOEd-HP48oAvsvCg" key="author" value="EPO"/>
+    </eAnnotations>
+    <ownedAttribute xmi:id="_GiGCxlEOEd-HP48oAvsvCg" name="base_Element" association="_GiGCxFEOEd-HP48oAvsvCg">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_GN-M41EOEd-HP48oAvsvCg" name="Element_Stereotype1" memberEnd="_GN-M5FEOEd-HP48oAvsvCg _GN-M5VEOEd-HP48oAvsvCg">
+    <eAnnotations xmi:id="_GN-M5lEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">
+      <details xmi:id="_GN-M51EOEd-HP48oAvsvCg" key="author" value="EPO"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_GN-M5FEOEd-HP48oAvsvCg" name="extension_Stereotype1" type="_EFy_cFEOEd-HP48oAvsvCg" aggregation="composite" association="_GN-M41EOEd-HP48oAvsvCg"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_GiGCxFEOEd-HP48oAvsvCg" name="Element_Stereotype2" memberEnd="_GiGCxVEOEd-HP48oAvsvCg _GiGCxlEOEd-HP48oAvsvCg">
+    <eAnnotations xmi:id="_GiPMsFEOEd-HP48oAvsvCg" source="http://www.topcased.org/author">
+      <details xmi:id="_GiPMsVEOEd-HP48oAvsvCg" key="author" value="EPO"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_GiGCxVEOEd-HP48oAvsvCg" name="extension_Stereotype2" type="_ESBdlVEOEd-HP48oAvsvCg" aggregation="composite" association="_GiGCxFEOEd-HP48oAvsvCg"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.di
index e35f85b923b..57f2701ec3c 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.di
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="ASCII"?>

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

-  <di:SashWindowsMngr xmi:id="_86UgUX04Ed-RG-XtCG9Nmw">

-    <pageList xmi:id="_86UgUn04Ed-RG-XtCG9Nmw">

-      <availablePage xmi:id="_86UgU304Ed-RG-XtCG9Nmw">

-        <emfPageIdentifier href="Package0.notation#_mvutcH04Ed-RG-XtCG9Nmw"/>

-      </availablePage>

-      <availablePage xmi:id="_86UgVH04Ed-RG-XtCG9Nmw">

-        <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>

-      </availablePage>

-    </pageList>

-    <sashModel xmi:id="_86UgVX04Ed-RG-XtCG9Nmw" currentSelection="_86UgV304Ed-RG-XtCG9Nmw">

-      <windows xmi:id="_86UgVn04Ed-RG-XtCG9Nmw">

-        <children xsi:type="di:TabFolder" xmi:id="_86UgV304Ed-RG-XtCG9Nmw">

-          <children xmi:id="_86UgWH04Ed-RG-XtCG9Nmw">

-            <emfPageIdentifier href="Package0.notation#_mvutcH04Ed-RG-XtCG9Nmw"/>

-          </children>

-          <children xmi:id="_86UgWX04Ed-RG-XtCG9Nmw">

-            <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  <history:ControledResource xmi:id="__QYYwH04Ed-RG-XtCG9Nmw"/>

-  <history:ControledResource xmi:id="_BUQVAH05Ed-RG-XtCG9Nmw" resourceURL="Package0.uml">

-    <children xmi:id="_bEw7wIQ2Ed-SDs-So_GGkw" resourceURL="Package1.uml"/>

-  </history:ControledResource>

-  <history:ControledResource xmi:id="_BUQVAX05Ed-RG-XtCG9Nmw" resourceURL="Package0.notation">

-    <children xmi:id="_bFWxoIQ2Ed-SDs-So_GGkw" resourceURL="Package1.notation"/>

-  </history:ControledResource>

-  <history:ControledResource xmi:id="_ANHIYIQsEd-SDs-So_GGkw"/>

-  <history:ControledResource xmi:id="_ZVAOUIQ2Ed-SDs-So_GGkw"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode">
+  <di:SashWindowsMngr xmi:id="_86UgUX04Ed-RG-XtCG9Nmw">
+    <pageList xmi:id="_86UgUn04Ed-RG-XtCG9Nmw">
+      <availablePage xmi:id="_86UgU304Ed-RG-XtCG9Nmw">
+        <emfPageIdentifier href="Package0.notation#_mvutcH04Ed-RG-XtCG9Nmw"/>
+      </availablePage>
+      <availablePage xmi:id="_86UgVH04Ed-RG-XtCG9Nmw">
+        <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>
+      </availablePage>
+    </pageList>
+    <sashModel xmi:id="_86UgVX04Ed-RG-XtCG9Nmw" currentSelection="_86UgV304Ed-RG-XtCG9Nmw">
+      <windows xmi:id="_86UgVn04Ed-RG-XtCG9Nmw">
+        <children xsi:type="di:TabFolder" xmi:id="_86UgV304Ed-RG-XtCG9Nmw">
+          <children xmi:id="_86UgWH04Ed-RG-XtCG9Nmw">
+            <emfPageIdentifier href="Package0.notation#_mvutcH04Ed-RG-XtCG9Nmw"/>
+          </children>
+          <children xmi:id="_86UgWX04Ed-RG-XtCG9Nmw">
+            <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <history:ControledResource xmi:id="__QYYwH04Ed-RG-XtCG9Nmw"/>
+  <history:ControledResource xmi:id="_BUQVAH05Ed-RG-XtCG9Nmw" resourceURL="Package0.uml">
+    <children xmi:id="_bEw7wIQ2Ed-SDs-So_GGkw" resourceURL="Package1.uml"/>
+  </history:ControledResource>
+  <history:ControledResource xmi:id="_BUQVAX05Ed-RG-XtCG9Nmw" resourceURL="Package0.notation">
+    <children xmi:id="_bFWxoIQ2Ed-SDs-So_GGkw" resourceURL="Package1.notation"/>
+  </history:ControledResource>
+  <history:ControledResource xmi:id="_ANHIYIQsEd-SDs-So_GGkw"/>
+  <history:ControledResource xmi:id="_ZVAOUIQ2Ed-SDs-So_GGkw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.notation
index 372817a8170..04e5618fdf7 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.notation
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_mvutcH04Ed-RG-XtCG9Nmw" type="PapyrusUMLClassDiagram" name="Diagram0" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_nQhGUX04Ed-RG-XtCG9Nmw" type="2008" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nQhGVH04Ed-RG-XtCG9Nmw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nQhGVX04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nQhGVn04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nQhGV304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nQhGWH04Ed-RG-XtCG9Nmw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nQhGWX04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_nQhGWn04Ed-RG-XtCG9Nmw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_nQhGW304Ed-RG-XtCG9Nmw" type="7017">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_nQhGXH04Ed-RG-XtCG9Nmw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nQhGXX04Ed-RG-XtCG9Nmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQhGXn04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_nQhGX304Ed-RG-XtCG9Nmw" type="7018">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_nQhGYH04Ed-RG-XtCG9Nmw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nQhGYX04Ed-RG-XtCG9Nmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQhGYn04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_nQhGY304Ed-RG-XtCG9Nmw" type="7019">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_nQhGZH04Ed-RG-XtCG9Nmw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nQhGZX04Ed-RG-XtCG9Nmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQhGZn04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_nQhGUn04Ed-RG-XtCG9Nmw"/>

-    <element xmi:type="uml:Class" href="Package0.uml#_nQhGUH04Ed-RG-XtCG9Nmw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQhGU304Ed-RG-XtCG9Nmw" x="438" y="92"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_n29bQH04Ed-RG-XtCG9Nmw" type="2007" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_n29bQ304Ed-RG-XtCG9Nmw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n29bRH04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_n29bRX04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n29bRn04Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_n29bR304Ed-RG-XtCG9Nmw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n29bSH04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_n29bSX04Ed-RG-XtCG9Nmw" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_n29bSn04Ed-RG-XtCG9Nmw" type="7016">

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n29bS304Ed-RG-XtCG9Nmw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_n29bQX04Ed-RG-XtCG9Nmw"/>

-    <element xmi:type="uml:Package" href="Package1.uml#_n20RUH04Ed-RG-XtCG9Nmw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n29bQn04Ed-RG-XtCG9Nmw" x="327" y="274"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_mvutcX04Ed-RG-XtCG9Nmw"/>

-  <element xmi:type="uml:Package" href="Package0.uml#_SvAKEH04Ed-RG-XtCG9Nmw"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_mvutcH04Ed-RG-XtCG9Nmw" type="PapyrusUMLClassDiagram" name="Diagram0" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_nQhGUX04Ed-RG-XtCG9Nmw" type="2008" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nQhGVH04Ed-RG-XtCG9Nmw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nQhGVX04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nQhGVn04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nQhGV304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nQhGWH04Ed-RG-XtCG9Nmw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nQhGWX04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_nQhGWn04Ed-RG-XtCG9Nmw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_nQhGW304Ed-RG-XtCG9Nmw" type="7017">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_nQhGXH04Ed-RG-XtCG9Nmw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_nQhGXX04Ed-RG-XtCG9Nmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQhGXn04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_nQhGX304Ed-RG-XtCG9Nmw" type="7018">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_nQhGYH04Ed-RG-XtCG9Nmw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_nQhGYX04Ed-RG-XtCG9Nmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQhGYn04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_nQhGY304Ed-RG-XtCG9Nmw" type="7019">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_nQhGZH04Ed-RG-XtCG9Nmw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_nQhGZX04Ed-RG-XtCG9Nmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQhGZn04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_nQhGUn04Ed-RG-XtCG9Nmw"/>
+    <element xmi:type="uml:Class" href="Package0.uml#_nQhGUH04Ed-RG-XtCG9Nmw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nQhGU304Ed-RG-XtCG9Nmw" x="438" y="92"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_n29bQH04Ed-RG-XtCG9Nmw" type="2007" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_n29bQ304Ed-RG-XtCG9Nmw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n29bRH04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_n29bRX04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n29bRn04Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_n29bR304Ed-RG-XtCG9Nmw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n29bSH04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_n29bSX04Ed-RG-XtCG9Nmw" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_n29bSn04Ed-RG-XtCG9Nmw" type="7016">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n29bS304Ed-RG-XtCG9Nmw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_n29bQX04Ed-RG-XtCG9Nmw"/>
+    <element xmi:type="uml:Package" href="Package1.uml#_n20RUH04Ed-RG-XtCG9Nmw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n29bQn04Ed-RG-XtCG9Nmw" x="327" y="274"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_mvutcX04Ed-RG-XtCG9Nmw"/>
+  <element xmi:type="uml:Package" href="Package0.uml#_SvAKEH04Ed-RG-XtCG9Nmw"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.uml
index a2ead3dc006..3ea7ee6b14e 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package0.uml
@@ -1,20 +1,20 @@
-<?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:Package xmi:id="_SvAKEH04Ed-RG-XtCG9Nmw" name="Package0">

-    <packagedElement xmi:type="uml:Class" xmi:id="_nQhGUH04Ed-RG-XtCG9Nmw" name="Class1"/>

-    <packagedElement xmi:type="uml:Package" href="Package1.uml#_n20RUH04Ed-RG-XtCG9Nmw"/>

-    <profileApplication xmi:id="_83DJ4H04Ed-RG-XtCG9Nmw">

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

-        <references xmi:type="ecore:EPackage" href="MyProfile.uml#_G-2QMlEOEd-HP48oAvsvCg"/>

-      </eAnnotations>

-      <appliedProfile href="MyProfile.uml#_XkGiwB07Ed-QQ4mYkrb7Gg"/>

-    </profileApplication>

-    <profileApplication xmi:id="_84Pcsn04Ed-RG-XtCG9Nmw">

-      <eAnnotations xmi:id="_85k5cH04Ed-RG-XtCG9Nmw" 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:Package>

-  <Ecore:EClass xmi:id="_xcvpwH04Ed-RG-XtCG9Nmw" base_Class="_nQhGUH04Ed-RG-XtCG9Nmw"/>

-</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:Package xmi:id="_SvAKEH04Ed-RG-XtCG9Nmw" name="Package0">
+    <packagedElement xmi:type="uml:Class" xmi:id="_nQhGUH04Ed-RG-XtCG9Nmw" name="Class1"/>
+    <packagedElement xmi:type="uml:Package" href="Package1.uml#_n20RUH04Ed-RG-XtCG9Nmw"/>
+    <profileApplication xmi:id="_83DJ4H04Ed-RG-XtCG9Nmw">
+      <eAnnotations xmi:id="_84PcsH04Ed-RG-XtCG9Nmw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="MyProfile.uml#_G-2QMlEOEd-HP48oAvsvCg"/>
+      </eAnnotations>
+      <appliedProfile href="MyProfile.uml#_XkGiwB07Ed-QQ4mYkrb7Gg"/>
+    </profileApplication>
+    <profileApplication xmi:id="_84Pcsn04Ed-RG-XtCG9Nmw">
+      <eAnnotations xmi:id="_85k5cH04Ed-RG-XtCG9Nmw" 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:Package>
+  <Ecore:EClass xmi:id="_xcvpwH04Ed-RG-XtCG9Nmw" base_Class="_nQhGUH04Ed-RG-XtCG9Nmw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.di
index ddfa664795e..242e8c51a11 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

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

-  <pageList xmi:id="_bFWxooQ2Ed-SDs-So_GGkw">

-    <availablePage xmi:id="_bFWxo4Q2Ed-SDs-So_GGkw">

-      <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>

-    </availablePage>

-  </pageList>

-  <sashModel xmi:id="_bFWxpIQ2Ed-SDs-So_GGkw" currentSelection="_bFWxpoQ2Ed-SDs-So_GGkw">

-    <windows xmi:id="_bFWxpYQ2Ed-SDs-So_GGkw">

-      <children xsi:type="di:TabFolder" xmi:id="_bFWxpoQ2Ed-SDs-So_GGkw">

-        <children xmi:id="_bFWxp4Q2Ed-SDs-So_GGkw">

-          <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_bFWxoYQ2Ed-SDs-So_GGkw">
+  <pageList xmi:id="_bFWxooQ2Ed-SDs-So_GGkw">
+    <availablePage xmi:id="_bFWxo4Q2Ed-SDs-So_GGkw">
+      <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>
+    </availablePage>
+  </pageList>
+  <sashModel xmi:id="_bFWxpIQ2Ed-SDs-So_GGkw" currentSelection="_bFWxpoQ2Ed-SDs-So_GGkw">
+    <windows xmi:id="_bFWxpYQ2Ed-SDs-So_GGkw">
+      <children xsi:type="di:TabFolder" xmi:id="_bFWxpoQ2Ed-SDs-So_GGkw">
+        <children xmi:id="_bFWxp4Q2Ed-SDs-So_GGkw">
+          <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.notation
index 109887dc0ac..419271f6b35 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.notation
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_r1npMH04Ed-RG-XtCG9Nmw" type="PapyrusUMLClassDiagram" name="Diagram1" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_sRMK4H04Ed-RG-XtCG9Nmw" type="2008" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sRV74H04Ed-RG-XtCG9Nmw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sRV74X04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sRV74n04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sRV74304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sRV75H04Ed-RG-XtCG9Nmw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sRV75X04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_sRV75n04Ed-RG-XtCG9Nmw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_sRV75304Ed-RG-XtCG9Nmw" type="7017">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_sRV76H04Ed-RG-XtCG9Nmw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_sRV76X04Ed-RG-XtCG9Nmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sRV76n04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_sRV76304Ed-RG-XtCG9Nmw" type="7018">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_sRV77H04Ed-RG-XtCG9Nmw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_sRV77X04Ed-RG-XtCG9Nmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sRV77n04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_sRV77304Ed-RG-XtCG9Nmw" type="7019">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_sRV78H04Ed-RG-XtCG9Nmw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_sRV78X04Ed-RG-XtCG9Nmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sRV78n04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_sRMK4X04Ed-RG-XtCG9Nmw"/>

-    <element xmi:type="uml:Class" href="Package1.uml#_sRCZ4H04Ed-RG-XtCG9Nmw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sRMK4n04Ed-RG-XtCG9Nmw" x="463" y="177"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_tHbPUX04Ed-RG-XtCG9Nmw" type="2007" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tHlAUH04Ed-RG-XtCG9Nmw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tHlAUX04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tHlAUn04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tHlAU304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tHlAVH04Ed-RG-XtCG9Nmw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tHlAVX04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_tHlAVn04Ed-RG-XtCG9Nmw" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_tHlAV304Ed-RG-XtCG9Nmw" type="7016">

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tHlAWH04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_tHbPUn04Ed-RG-XtCG9Nmw"/>

-    <element xmi:type="uml:Package" href="Package1.uml#_tHbPUH04Ed-RG-XtCG9Nmw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tHbPU304Ed-RG-XtCG9Nmw" x="436" y="312"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_r1npMX04Ed-RG-XtCG9Nmw"/>

-  <element xmi:type="uml:Package" href="Package1.uml#_n20RUH04Ed-RG-XtCG9Nmw"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_r1npMH04Ed-RG-XtCG9Nmw" type="PapyrusUMLClassDiagram" name="Diagram1" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_sRMK4H04Ed-RG-XtCG9Nmw" type="2008" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sRV74H04Ed-RG-XtCG9Nmw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sRV74X04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sRV74n04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sRV74304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sRV75H04Ed-RG-XtCG9Nmw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sRV75X04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_sRV75n04Ed-RG-XtCG9Nmw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_sRV75304Ed-RG-XtCG9Nmw" type="7017">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_sRV76H04Ed-RG-XtCG9Nmw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_sRV76X04Ed-RG-XtCG9Nmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sRV76n04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_sRV76304Ed-RG-XtCG9Nmw" type="7018">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_sRV77H04Ed-RG-XtCG9Nmw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_sRV77X04Ed-RG-XtCG9Nmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sRV77n04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_sRV77304Ed-RG-XtCG9Nmw" type="7019">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_sRV78H04Ed-RG-XtCG9Nmw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_sRV78X04Ed-RG-XtCG9Nmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sRV78n04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_sRMK4X04Ed-RG-XtCG9Nmw"/>
+    <element xmi:type="uml:Class" href="Package1.uml#_sRCZ4H04Ed-RG-XtCG9Nmw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sRMK4n04Ed-RG-XtCG9Nmw" x="463" y="177"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_tHbPUX04Ed-RG-XtCG9Nmw" type="2007" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tHlAUH04Ed-RG-XtCG9Nmw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tHlAUX04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tHlAUn04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tHlAU304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tHlAVH04Ed-RG-XtCG9Nmw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tHlAVX04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_tHlAVn04Ed-RG-XtCG9Nmw" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_tHlAV304Ed-RG-XtCG9Nmw" type="7016">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tHlAWH04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_tHbPUn04Ed-RG-XtCG9Nmw"/>
+    <element xmi:type="uml:Package" href="Package1.uml#_tHbPUH04Ed-RG-XtCG9Nmw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tHbPU304Ed-RG-XtCG9Nmw" x="436" y="312"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r1npMX04Ed-RG-XtCG9Nmw"/>
+  <element xmi:type="uml:Package" href="Package1.uml#_n20RUH04Ed-RG-XtCG9Nmw"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.uml
index 6431ba3eaf2..c366537ff0a 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/Package1.uml
@@ -1,20 +1,20 @@
-<?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:MyProfile="http:///schemas/MyProfile/_G-2QMFEOEd-HP48oAvsvCg/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http:///schemas/MyProfile/_G-2QMFEOEd-HP48oAvsvCg/0 MyProfile.uml#_G-2QMlEOEd-HP48oAvsvCg">

-  <uml:Package xmi:id="_n20RUH04Ed-RG-XtCG9Nmw" name="Package1">

-    <packagedElement xmi:type="uml:Class" xmi:id="_sRCZ4H04Ed-RG-XtCG9Nmw" name="Class2"/>

-    <packagedElement xmi:type="uml:Package" xmi:id="_tHbPUH04Ed-RG-XtCG9Nmw" name="Package2"/>

-    <profileApplication xmi:id="_a96F0IQ2Ed-SDs-So_GGkw">

-      <eAnnotations xmi:id="_bBe-QIQ2Ed-SDs-So_GGkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="MyProfile.uml#_G-2QMlEOEd-HP48oAvsvCg"/>

-      </eAnnotations>

-      <appliedProfile href="MyProfile.uml#_XkGiwB07Ed-QQ4mYkrb7Gg"/>

-    </profileApplication>

-    <profileApplication xmi:id="_bBovQYQ2Ed-SDs-So_GGkw">

-      <eAnnotations xmi:id="_bEnKwIQ2Ed-SDs-So_GGkw" 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:Package>

-  <MyProfile:Stereotype1 xmi:id="_zAIIEH04Ed-RG-XtCG9Nmw" base_Element="_sRCZ4H04Ed-RG-XtCG9Nmw"/>

-</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:MyProfile="http:///schemas/MyProfile/_G-2QMFEOEd-HP48oAvsvCg/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http:///schemas/MyProfile/_G-2QMFEOEd-HP48oAvsvCg/0 MyProfile.uml#_G-2QMlEOEd-HP48oAvsvCg">
+  <uml:Package xmi:id="_n20RUH04Ed-RG-XtCG9Nmw" name="Package1">
+    <packagedElement xmi:type="uml:Class" xmi:id="_sRCZ4H04Ed-RG-XtCG9Nmw" name="Class2"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_tHbPUH04Ed-RG-XtCG9Nmw" name="Package2"/>
+    <profileApplication xmi:id="_a96F0IQ2Ed-SDs-So_GGkw">
+      <eAnnotations xmi:id="_bBe-QIQ2Ed-SDs-So_GGkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="MyProfile.uml#_G-2QMlEOEd-HP48oAvsvCg"/>
+      </eAnnotations>
+      <appliedProfile href="MyProfile.uml#_XkGiwB07Ed-QQ4mYkrb7Gg"/>
+    </profileApplication>
+    <profileApplication xmi:id="_bBovQYQ2Ed-SDs-So_GGkw">
+      <eAnnotations xmi:id="_bEnKwIQ2Ed-SDs-So_GGkw" 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:Package>
+  <MyProfile:Stereotype1 xmi:id="_zAIIEH04Ed-RG-XtCG9Nmw" base_Element="_sRCZ4H04Ed-RG-XtCG9Nmw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.di
index 68d5842e5b9..d430da092ba 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.di
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="ASCII"?>

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

-  <di:SashWindowsMngr xmi:id="_QtEHgn04Ed-RG-XtCG9Nmw">

-    <pageList xmi:id="_QtEHg304Ed-RG-XtCG9Nmw">

-      <availablePage xmi:id="_QtN4gH04Ed-RG-XtCG9Nmw">

-        <emfPageIdentifier href="model1.notation#_QtEHgH04Ed-RG-XtCG9Nmw"/>

-      </availablePage>

-      <availablePage xmi:id="_mvutcn04Ed-RG-XtCG9Nmw">

-        <emfPageIdentifier href="Package0.notation#_mvutcH04Ed-RG-XtCG9Nmw"/>

-      </availablePage>

-      <availablePage xmi:id="_r1npMn04Ed-RG-XtCG9Nmw">

-        <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>

-      </availablePage>

-    </pageList>

-    <sashModel xmi:id="_QtEHhH04Ed-RG-XtCG9Nmw" currentSelection="_QtEHhn04Ed-RG-XtCG9Nmw">

-      <windows xmi:id="_QtEHhX04Ed-RG-XtCG9Nmw">

-        <children xsi:type="di:TabFolder" xmi:id="_QtEHhn04Ed-RG-XtCG9Nmw">

-          <children xmi:id="_QtN4gX04Ed-RG-XtCG9Nmw">

-            <emfPageIdentifier href="model1.notation#_QtEHgH04Ed-RG-XtCG9Nmw"/>

-          </children>

-          <children xmi:id="_mvutc304Ed-RG-XtCG9Nmw">

-            <emfPageIdentifier href="Package0.notation#_mvutcH04Ed-RG-XtCG9Nmw"/>

-          </children>

-          <children xmi:id="_sNYCgIQ2Ed-SDs-So_GGkw">

-            <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  <history:ControledResource xmi:id="_Qx1SwH04Ed-RG-XtCG9Nmw"/>

-  <history:ControledResource xmi:id="_8wMT8H04Ed-RG-XtCG9Nmw" resourceURL="model1.uml">

-    <children xmi:id="_854bcH04Ed-RG-XtCG9Nmw" resourceURL="Package0.uml"/>

-  </history:ControledResource>

-  <history:ControledResource xmi:id="_8wMT8X04Ed-RG-XtCG9Nmw" resourceURL="model1.notation">

-    <children xmi:id="_86UgUH04Ed-RG-XtCG9Nmw" resourceURL="Package0.notation"/>

-  </history:ControledResource>

-  <history:ControledResource xmi:id="__bxZUH1MEd-sWfJzbji7dg"/>

-  <history:ControledResource xmi:id="_V5d9kIQgEd-jzeHkjcT5dg"/>

-  <history:ControledResource xmi:id="_MpBPcIQsEd-SDs-So_GGkw"/>

-  <history:ControledResource xmi:id="_dAlvQIQ2Ed-SDs-So_GGkw"/>

-  <history:ControledResource xmi:id="_qyL24IQ2Ed-SDs-So_GGkw"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode">
+  <di:SashWindowsMngr xmi:id="_QtEHgn04Ed-RG-XtCG9Nmw">
+    <pageList xmi:id="_QtEHg304Ed-RG-XtCG9Nmw">
+      <availablePage xmi:id="_QtN4gH04Ed-RG-XtCG9Nmw">
+        <emfPageIdentifier href="model1.notation#_QtEHgH04Ed-RG-XtCG9Nmw"/>
+      </availablePage>
+      <availablePage xmi:id="_mvutcn04Ed-RG-XtCG9Nmw">
+        <emfPageIdentifier href="Package0.notation#_mvutcH04Ed-RG-XtCG9Nmw"/>
+      </availablePage>
+      <availablePage xmi:id="_r1npMn04Ed-RG-XtCG9Nmw">
+        <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>
+      </availablePage>
+    </pageList>
+    <sashModel xmi:id="_QtEHhH04Ed-RG-XtCG9Nmw" currentSelection="_QtEHhn04Ed-RG-XtCG9Nmw">
+      <windows xmi:id="_QtEHhX04Ed-RG-XtCG9Nmw">
+        <children xsi:type="di:TabFolder" xmi:id="_QtEHhn04Ed-RG-XtCG9Nmw">
+          <children xmi:id="_QtN4gX04Ed-RG-XtCG9Nmw">
+            <emfPageIdentifier href="model1.notation#_QtEHgH04Ed-RG-XtCG9Nmw"/>
+          </children>
+          <children xmi:id="_mvutc304Ed-RG-XtCG9Nmw">
+            <emfPageIdentifier href="Package0.notation#_mvutcH04Ed-RG-XtCG9Nmw"/>
+          </children>
+          <children xmi:id="_sNYCgIQ2Ed-SDs-So_GGkw">
+            <emfPageIdentifier href="Package1.notation#_r1npMH04Ed-RG-XtCG9Nmw"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <history:ControledResource xmi:id="_Qx1SwH04Ed-RG-XtCG9Nmw"/>
+  <history:ControledResource xmi:id="_8wMT8H04Ed-RG-XtCG9Nmw" resourceURL="model1.uml">
+    <children xmi:id="_854bcH04Ed-RG-XtCG9Nmw" resourceURL="Package0.uml"/>
+  </history:ControledResource>
+  <history:ControledResource xmi:id="_8wMT8X04Ed-RG-XtCG9Nmw" resourceURL="model1.notation">
+    <children xmi:id="_86UgUH04Ed-RG-XtCG9Nmw" resourceURL="Package0.notation"/>
+  </history:ControledResource>
+  <history:ControledResource xmi:id="__bxZUH1MEd-sWfJzbji7dg"/>
+  <history:ControledResource xmi:id="_V5d9kIQgEd-jzeHkjcT5dg"/>
+  <history:ControledResource xmi:id="_MpBPcIQsEd-SDs-So_GGkw"/>
+  <history:ControledResource xmi:id="_dAlvQIQ2Ed-SDs-So_GGkw"/>
+  <history:ControledResource xmi:id="_qyL24IQ2Ed-SDs-So_GGkw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.notation
index 3a28d25c9e9..4b7fdef4a51 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.notation
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_QtEHgH04Ed-RG-XtCG9Nmw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_SEPV0H04Ed-RG-XtCG9Nmw" type="2008" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SEYfwH04Ed-RG-XtCG9Nmw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SEYfwX04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SEYfwn04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SEYfw304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SEYfxH04Ed-RG-XtCG9Nmw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SEYfxX04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_SEYfxn04Ed-RG-XtCG9Nmw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_SEYfx304Ed-RG-XtCG9Nmw" type="7017">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_SEYfyH04Ed-RG-XtCG9Nmw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SEYfyX04Ed-RG-XtCG9Nmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SEYfyn04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_SEYfy304Ed-RG-XtCG9Nmw" type="7018">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_SEYfzH04Ed-RG-XtCG9Nmw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SEYfzX04Ed-RG-XtCG9Nmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SEYfzn04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_SEYfz304Ed-RG-XtCG9Nmw" type="7019">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_SEYf0H04Ed-RG-XtCG9Nmw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SEYf0X04Ed-RG-XtCG9Nmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SEYf0n04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_SEPV0X04Ed-RG-XtCG9Nmw"/>

-    <element xmi:type="uml:Class" href="model1.uml#_SEFk0H04Ed-RG-XtCG9Nmw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SEPV0n04Ed-RG-XtCG9Nmw" x="370" y="93"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_SvAKEX04Ed-RG-XtCG9Nmw" type="2007" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SvAKFH04Ed-RG-XtCG9Nmw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SvAKFX04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SvAKFn04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SvAKF304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SvAKGH04Ed-RG-XtCG9Nmw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SvAKGX04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_SvAKGn04Ed-RG-XtCG9Nmw" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_SvAKG304Ed-RG-XtCG9Nmw" type="7016">

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SvAKHH04Ed-RG-XtCG9Nmw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_SvAKEn04Ed-RG-XtCG9Nmw"/>

-    <element xmi:type="uml:Package" href="Package0.uml#_SvAKEH04Ed-RG-XtCG9Nmw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SvAKE304Ed-RG-XtCG9Nmw" x="198" y="180"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_O5tfsIQsEd-SDs-So_GGkw" type="2008" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O5tfs4QsEd-SDs-So_GGkw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O5tftIQsEd-SDs-So_GGkw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O5tftYQsEd-SDs-So_GGkw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O5tftoQsEd-SDs-So_GGkw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O5tft4QsEd-SDs-So_GGkw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O5tfuIQsEd-SDs-So_GGkw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_O5tfuYQsEd-SDs-So_GGkw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_O5tfuoQsEd-SDs-So_GGkw" type="7017">

-      <children xmi:type="notation:Shape" xmi:id="_RIK7UIQsEd-SDs-So_GGkw" type="3012" fontHeight="8" lineColor="0">

-        <element xmi:type="uml:Property" href="model1.uml#_RHuPYIQsEd-SDs-So_GGkw"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_RIK7UYQsEd-SDs-So_GGkw"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_O5tfu4QsEd-SDs-So_GGkw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_O5tfvIQsEd-SDs-So_GGkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5tfvYQsEd-SDs-So_GGkw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_O5tfvoQsEd-SDs-So_GGkw" type="7018">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_O5tfv4QsEd-SDs-So_GGkw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_O5tfwIQsEd-SDs-So_GGkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5tfwYQsEd-SDs-So_GGkw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_O5tfwoQsEd-SDs-So_GGkw" type="7019">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_O5tfw4QsEd-SDs-So_GGkw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_O5tfxIQsEd-SDs-So_GGkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5tfxYQsEd-SDs-So_GGkw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_O5tfsYQsEd-SDs-So_GGkw"/>

-    <element xmi:type="uml:Class" href="model1.uml#_O40u4IQsEd-SDs-So_GGkw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5tfsoQsEd-SDs-So_GGkw" x="209" y="382" width="153"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_QtEHgX04Ed-RG-XtCG9Nmw"/>

-  <element xmi:type="uml:Model" href="model1.uml#_QsxMkH04Ed-RG-XtCG9Nmw"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_QtEHgH04Ed-RG-XtCG9Nmw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_SEPV0H04Ed-RG-XtCG9Nmw" type="2008" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SEYfwH04Ed-RG-XtCG9Nmw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SEYfwX04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SEYfwn04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SEYfw304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SEYfxH04Ed-RG-XtCG9Nmw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SEYfxX04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_SEYfxn04Ed-RG-XtCG9Nmw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SEYfx304Ed-RG-XtCG9Nmw" type="7017">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SEYfyH04Ed-RG-XtCG9Nmw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SEYfyX04Ed-RG-XtCG9Nmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SEYfyn04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SEYfy304Ed-RG-XtCG9Nmw" type="7018">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SEYfzH04Ed-RG-XtCG9Nmw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SEYfzX04Ed-RG-XtCG9Nmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SEYfzn04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SEYfz304Ed-RG-XtCG9Nmw" type="7019">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SEYf0H04Ed-RG-XtCG9Nmw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SEYf0X04Ed-RG-XtCG9Nmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SEYf0n04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_SEPV0X04Ed-RG-XtCG9Nmw"/>
+    <element xmi:type="uml:Class" href="model1.uml#_SEFk0H04Ed-RG-XtCG9Nmw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SEPV0n04Ed-RG-XtCG9Nmw" x="370" y="93"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_SvAKEX04Ed-RG-XtCG9Nmw" type="2007" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SvAKFH04Ed-RG-XtCG9Nmw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SvAKFX04Ed-RG-XtCG9Nmw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SvAKFn04Ed-RG-XtCG9Nmw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SvAKF304Ed-RG-XtCG9Nmw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SvAKGH04Ed-RG-XtCG9Nmw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SvAKGX04Ed-RG-XtCG9Nmw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_SvAKGn04Ed-RG-XtCG9Nmw" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_SvAKG304Ed-RG-XtCG9Nmw" type="7016">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SvAKHH04Ed-RG-XtCG9Nmw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_SvAKEn04Ed-RG-XtCG9Nmw"/>
+    <element xmi:type="uml:Package" href="Package0.uml#_SvAKEH04Ed-RG-XtCG9Nmw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SvAKE304Ed-RG-XtCG9Nmw" x="198" y="180"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_O5tfsIQsEd-SDs-So_GGkw" type="2008" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O5tfs4QsEd-SDs-So_GGkw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O5tftIQsEd-SDs-So_GGkw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O5tftYQsEd-SDs-So_GGkw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O5tftoQsEd-SDs-So_GGkw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O5tft4QsEd-SDs-So_GGkw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O5tfuIQsEd-SDs-So_GGkw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_O5tfuYQsEd-SDs-So_GGkw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_O5tfuoQsEd-SDs-So_GGkw" type="7017">
+      <children xmi:type="notation:Shape" xmi:id="_RIK7UIQsEd-SDs-So_GGkw" type="3012" fontHeight="8" lineColor="0">
+        <element xmi:type="uml:Property" href="model1.uml#_RHuPYIQsEd-SDs-So_GGkw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_RIK7UYQsEd-SDs-So_GGkw"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_O5tfu4QsEd-SDs-So_GGkw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_O5tfvIQsEd-SDs-So_GGkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5tfvYQsEd-SDs-So_GGkw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_O5tfvoQsEd-SDs-So_GGkw" type="7018">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_O5tfv4QsEd-SDs-So_GGkw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_O5tfwIQsEd-SDs-So_GGkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5tfwYQsEd-SDs-So_GGkw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_O5tfwoQsEd-SDs-So_GGkw" type="7019">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_O5tfw4QsEd-SDs-So_GGkw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_O5tfxIQsEd-SDs-So_GGkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5tfxYQsEd-SDs-So_GGkw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_O5tfsYQsEd-SDs-So_GGkw"/>
+    <element xmi:type="uml:Class" href="model1.uml#_O40u4IQsEd-SDs-So_GGkw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O5tfsoQsEd-SDs-So_GGkw" x="209" y="382" width="153"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_QtEHgX04Ed-RG-XtCG9Nmw"/>
+  <element xmi:type="uml:Model" href="model1.uml#_QsxMkH04Ed-RG-XtCG9Nmw"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.uml
index b4f1e6cdb0c..f09b17ba144 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel1/model1.uml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model 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/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_QsxMkH04Ed-RG-XtCG9Nmw" name="model">

-  <packagedElement xmi:type="uml:Class" xmi:id="_SEFk0H04Ed-RG-XtCG9Nmw" name="Class0"/>

-  <packagedElement xmi:type="uml:Package" href="Package0.uml#_SvAKEH04Ed-RG-XtCG9Nmw"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_O40u4IQsEd-SDs-So_GGkw" name="Class01">

-    <ownedAttribute xmi:id="_RHuPYIQsEd-SDs-So_GGkw" name="Property0" visibility="public" isUnique="false">

-      <type xmi:type="uml:Class" href="Package0.uml#_sRCZ4H04Ed-RG-XtCG9Nmw"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SouvIIQsEd-SDs-So_GGkw" value="1"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sok-IIQsEd-SDs-So_GGkw" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_So35EIQsEd-SDs-So_GGkw">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-  </packagedElement>

-  <profileApplication xmi:id="_h_c1UH04Ed-RG-XtCG9Nmw">

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

-      <references xmi:type="ecore:EPackage" href="MyProfile.uml#_G-2QMlEOEd-HP48oAvsvCg"/>

-    </eAnnotations>

-    <appliedProfile href="MyProfile.uml#_XkGiwB07Ed-QQ4mYkrb7Gg"/>

-  </profileApplication>

-  <profileApplication xmi:id="_wmy5MH04Ed-RG-XtCG9Nmw">

-    <eAnnotations xmi:id="_wn2CEH04Ed-RG-XtCG9Nmw" 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>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model 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/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_QsxMkH04Ed-RG-XtCG9Nmw" name="model">
+  <packagedElement xmi:type="uml:Class" xmi:id="_SEFk0H04Ed-RG-XtCG9Nmw" name="Class0"/>
+  <packagedElement xmi:type="uml:Package" href="Package0.uml#_SvAKEH04Ed-RG-XtCG9Nmw"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_O40u4IQsEd-SDs-So_GGkw" name="Class01">
+    <ownedAttribute xmi:id="_RHuPYIQsEd-SDs-So_GGkw" name="Property0" visibility="public" isUnique="false">
+      <type xmi:type="uml:Class" href="Package0.uml#_sRCZ4H04Ed-RG-XtCG9Nmw"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SouvIIQsEd-SDs-So_GGkw" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sok-IIQsEd-SDs-So_GGkw" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_So35EIQsEd-SDs-So_GGkw">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+  </packagedElement>
+  <profileApplication xmi:id="_h_c1UH04Ed-RG-XtCG9Nmw">
+    <eAnnotations xmi:id="_iA8DEH04Ed-RG-XtCG9Nmw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="MyProfile.uml#_G-2QMlEOEd-HP48oAvsvCg"/>
+    </eAnnotations>
+    <appliedProfile href="MyProfile.uml#_XkGiwB07Ed-QQ4mYkrb7Gg"/>
+  </profileApplication>
+  <profileApplication xmi:id="_wmy5MH04Ed-RG-XtCG9Nmw">
+    <eAnnotations xmi:id="_wn2CEH04Ed-RG-XtCG9Nmw" 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>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/.project b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/.project
index d4d9e708148..ba627838262 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/.project
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/.project
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>TestModel2</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-	</buildSpec>

-	<natures>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>TestModel2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.di
index 266051e4f6f..78542d52b24 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.di
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="ASCII"?>

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

-  <di:SashWindowsMngr xmi:id="_AG9LUoRTEd-ZSb15jhF0Qw">

-    <pageList xmi:id="_AG9LU4RTEd-ZSb15jhF0Qw">

-      <availablePage xmi:id="_AG9LVIRTEd-ZSb15jhF0Qw">

-        <emfPageIdentifier href="Package0.notation#_4cjrcIRSEd-ZSb15jhF0Qw"/>

-      </availablePage>

-    </pageList>

-    <sashModel xmi:id="_AG9LVYRTEd-ZSb15jhF0Qw" currentSelection="_AG9LV4RTEd-ZSb15jhF0Qw">

-      <windows xmi:id="_AG9LVoRTEd-ZSb15jhF0Qw">

-        <children xsi:type="di:TabFolder" xmi:id="_AG9LV4RTEd-ZSb15jhF0Qw">

-          <children xmi:id="_AG9LWIRTEd-ZSb15jhF0Qw">

-            <emfPageIdentifier href="Package0.notation#_4cjrcIRSEd-ZSb15jhF0Qw"/>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  <history:ControledResource xmi:id="_A7_88IRTEd-ZSb15jhF0Qw"/>

-  <history:ControledResource xmi:id="_G3YWQIRTEd-ZSb15jhF0Qw"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode">
+  <di:SashWindowsMngr xmi:id="_AG9LUoRTEd-ZSb15jhF0Qw">
+    <pageList xmi:id="_AG9LU4RTEd-ZSb15jhF0Qw">
+      <availablePage xmi:id="_AG9LVIRTEd-ZSb15jhF0Qw">
+        <emfPageIdentifier href="Package0.notation#_4cjrcIRSEd-ZSb15jhF0Qw"/>
+      </availablePage>
+    </pageList>
+    <sashModel xmi:id="_AG9LVYRTEd-ZSb15jhF0Qw" currentSelection="_AG9LV4RTEd-ZSb15jhF0Qw">
+      <windows xmi:id="_AG9LVoRTEd-ZSb15jhF0Qw">
+        <children xsi:type="di:TabFolder" xmi:id="_AG9LV4RTEd-ZSb15jhF0Qw">
+          <children xmi:id="_AG9LWIRTEd-ZSb15jhF0Qw">
+            <emfPageIdentifier href="Package0.notation#_4cjrcIRSEd-ZSb15jhF0Qw"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <history:ControledResource xmi:id="_A7_88IRTEd-ZSb15jhF0Qw"/>
+  <history:ControledResource xmi:id="_G3YWQIRTEd-ZSb15jhF0Qw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.notation
index c4c0c25efd6..82d9e2cda72 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.notation
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_4cjrcIRSEd-ZSb15jhF0Qw" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_5IgygIRSEd-ZSb15jhF0Qw" type="2008" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5Igyg4RSEd-ZSb15jhF0Qw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgyhIRSEd-ZSb15jhF0Qw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IgyhYRSEd-ZSb15jhF0Qw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgyhoRSEd-ZSb15jhF0Qw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5Igyh4RSEd-ZSb15jhF0Qw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgyiIRSEd-ZSb15jhF0Qw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_5IgyiYRSEd-ZSb15jhF0Qw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_5IgyioRSEd-ZSb15jhF0Qw" type="7017">

-      <children xmi:type="notation:Shape" xmi:id="_57oRgIRSEd-ZSb15jhF0Qw" type="3012" fontHeight="8" lineColor="0">

-        <element xmi:type="uml:Property" href="Package0.uml#_57LlkIRSEd-ZSb15jhF0Qw"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_57oRgYRSEd-ZSb15jhF0Qw"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_5Igyi4RSEd-ZSb15jhF0Qw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_5IgyjIRSEd-ZSb15jhF0Qw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5IgyjYRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_5IgyjoRSEd-ZSb15jhF0Qw" type="7018">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_5Igyj4RSEd-ZSb15jhF0Qw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_5IgykIRSEd-ZSb15jhF0Qw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5IgykYRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_5IgykoRSEd-ZSb15jhF0Qw" type="7019">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_5Igyk4RSEd-ZSb15jhF0Qw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_5IgylIRSEd-ZSb15jhF0Qw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5IgylYRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_5IgygYRSEd-ZSb15jhF0Qw"/>

-    <element xmi:type="uml:Class" href="Package0.uml#_5IXokIRSEd-ZSb15jhF0Qw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5IgygoRSEd-ZSb15jhF0Qw" x="200" y="136" width="178" height="83"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_-ig9EIRSEd-ZSb15jhF0Qw" type="2008" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-ig9E4RSEd-ZSb15jhF0Qw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-ig9FIRSEd-ZSb15jhF0Qw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-ig9FYRSEd-ZSb15jhF0Qw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-ig9FoRSEd-ZSb15jhF0Qw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-ig9F4RSEd-ZSb15jhF0Qw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-ig9GIRSEd-ZSb15jhF0Qw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_-ig9GYRSEd-ZSb15jhF0Qw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_-ig9GoRSEd-ZSb15jhF0Qw" type="7017">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_-ig9G4RSEd-ZSb15jhF0Qw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-ig9HIRSEd-ZSb15jhF0Qw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ig9HYRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_-ig9HoRSEd-ZSb15jhF0Qw" type="7018">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_-ig9H4RSEd-ZSb15jhF0Qw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-ig9IIRSEd-ZSb15jhF0Qw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ig9IYRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_-ig9IoRSEd-ZSb15jhF0Qw" type="7019">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_-ig9I4RSEd-ZSb15jhF0Qw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-ig9JIRSEd-ZSb15jhF0Qw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ig9JYRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_-ig9EYRSEd-ZSb15jhF0Qw"/>

-    <element xmi:type="uml:Class" href="model1.uml#_1766sIRSEd-ZSb15jhF0Qw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ig9EoRSEd-ZSb15jhF0Qw" x="366" y="308" width="83"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_4cjrcYRSEd-ZSb15jhF0Qw"/>

-  <element xmi:type="uml:Package" href="Package0.uml#_2dv1YIRSEd-ZSb15jhF0Qw"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_4cjrcIRSEd-ZSb15jhF0Qw" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_5IgygIRSEd-ZSb15jhF0Qw" type="2008" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5Igyg4RSEd-ZSb15jhF0Qw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgyhIRSEd-ZSb15jhF0Qw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IgyhYRSEd-ZSb15jhF0Qw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgyhoRSEd-ZSb15jhF0Qw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5Igyh4RSEd-ZSb15jhF0Qw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgyiIRSEd-ZSb15jhF0Qw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_5IgyiYRSEd-ZSb15jhF0Qw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5IgyioRSEd-ZSb15jhF0Qw" type="7017">
+      <children xmi:type="notation:Shape" xmi:id="_57oRgIRSEd-ZSb15jhF0Qw" type="3012" fontHeight="8" lineColor="0">
+        <element xmi:type="uml:Property" href="Package0.uml#_57LlkIRSEd-ZSb15jhF0Qw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_57oRgYRSEd-ZSb15jhF0Qw"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_5Igyi4RSEd-ZSb15jhF0Qw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_5IgyjIRSEd-ZSb15jhF0Qw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5IgyjYRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5IgyjoRSEd-ZSb15jhF0Qw" type="7018">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_5Igyj4RSEd-ZSb15jhF0Qw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_5IgykIRSEd-ZSb15jhF0Qw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5IgykYRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5IgykoRSEd-ZSb15jhF0Qw" type="7019">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_5Igyk4RSEd-ZSb15jhF0Qw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_5IgylIRSEd-ZSb15jhF0Qw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5IgylYRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_5IgygYRSEd-ZSb15jhF0Qw"/>
+    <element xmi:type="uml:Class" href="Package0.uml#_5IXokIRSEd-ZSb15jhF0Qw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5IgygoRSEd-ZSb15jhF0Qw" x="200" y="136" width="178" height="83"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_-ig9EIRSEd-ZSb15jhF0Qw" type="2008" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-ig9E4RSEd-ZSb15jhF0Qw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-ig9FIRSEd-ZSb15jhF0Qw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-ig9FYRSEd-ZSb15jhF0Qw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-ig9FoRSEd-ZSb15jhF0Qw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-ig9F4RSEd-ZSb15jhF0Qw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-ig9GIRSEd-ZSb15jhF0Qw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_-ig9GYRSEd-ZSb15jhF0Qw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_-ig9GoRSEd-ZSb15jhF0Qw" type="7017">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_-ig9G4RSEd-ZSb15jhF0Qw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-ig9HIRSEd-ZSb15jhF0Qw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ig9HYRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_-ig9HoRSEd-ZSb15jhF0Qw" type="7018">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_-ig9H4RSEd-ZSb15jhF0Qw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-ig9IIRSEd-ZSb15jhF0Qw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ig9IYRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_-ig9IoRSEd-ZSb15jhF0Qw" type="7019">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_-ig9I4RSEd-ZSb15jhF0Qw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-ig9JIRSEd-ZSb15jhF0Qw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ig9JYRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_-ig9EYRSEd-ZSb15jhF0Qw"/>
+    <element xmi:type="uml:Class" href="model1.uml#_1766sIRSEd-ZSb15jhF0Qw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ig9EoRSEd-ZSb15jhF0Qw" x="366" y="308" width="83"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_4cjrcYRSEd-ZSb15jhF0Qw"/>
+  <element xmi:type="uml:Package" href="Package0.uml#_2dv1YIRSEd-ZSb15jhF0Qw"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.uml
index 718bae12387..e73a5d44493 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/Package0.uml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_2dv1YIRSEd-ZSb15jhF0Qw" name="Package0">

-  <packagedElement xmi:type="uml:Class" xmi:id="_5IXokIRSEd-ZSb15jhF0Qw" name="Class1">

-    <ownedAttribute xmi:id="_57LlkIRSEd-ZSb15jhF0Qw" name="Property0">

-      <type xmi:type="uml:Class" href="model1.uml#_1766sIRSEd-ZSb15jhF0Qw"/>

-    </ownedAttribute>

-  </packagedElement>

-</uml:Package>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_2dv1YIRSEd-ZSb15jhF0Qw" name="Package0">
+  <packagedElement xmi:type="uml:Class" xmi:id="_5IXokIRSEd-ZSb15jhF0Qw" name="Class1">
+    <ownedAttribute xmi:id="_57LlkIRSEd-ZSb15jhF0Qw" name="Property0">
+      <type xmi:type="uml:Class" href="model1.uml#_1766sIRSEd-ZSb15jhF0Qw"/>
+    </ownedAttribute>
+  </packagedElement>
+</uml:Package>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.di
index fb8791b258e..9406717cfe6 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.di
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="ASCII"?>

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

-  <di:SashWindowsMngr xmi:id="_07GW4oRSEd-ZSb15jhF0Qw">

-    <pageList xmi:id="_07GW44RSEd-ZSb15jhF0Qw">

-      <availablePage xmi:id="_07GW54RSEd-ZSb15jhF0Qw">

-        <emfPageIdentifier href="model1.notation#_07GW4IRSEd-ZSb15jhF0Qw"/>

-      </availablePage>

-      <availablePage xmi:id="_4cjrcoRSEd-ZSb15jhF0Qw">

-        <emfPageIdentifier href="Package0.notation#_4cjrcIRSEd-ZSb15jhF0Qw"/>

-      </availablePage>

-    </pageList>

-    <sashModel xmi:id="_07GW5IRSEd-ZSb15jhF0Qw" currentSelection="_07GW5oRSEd-ZSb15jhF0Qw">

-      <windows xmi:id="_07GW5YRSEd-ZSb15jhF0Qw">

-        <children xsi:type="di:TabFolder" xmi:id="_07GW5oRSEd-ZSb15jhF0Qw">

-          <children xmi:id="_07GW6IRSEd-ZSb15jhF0Qw">

-            <emfPageIdentifier href="model1.notation#_07GW4IRSEd-ZSb15jhF0Qw"/>

-          </children>

-          <children xmi:id="_4cjrc4RSEd-ZSb15jhF0Qw">

-            <emfPageIdentifier href="Package0.notation#_4cjrcIRSEd-ZSb15jhF0Qw"/>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  <history:ControledResource xmi:id="_1Q2kcIRSEd-ZSb15jhF0Qw"/>

-  <history:ControledResource xmi:id="_AGzaUIRTEd-ZSb15jhF0Qw" resourceURL="model1.uml">

-    <children xmi:id="_AG9LUIRTEd-ZSb15jhF0Qw" resourceURL="Package0.uml"/>

-  </history:ControledResource>

-  <history:ControledResource xmi:id="_AGzaUYRTEd-ZSb15jhF0Qw" resourceURL="model1.notation">

-    <children xmi:id="_AG9LUYRTEd-ZSb15jhF0Qw" resourceURL="Package0.notation"/>

-  </history:ControledResource>

-</xmi:XMI>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode">
+  <di:SashWindowsMngr xmi:id="_07GW4oRSEd-ZSb15jhF0Qw">
+    <pageList xmi:id="_07GW44RSEd-ZSb15jhF0Qw">
+      <availablePage xmi:id="_07GW54RSEd-ZSb15jhF0Qw">
+        <emfPageIdentifier href="model1.notation#_07GW4IRSEd-ZSb15jhF0Qw"/>
+      </availablePage>
+      <availablePage xmi:id="_4cjrcoRSEd-ZSb15jhF0Qw">
+        <emfPageIdentifier href="Package0.notation#_4cjrcIRSEd-ZSb15jhF0Qw"/>
+      </availablePage>
+    </pageList>
+    <sashModel xmi:id="_07GW5IRSEd-ZSb15jhF0Qw" currentSelection="_07GW5oRSEd-ZSb15jhF0Qw">
+      <windows xmi:id="_07GW5YRSEd-ZSb15jhF0Qw">
+        <children xsi:type="di:TabFolder" xmi:id="_07GW5oRSEd-ZSb15jhF0Qw">
+          <children xmi:id="_07GW6IRSEd-ZSb15jhF0Qw">
+            <emfPageIdentifier href="model1.notation#_07GW4IRSEd-ZSb15jhF0Qw"/>
+          </children>
+          <children xmi:id="_4cjrc4RSEd-ZSb15jhF0Qw">
+            <emfPageIdentifier href="Package0.notation#_4cjrcIRSEd-ZSb15jhF0Qw"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <history:ControledResource xmi:id="_1Q2kcIRSEd-ZSb15jhF0Qw"/>
+  <history:ControledResource xmi:id="_AGzaUIRTEd-ZSb15jhF0Qw" resourceURL="model1.uml">
+    <children xmi:id="_AG9LUIRTEd-ZSb15jhF0Qw" resourceURL="Package0.uml"/>
+  </history:ControledResource>
+  <history:ControledResource xmi:id="_AGzaUYRTEd-ZSb15jhF0Qw" resourceURL="model1.notation">
+    <children xmi:id="_AG9LUYRTEd-ZSb15jhF0Qw" resourceURL="Package0.notation"/>
+  </history:ControledResource>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.notation
index 46538a70935..de33bed13b5 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.notation
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_07GW4IRSEd-ZSb15jhF0Qw" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_18hXoIRSEd-ZSb15jhF0Qw" type="2008" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_18hXo4RSEd-ZSb15jhF0Qw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_18hXpIRSEd-ZSb15jhF0Qw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_18hXpYRSEd-ZSb15jhF0Qw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_18hXpoRSEd-ZSb15jhF0Qw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_18hXp4RSEd-ZSb15jhF0Qw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_18hXqIRSEd-ZSb15jhF0Qw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_18hXqYRSEd-ZSb15jhF0Qw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_18hXqoRSEd-ZSb15jhF0Qw" type="7017">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_18hXq4RSEd-ZSb15jhF0Qw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_18hXrIRSEd-ZSb15jhF0Qw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18hXrYRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_18hXroRSEd-ZSb15jhF0Qw" type="7018">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_18hXr4RSEd-ZSb15jhF0Qw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_18hXsIRSEd-ZSb15jhF0Qw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18hXsYRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_18hXsoRSEd-ZSb15jhF0Qw" type="7019">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_18hXs4RSEd-ZSb15jhF0Qw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_18hXtIRSEd-ZSb15jhF0Qw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18hXtYRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_18hXoYRSEd-ZSb15jhF0Qw"/>

-    <element xmi:type="uml:Class" href="model1.uml#_1766sIRSEd-ZSb15jhF0Qw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18hXooRSEd-ZSb15jhF0Qw" x="197" y="79"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_2d5mYIRSEd-ZSb15jhF0Qw" type="2007" fontHeight="8" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2eCwUIRSEd-ZSb15jhF0Qw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2eCwUYRSEd-ZSb15jhF0Qw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2eCwUoRSEd-ZSb15jhF0Qw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2eCwU4RSEd-ZSb15jhF0Qw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2eCwVIRSEd-ZSb15jhF0Qw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2eCwVYRSEd-ZSb15jhF0Qw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_2eCwVoRSEd-ZSb15jhF0Qw" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_2eCwV4RSEd-ZSb15jhF0Qw" type="7016">

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2eCwWIRSEd-ZSb15jhF0Qw"/>

-    </children>

-    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_2d5mYYRSEd-ZSb15jhF0Qw"/>

-    <element xmi:type="uml:Package" href="Package0.uml#_2dv1YIRSEd-ZSb15jhF0Qw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2d5mYoRSEd-ZSb15jhF0Qw" x="382" y="177"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_07GW4YRSEd-ZSb15jhF0Qw"/>

-  <element xmi:type="uml:Model" href="model1.uml#_06pq8IRSEd-ZSb15jhF0Qw"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_07GW4IRSEd-ZSb15jhF0Qw" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_18hXoIRSEd-ZSb15jhF0Qw" type="2008" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_18hXo4RSEd-ZSb15jhF0Qw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_18hXpIRSEd-ZSb15jhF0Qw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_18hXpYRSEd-ZSb15jhF0Qw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_18hXpoRSEd-ZSb15jhF0Qw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_18hXp4RSEd-ZSb15jhF0Qw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_18hXqIRSEd-ZSb15jhF0Qw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_18hXqYRSEd-ZSb15jhF0Qw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_18hXqoRSEd-ZSb15jhF0Qw" type="7017">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_18hXq4RSEd-ZSb15jhF0Qw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_18hXrIRSEd-ZSb15jhF0Qw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18hXrYRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_18hXroRSEd-ZSb15jhF0Qw" type="7018">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_18hXr4RSEd-ZSb15jhF0Qw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_18hXsIRSEd-ZSb15jhF0Qw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18hXsYRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_18hXsoRSEd-ZSb15jhF0Qw" type="7019">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_18hXs4RSEd-ZSb15jhF0Qw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_18hXtIRSEd-ZSb15jhF0Qw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18hXtYRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_18hXoYRSEd-ZSb15jhF0Qw"/>
+    <element xmi:type="uml:Class" href="model1.uml#_1766sIRSEd-ZSb15jhF0Qw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18hXooRSEd-ZSb15jhF0Qw" x="197" y="79"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_2d5mYIRSEd-ZSb15jhF0Qw" type="2007" fontHeight="8" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2eCwUIRSEd-ZSb15jhF0Qw" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2eCwUYRSEd-ZSb15jhF0Qw" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2eCwUoRSEd-ZSb15jhF0Qw" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2eCwU4RSEd-ZSb15jhF0Qw" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2eCwVIRSEd-ZSb15jhF0Qw" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2eCwVYRSEd-ZSb15jhF0Qw" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_2eCwVoRSEd-ZSb15jhF0Qw" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_2eCwV4RSEd-ZSb15jhF0Qw" type="7016">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2eCwWIRSEd-ZSb15jhF0Qw"/>
+    </children>
+    <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_2d5mYYRSEd-ZSb15jhF0Qw"/>
+    <element xmi:type="uml:Package" href="Package0.uml#_2dv1YIRSEd-ZSb15jhF0Qw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2d5mYoRSEd-ZSb15jhF0Qw" x="382" y="177"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_07GW4YRSEd-ZSb15jhF0Qw"/>
+  <element xmi:type="uml:Model" href="model1.uml#_06pq8IRSEd-ZSb15jhF0Qw"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.uml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.uml
index b793bcb792d..926abbe6f09 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.uml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/resources/TestModel2/model1.uml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_06pq8IRSEd-ZSb15jhF0Qw" name="model">

-  <packagedElement xmi:type="uml:Class" xmi:id="_1766sIRSEd-ZSb15jhF0Qw" name="Class0"/>

-  <packagedElement xmi:type="uml:Package" href="Package0.uml#_2dv1YIRSEd-ZSb15jhF0Qw"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_06pq8IRSEd-ZSb15jhF0Qw" name="model">
+  <packagedElement xmi:type="uml:Class" xmi:id="_1766sIRSEd-ZSb15jhF0Qw" name="Class0"/>
+  <packagedElement xmi:type="uml:Package" href="Package0.uml#_2dv1YIRSEd-ZSb15jhF0Qw"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/AllTests.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/AllTests.java
index e22ed8ceac4..9a331d49df2 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/AllTests.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/AllTests.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * 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.services.resourceloading.tests;

-

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1.Strategy0TestModel1;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1.Strategy1TestModel1;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1.Strategy2TestModel1;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy0TestModel2WithModel1;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy0TestModel2WithPackage0;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy1TestModel2WithModel1;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy1TestModel2WithPackage0;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy2TestModel2WithModel1;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy2TestModel2WithPackage0;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.runner.Headless;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-

-/**

- * All tests together.

- */

-@Headless

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		// testModel1

-		Strategy1TestModel1.class,

-		Strategy2TestModel1.class,

-		Strategy0TestModel1.class,

-		// testModel2

-		Strategy0TestModel2WithModel1.class,

-		Strategy0TestModel2WithPackage0.class,

-		Strategy1TestModel2WithModel1.class,

-		Strategy1TestModel2WithPackage0.class,

-		Strategy2TestModel2WithModel1.class,

-		Strategy2TestModel2WithPackage0.class

-})

-public class AllTests {

-	// Test suite

+/*****************************************************************************
+ * 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.services.resourceloading.tests;
+
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1.Strategy0TestModel1;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1.Strategy1TestModel1;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1.Strategy2TestModel1;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy0TestModel2WithModel1;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy0TestModel2WithPackage0;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy1TestModel2WithModel1;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy1TestModel2WithPackage0;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy2TestModel2WithModel1;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy2TestModel2WithPackage0;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.runner.Headless;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * All tests together.
+ */
+@Headless
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		// testModel1
+		Strategy1TestModel1.class,
+		Strategy2TestModel1.class,
+		Strategy0TestModel1.class,
+		// testModel2
+		Strategy0TestModel2WithModel1.class,
+		Strategy0TestModel2WithPackage0.class,
+		Strategy1TestModel2WithModel1.class,
+		Strategy1TestModel2WithPackage0.class,
+		Strategy2TestModel2WithModel1.class,
+		Strategy2TestModel2WithPackage0.class
+})
+public class AllTests {
+	// Test suite
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java
index 1e93fd1af88..3995b08c2c6 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java
@@ -1,337 +1,337 @@
-/*****************************************************************************

- * Copyright (c) 2010, 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:

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

- *  Christian W. Damus (CEA) - Work around regression in URI parsing in EMF 2.9

- *  Christian W. Damus (CEA) - bug 437217 - control-mode strategy changes interfere with later tests

- *  Christian W. Damus - bug 463631

- *

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

-package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNull;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import java.util.LinkedList;

-import java.util.List;

-

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.StrategyChooserFixture;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.ITestConstants;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

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

-import org.eclipse.uml2.uml.Type;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-

-/**

- * Abstract class to test all the strategies with TestModel1

- * - Check that all the controlled resources are loaded

- * - Check that all the needed profiles (resource and pathmap) are loaded

- * - Check that all references to controlled resource are resolved

- *

- * @author eperico

- *

- */

-public abstract class AbstractResourceLoadingTestModel1 extends AbstractPapyrusTest {

-

-	private static final String INITIAL_PATH = "resources/TestModel1/";

-

-	public static final String RESOURCE_URI = ITestConstants.FRAGMENT_ID + "/" + INITIAL_PATH;

-

-	private String[] resources = new String[] { "model1", "Package0", "Package1" };

-

-	private String[] extensions = new String[] { ".di", ".notation", ".uml" };

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	protected ModelSet modelSet;

-

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Before

-	public void setUp() throws Exception {

-		houseKeeper.cleanUpLater(new StrategyChooserFixture(getStrategy()));

-

-		// first we need to create the test project from the plugin to the workspace test platform

-		IProject project = copyTestModelToThePlatform();

-		modelSet = houseKeeper.cleanUpLater((ModelSet) new OnDemandLoadingModelSetServiceFactory().createServiceInstance());

-		if (project != null) {

-			IFile modelFile = project.getFile(INITIAL_PATH + "model1.di");

-			modelSet.loadModels(modelFile);

-		} else {

-			fail("Could not initialize correctly the project");

-		}

-	}

-

-	/**

-	 * Copy test model from the test plugin to the platform where the tests are executed

-	 *

-	 * @return the project in the runtime platform

-	 * @throws Exception

-	 */

-	private IProject copyTestModelToThePlatform() throws Exception {

-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ITestConstants.FRAGMENT_ID);

-		IProgressMonitor monitor = new NullProgressMonitor();

-

-		if (project != null && project.exists()) {

-			project.delete(true, monitor);

-		}

-

-		if (project != null && !project.exists()) {

-			project.create(monitor);

-		}

-		project.open(monitor);

-		for (String res : resources) {

-			for (String s : extensions) {

-				IFile file = project.getFile(INITIAL_PATH + res + s);

-				// link all the models resources

-				if (!file.exists()) {

-					createFolder(project, "resources/");

-					createFolder(project, INITIAL_PATH);

-					// URL url = FileLocator.find(Platform.getBundle(ITestConstants.FRAGMENT_ID), new Path(INITIAL_PATH + res + s), null);

-					// URL newFileURL = FileLocator.resolve(url);

-					// file.createLink(newFile.toURI(), IResource.REPLACE, monitor);

-					file.create(Platform.getBundle(ITestConstants.FRAGMENT_ID).getEntry(INITIAL_PATH + res + s).openStream(), true, monitor);

-				}

-			}

-		}

-		// link the profile

-		String profilePath = INITIAL_PATH + "MyProfile.uml";

-		IFile file = project.getFile(profilePath);

-		if (!file.exists()) {

-			// URL url = FileLocator.find(Platform.getBundle(ITestConstants.FRAGMENT_ID), new Path(profilePath), null);

-			// URL newFile = FileLocator.resolve(url);

-			// file.createLink(newFile.toURI(), IResource.REPLACE, monitor);

-			file.create(Platform.getBundle(ITestConstants.FRAGMENT_ID).getEntry(profilePath).openStream(), true, monitor);

-			if (!file.exists()) {

-				fail("Impossible to create the profile file");

-			}

-		}

-		project.refreshLocal(IResource.DEPTH_INFINITE, monitor);

-		return project;

-	}

-

-	/**

-	 * Gets the current resource loading strategy.

-	 *

-	 * @return the strategy

-	 */

-	public abstract int getStrategy();

-

-	/**

-	 * Gets objects of controlled resources.

-	 * - get an object (Class0) from the current resource (model1)

-	 * - get an object (Class1) from the first controlled resource (Package0)

-	 * - get an object (Class2) from the second controlled resource (Package1)

-	 */

-	@Test

-	public void testGetObjectOfControlledResource() {

-		// test getting EObject of the specified URI

-		// level 0

-		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_SEFk0H04Ed-RG-XtCG9Nmw");

-		EObject eObject = modelSet.getEObject(uriClass0, true);

-		assertTestGetObjectOfControlledResource("Load object of the current resource: ", eObject, uriClass0);

-		// level 1

-		URI uriClass1 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.uml", false).appendFragment("_nQhGUH04Ed-RG-XtCG9Nmw");

-		EObject eObject2 = modelSet.getEObject(uriClass1, true);

-		assertTestGetObjectOfControlledResource("Load object in a controlled resource at level 1", eObject2, uriClass1);

-		// level 2

-		URI uriClass2 = URI.createPlatformResourceURI(RESOURCE_URI + "Package1.uml", false).appendFragment("_sRCZ4H04Ed-RG-XtCG9Nmw");

-		EObject eObject3 = modelSet.getEObject(uriClass2, true);

-		assertTestGetObjectOfControlledResource("Load object in a controlled resource at level 2", eObject3, uriClass2);

-	}

-

-	private void assertTestGetObjectOfControlledResource(String message, Object object, URI uri) {

-		switch (getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertNotNull(message, object);

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			if (uri.toString().contains("model1")) {

-				// object in current resource

-				assertNotNull(message, object);

-			} else {

-				// object in controlled resource

-				assertNull(message, object);

-			}

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			assertNotNull(message, object);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * Gets diagrams of controlled resources.

-	 * - get a diagram (NewDiagram) from the current resource (model1)

-	 * - get a diagram (Diagram0) from the first controlled resource (Package0)

-	 * - get a diagram (Diagram1) from the second controlled resource (Package1)

-	 */

-	@Test

-	public void testGetDiagramOfControlledResource() {

-		// get notation reference from di resource

-		// level 0

-		URI uriNewDiagram = URI.createPlatformResourceURI(RESOURCE_URI + "model1.notation", false).appendFragment("_QtEHgH04Ed-RG-XtCG9Nmw");

-		EObject newDiagram = modelSet.getEObject(uriNewDiagram, true);

-		assertTestGetDiagramOfControlledResource("Load diagram in a controlled resource at level 2", newDiagram, uriNewDiagram);

-		// level 1

-		URI uriDiagram0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.notation", false).appendFragment("_mvutcH04Ed-RG-XtCG9Nmw");

-		EObject diagram0 = modelSet.getEObject(uriDiagram0, true);

-		assertTestGetDiagramOfControlledResource("Load diagram in a controlled resource at level 2", diagram0, uriDiagram0);

-		// level 2

-		URI uriDiagram1 = URI.createPlatformResourceURI(RESOURCE_URI + "Package1.notation", false).appendFragment("_r1npMH04Ed-RG-XtCG9Nmw");

-		EObject diagram1 = modelSet.getEObject(uriDiagram1, true);

-		assertTestGetDiagramOfControlledResource("Load diagram in a controlled resource at level 2", diagram1, uriDiagram1);

-	}

-

-	private void assertTestGetDiagramOfControlledResource(String message, Object object, URI uri) {

-		switch (getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertNotNull(message, object);

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			if (uri.toString().contains("model1")) {

-				// object in current resource

-				assertNotNull(message, object);

-			} else {

-				// object in controlled resource

-				assertNull(message, object);

-			}

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			assertNotNull(message, object);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * Gets a needed profile resource from the local project

-	 */

-	@Test

-	public void testGetObjectOfProfileResource() {

-		URI uriPlatformProfile = URI.createPlatformResourceURI(RESOURCE_URI + "MyProfile.uml", false).appendFragment("_XkGiwB07Ed-QQ4mYkrb7Gg");

-		System.err.println(uriPlatformProfile);

-		Resource resource = modelSet.getResource(uriPlatformProfile.trimFragment(), true);

-		assertNotNull("Resource should not be null", resource);

-

-		EObject platformProfile = modelSet.getEObject(uriPlatformProfile, true);

-		// profile must be loaded with all the strategies

-		assertNotNull("Load a platform profile resource", platformProfile);

-	}

-

-	/**

-	 * Gets a needed profile resource from a pathmap

-	 */

-	@Test

-	public void testGetObjectOfPathmapResource() {

-		URI uriPathmapProfile = URI.createURI("pathmap://UML_PROFILES/Ecore.profile.uml#_0");

-		EObject pathmapProfile = modelSet.getEObject(uriPathmapProfile, true);

-		// pathmap must be loaded with all the strategies

-		assertNotNull("Load a pathmap profile resource", pathmapProfile);

-	}

-

-	/**

-	 * Gets a reference which has been moved to another resource after control action

-	 * - Property0 from Class01 is typed with Class2 in Package2

-	 * - Control Package2 from Package1 resource

-	 * - try to get the property type from model1 resource to check the reference update

-	 */

-	@Test

-	public void testGetDanglingReferenceFromAControlledResource() {

-		URI uriProperty0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_RHuPYIQsEd-SDs-So_GGkw");

-		EObject property0 = modelSet.getEObject(uriProperty0, true);

-		if (property0 instanceof Property) {

-			Type type = ((Property) property0).getType();

-			assertTestGetDanglingReferenceFromAControlledResource("Get type from controlled resource is resolved", type);

-		}

-	}

-

-	private void assertTestGetDanglingReferenceFromAControlledResource(String message, EObject eObject) {

-		switch (getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertTrue(message, !eObject.eIsProxy());

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			assertTrue(message, eObject.eIsProxy());

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			assertTrue(message, !eObject.eIsProxy());

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@After

-	public void tearDown() throws Exception {

-		// Unload models

-		List<Resource> resources = new LinkedList<Resource>(modelSet.getResources());

-		for (Resource r : resources) {

-			try {

-				r.unload();

-			} catch (Exception e) {

-				e.printStackTrace();

-			}

-		}

-	}

-

-	/**

-	 * Creates the folder name in the specified project

-	 *

-	 * @param project

-	 * @param name

-	 * @throws CoreException

-	 */

-	private void createFolder(IProject project, String name) throws CoreException {

-		IFolder parent = project.getFolder(name);

-		if (!parent.exists()) {

-			parent.create(true, true, new NullProgressMonitor());

-		}

-		assertTrue(parent.exists());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 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:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - Work around regression in URI parsing in EMF 2.9
+ *  Christian W. Damus (CEA) - bug 437217 - control-mode strategy changes interfere with later tests
+ *  Christian W. Damus - bug 463631
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.LinkedList;
+import java.util.List;
+
+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.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.StrategyChooserFixture;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.ITestConstants;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+
+/**
+ * Abstract class to test all the strategies with TestModel1
+ * - Check that all the controlled resources are loaded
+ * - Check that all the needed profiles (resource and pathmap) are loaded
+ * - Check that all references to controlled resource are resolved
+ *
+ * @author eperico
+ *
+ */
+public abstract class AbstractResourceLoadingTestModel1 extends AbstractPapyrusTest {
+
+	private static final String INITIAL_PATH = "resources/TestModel1/";
+
+	public static final String RESOURCE_URI = ITestConstants.FRAGMENT_ID + "/" + INITIAL_PATH;
+
+	private String[] resources = new String[] { "model1", "Package0", "Package1" };
+
+	private String[] extensions = new String[] { ".di", ".notation", ".uml" };
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	protected ModelSet modelSet;
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Before
+	public void setUp() throws Exception {
+		houseKeeper.cleanUpLater(new StrategyChooserFixture(getStrategy()));
+
+		// first we need to create the test project from the plugin to the workspace test platform
+		IProject project = copyTestModelToThePlatform();
+		modelSet = houseKeeper.cleanUpLater((ModelSet) new OnDemandLoadingModelSetServiceFactory().createServiceInstance());
+		if (project != null) {
+			IFile modelFile = project.getFile(INITIAL_PATH + "model1.di");
+			modelSet.loadModels(modelFile);
+		} else {
+			fail("Could not initialize correctly the project");
+		}
+	}
+
+	/**
+	 * Copy test model from the test plugin to the platform where the tests are executed
+	 *
+	 * @return the project in the runtime platform
+	 * @throws Exception
+	 */
+	private IProject copyTestModelToThePlatform() throws Exception {
+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ITestConstants.FRAGMENT_ID);
+		IProgressMonitor monitor = new NullProgressMonitor();
+
+		if (project != null && project.exists()) {
+			project.delete(true, monitor);
+		}
+
+		if (project != null && !project.exists()) {
+			project.create(monitor);
+		}
+		project.open(monitor);
+		for (String res : resources) {
+			for (String s : extensions) {
+				IFile file = project.getFile(INITIAL_PATH + res + s);
+				// link all the models resources
+				if (!file.exists()) {
+					createFolder(project, "resources/");
+					createFolder(project, INITIAL_PATH);
+					// URL url = FileLocator.find(Platform.getBundle(ITestConstants.FRAGMENT_ID), new Path(INITIAL_PATH + res + s), null);
+					// URL newFileURL = FileLocator.resolve(url);
+					// file.createLink(newFile.toURI(), IResource.REPLACE, monitor);
+					file.create(Platform.getBundle(ITestConstants.FRAGMENT_ID).getEntry(INITIAL_PATH + res + s).openStream(), true, monitor);
+				}
+			}
+		}
+		// link the profile
+		String profilePath = INITIAL_PATH + "MyProfile.uml";
+		IFile file = project.getFile(profilePath);
+		if (!file.exists()) {
+			// URL url = FileLocator.find(Platform.getBundle(ITestConstants.FRAGMENT_ID), new Path(profilePath), null);
+			// URL newFile = FileLocator.resolve(url);
+			// file.createLink(newFile.toURI(), IResource.REPLACE, monitor);
+			file.create(Platform.getBundle(ITestConstants.FRAGMENT_ID).getEntry(profilePath).openStream(), true, monitor);
+			if (!file.exists()) {
+				fail("Impossible to create the profile file");
+			}
+		}
+		project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+		return project;
+	}
+
+	/**
+	 * Gets the current resource loading strategy.
+	 *
+	 * @return the strategy
+	 */
+	public abstract int getStrategy();
+
+	/**
+	 * Gets objects of controlled resources.
+	 * - get an object (Class0) from the current resource (model1)
+	 * - get an object (Class1) from the first controlled resource (Package0)
+	 * - get an object (Class2) from the second controlled resource (Package1)
+	 */
+	@Test
+	public void testGetObjectOfControlledResource() {
+		// test getting EObject of the specified URI
+		// level 0
+		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_SEFk0H04Ed-RG-XtCG9Nmw");
+		EObject eObject = modelSet.getEObject(uriClass0, true);
+		assertTestGetObjectOfControlledResource("Load object of the current resource: ", eObject, uriClass0);
+		// level 1
+		URI uriClass1 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.uml", false).appendFragment("_nQhGUH04Ed-RG-XtCG9Nmw");
+		EObject eObject2 = modelSet.getEObject(uriClass1, true);
+		assertTestGetObjectOfControlledResource("Load object in a controlled resource at level 1", eObject2, uriClass1);
+		// level 2
+		URI uriClass2 = URI.createPlatformResourceURI(RESOURCE_URI + "Package1.uml", false).appendFragment("_sRCZ4H04Ed-RG-XtCG9Nmw");
+		EObject eObject3 = modelSet.getEObject(uriClass2, true);
+		assertTestGetObjectOfControlledResource("Load object in a controlled resource at level 2", eObject3, uriClass2);
+	}
+
+	private void assertTestGetObjectOfControlledResource(String message, Object object, URI uri) {
+		switch (getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertNotNull(message, object);
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			if (uri.toString().contains("model1")) {
+				// object in current resource
+				assertNotNull(message, object);
+			} else {
+				// object in controlled resource
+				assertNull(message, object);
+			}
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			assertNotNull(message, object);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * Gets diagrams of controlled resources.
+	 * - get a diagram (NewDiagram) from the current resource (model1)
+	 * - get a diagram (Diagram0) from the first controlled resource (Package0)
+	 * - get a diagram (Diagram1) from the second controlled resource (Package1)
+	 */
+	@Test
+	public void testGetDiagramOfControlledResource() {
+		// get notation reference from di resource
+		// level 0
+		URI uriNewDiagram = URI.createPlatformResourceURI(RESOURCE_URI + "model1.notation", false).appendFragment("_QtEHgH04Ed-RG-XtCG9Nmw");
+		EObject newDiagram = modelSet.getEObject(uriNewDiagram, true);
+		assertTestGetDiagramOfControlledResource("Load diagram in a controlled resource at level 2", newDiagram, uriNewDiagram);
+		// level 1
+		URI uriDiagram0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.notation", false).appendFragment("_mvutcH04Ed-RG-XtCG9Nmw");
+		EObject diagram0 = modelSet.getEObject(uriDiagram0, true);
+		assertTestGetDiagramOfControlledResource("Load diagram in a controlled resource at level 2", diagram0, uriDiagram0);
+		// level 2
+		URI uriDiagram1 = URI.createPlatformResourceURI(RESOURCE_URI + "Package1.notation", false).appendFragment("_r1npMH04Ed-RG-XtCG9Nmw");
+		EObject diagram1 = modelSet.getEObject(uriDiagram1, true);
+		assertTestGetDiagramOfControlledResource("Load diagram in a controlled resource at level 2", diagram1, uriDiagram1);
+	}
+
+	private void assertTestGetDiagramOfControlledResource(String message, Object object, URI uri) {
+		switch (getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertNotNull(message, object);
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			if (uri.toString().contains("model1")) {
+				// object in current resource
+				assertNotNull(message, object);
+			} else {
+				// object in controlled resource
+				assertNull(message, object);
+			}
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			assertNotNull(message, object);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * Gets a needed profile resource from the local project
+	 */
+	@Test
+	public void testGetObjectOfProfileResource() {
+		URI uriPlatformProfile = URI.createPlatformResourceURI(RESOURCE_URI + "MyProfile.uml", false).appendFragment("_XkGiwB07Ed-QQ4mYkrb7Gg");
+		System.err.println(uriPlatformProfile);
+		Resource resource = modelSet.getResource(uriPlatformProfile.trimFragment(), true);
+		assertNotNull("Resource should not be null", resource);
+
+		EObject platformProfile = modelSet.getEObject(uriPlatformProfile, true);
+		// profile must be loaded with all the strategies
+		assertNotNull("Load a platform profile resource", platformProfile);
+	}
+
+	/**
+	 * Gets a needed profile resource from a pathmap
+	 */
+	@Test
+	public void testGetObjectOfPathmapResource() {
+		URI uriPathmapProfile = URI.createURI("pathmap://UML_PROFILES/Ecore.profile.uml#_0");
+		EObject pathmapProfile = modelSet.getEObject(uriPathmapProfile, true);
+		// pathmap must be loaded with all the strategies
+		assertNotNull("Load a pathmap profile resource", pathmapProfile);
+	}
+
+	/**
+	 * Gets a reference which has been moved to another resource after control action
+	 * - Property0 from Class01 is typed with Class2 in Package2
+	 * - Control Package2 from Package1 resource
+	 * - try to get the property type from model1 resource to check the reference update
+	 */
+	@Test
+	public void testGetDanglingReferenceFromAControlledResource() {
+		URI uriProperty0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_RHuPYIQsEd-SDs-So_GGkw");
+		EObject property0 = modelSet.getEObject(uriProperty0, true);
+		if (property0 instanceof Property) {
+			Type type = ((Property) property0).getType();
+			assertTestGetDanglingReferenceFromAControlledResource("Get type from controlled resource is resolved", type);
+		}
+	}
+
+	private void assertTestGetDanglingReferenceFromAControlledResource(String message, EObject eObject) {
+		switch (getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertTrue(message, !eObject.eIsProxy());
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			assertTrue(message, eObject.eIsProxy());
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			assertTrue(message, !eObject.eIsProxy());
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@After
+	public void tearDown() throws Exception {
+		// Unload models
+		List<Resource> resources = new LinkedList<Resource>(modelSet.getResources());
+		for (Resource r : resources) {
+			try {
+				r.unload();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * Creates the folder name in the specified project
+	 *
+	 * @param project
+	 * @param name
+	 * @throws CoreException
+	 */
+	private void createFolder(IProject project, String name) throws CoreException {
+		IFolder parent = project.getFolder(name);
+		if (!parent.exists()) {
+			parent.create(true, true, new NullProgressMonitor());
+		}
+		assertTrue(parent.exists());
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel2.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel2.java
index ee11d5b6059..e9876576fdd 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel2.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel2.java
@@ -1,311 +1,311 @@
-/*****************************************************************************

- * 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) - Work around regression in URI parsing in EMF 2.9

- *  Christian W. Damus (CEA) - bug 437217 - control-mode strategy changes interfere with later tests

- *

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

-package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1;

-

-import static org.junit.Assert.assertNotSame;

-import static org.junit.Assert.assertNull;

-import static org.junit.Assert.assertSame;

-import static org.junit.Assert.assertTrue;

-

-import java.net.URL;

-import java.util.ArrayList;

-import java.util.List;

-

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.StrategyChooserFixture;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.ITestConstants;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

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

-import org.eclipse.uml2.uml.Type;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-

-/**

- * Abstract class to test all the strategies with TestModel2

- * - Check that a model resource is loaded when a model contains reference to it.

- * - Check that a notation resource is loaded when a diagram contains reference to it.

- *

- * @author eperico

- *

- */

-public abstract class AbstractResourceLoadingTestModel2 extends AbstractPapyrusTest {

-

-	public static final String INITIAL_PATH = "resources/TestModel2/";

-

-	public static final String RESOURCE_URI = ITestConstants.FRAGMENT_ID + "/" + INITIAL_PATH;

-

-	private String[] resources = new String[]{ "model1", "Package0" };

-

-	private String[] extensions = new String[]{ ".di", ".notation", ".uml" };

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	protected ModelSet modelSet;

-

-	private IFile resourceLoaded;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Before

-	public void setUp() throws Exception {

-		houseKeeper.cleanUpLater(new StrategyChooserFixture(getStrategy()));

-

-		// first we need to create the test project from the plugin to the workspace test platform

-		IProject project = copyTestModelToThePlatform();

-		modelSet = houseKeeper.cleanUpLater((ModelSet)new OnDemandLoadingModelSetServiceFactory().createServiceInstance());

-		if(project != null) {

-			resourceLoaded = getResourceToLoad(project);

-			modelSet.loadModels(resourceLoaded);

-		}

-	}

-

-	/**

-	 * Copy test model from the test plugin to the platform where the tests are executed

-	 *

-	 * @return the project in the runtime platform

-	 * @throws Exception

-	 */

-	private IProject copyTestModelToThePlatform() throws Exception {

-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ITestConstants.FRAGMENT_ID);

-		IProgressMonitor monitor = new NullProgressMonitor();

-

-		if(project != null && !project.exists()) {

-			project.create(monitor);

-		}

-		project.open(monitor);

-		for(String res : resources) {

-			for(String s : extensions) {

-				IFile file = project.getFile(INITIAL_PATH + res + s);

-				// link all the models resources

-				if(!file.exists()) {

-					createFolder(project, "resources/");

-					createFolder(project, INITIAL_PATH);

-					URL url = FileLocator.find(Platform.getBundle(ITestConstants.FRAGMENT_ID), new Path(INITIAL_PATH + res + s), null);

-					URL newFile = FileLocator.resolve(url);

-

-					// encode the URI for spaces in the path

-					file.createLink(new URL(newFile.toString().replaceAll(" ", "%20")).toURI(), IResource.REPLACE, monitor);

-				}

-			}

-		}

-		project.refreshLocal(IResource.DEPTH_INFINITE, monitor);

-		return project;

-	}

-

-	/**

-	 * Gets the current resource loading strategy.

-	 *

-	 * @return the strategy

-	 */

-	public abstract int getStrategy();

-

-	/**

-	 * Gets the resource to load, the one it is opened with the papyrus editor

-	 *

-	 * @param project

-	 *        the project in which the resources should be

-	 *

-	 * @return the resource to load

-	 */

-	public abstract IFile getResourceToLoad(IProject project);

-

-	/**

-	 * Gets an object (Class0) from a reference (type of property) to the high level resource (model1)

-	 */

-	@Test

-	public void testGetReferenceInControlledRessource() {

-		URI uriProperty0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.uml", false).appendFragment("_57LlkIRSEd-ZSb15jhF0Qw");

-		EObject property0 = modelSet.getEObject(uriProperty0, true);

-		Type type = null;

-		if(property0 instanceof Property) {

-			type = ((Property)property0).getType();

-			assertTestGetDanglingReferenceFromParentResource("Get type from controlled resource is resolved", type);

-		}

-

-		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_1766sIRSEd-ZSb15jhF0Qw");

-		EObject class0 = modelSet.getEObject(uriClass0, true);

-		assertTestGetReferenceInControlledRessource("Type of property is resolved ? :", type, class0);

-	}

-

-	private void assertTestGetDanglingReferenceFromParentResource(String message, EObject eObject) {

-		switch(getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertTrue(message, !eObject.eIsProxy());

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			assertTrue(message, eObject.eIsProxy());

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			if(resourceLoaded != null && resourceLoaded.getName().contains("model1")) {

-				assertTrue(message, !eObject.eIsProxy());

-			} else {

-				// when Package0 is opened, model1 is not loaded because it is not a controlled resource

-				assertTrue(message, eObject.eIsProxy());

-			}

-			break;

-		default:

-			break;

-		}

-	}

-

-	private void assertTestGetReferenceInControlledRessource(String message, EObject eObject1, EObject eObject2) {

-		switch(getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertSame(message, eObject1, eObject2);

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			assertNotSame(message, eObject1, eObject2);

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			if(resourceLoaded != null && resourceLoaded.getName().contains("model1")) {

-				assertSame(message, eObject1, eObject2);

-			} else {

-				// when Package0 is opened, model1 is not loaded because it is not a controlled resource

-				assertNotSame(message, eObject1, eObject2);

-			}

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * Gets a figure (figure of Class0) contains in the high level resource (model1) from a diagram in controlled resource (Package0)

-	 */

-	@Test

-	public void testGetFigureInControlledRessource() {

-		URI uriFigurePackage0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.notation", false).appendFragment("_-ig9EIRSEd-ZSb15jhF0Qw");

-		EObject figurePackage0 = modelSet.getEObject(uriFigurePackage0, true);

-		assertTestGetFigureInControlledRessource1("Get figure in Package0 resource", figurePackage0);

-		EObject element = null;

-		if(figurePackage0 instanceof Node) {

-			Node node = (Node)figurePackage0;

-			element = node.getElement();

-		}

-		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_1766sIRSEd-ZSb15jhF0Qw");

-		EObject class0 = modelSet.getEObject(uriClass0, true);

-		assertTestGetFigureInControlledRessource2("Load figure from high level resource", class0, element);

-	}

-

-	private void assertTestGetFigureInControlledRessource1(String message, EObject eObject) {

-		switch(getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertTrue(message, !eObject.eIsProxy());

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			if(resourceLoaded != null && resourceLoaded.getName().contains("model1")) {

-				//assertTrue(message, eObject.eIsProxy());

-				// eObject is null, not a proxy

-				assertNull(message, eObject);

-			} else {

-				// when Package0 is opened, model1 is not loaded because it is not a controlled resource

-				assertTrue(message, !eObject.eIsProxy());

-			}

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			assertTrue(message, !eObject.eIsProxy());

-			break;

-		default:

-			break;

-		}

-	}

-

-	private void assertTestGetFigureInControlledRessource2(String message, EObject eObject1, EObject eObject2) {

-		switch(getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertSame(message, eObject1, eObject2);

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			assertNotSame(message, eObject1, eObject2);

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			if(resourceLoaded != null && resourceLoaded.getName().contains("model1")) {

-				assertSame(message, eObject1, eObject2);

-			} else {

-				// when Package0 is opened, model1 is not loaded because it is not a controlled resource

-				assertNotSame(message, eObject1, eObject2);

-			}

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@After

-	public void tearDown() throws Exception {

-		// Unload models

-		List<Resource> resources = new ArrayList<Resource>(modelSet.getResources());

-		for(Resource r : resources) {

-			try {

-				r.unload();

-			} catch (Exception e) {

-				e.printStackTrace();

-			}

-		}

-	}

-

-	/**

-	 * Creates the folder name in the specified project

-	 *

-	 * @param project

-	 * @param name

-	 * @throws CoreException

-	 */

-	private void createFolder(IProject project, String name) throws CoreException {

-		IFolder parent = project.getFolder(name);

-		if(!parent.exists()) {

-			parent.create(true, true, new NullProgressMonitor());

-		}

-		assert (parent.exists());

-	}

-

-}

+/*****************************************************************************
+ * 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) - Work around regression in URI parsing in EMF 2.9
+ *  Christian W. Damus (CEA) - bug 437217 - control-mode strategy changes interfere with later tests
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1;
+
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+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.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.StrategyChooserFixture;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.ITestConstants;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+
+/**
+ * Abstract class to test all the strategies with TestModel2
+ * - Check that a model resource is loaded when a model contains reference to it.
+ * - Check that a notation resource is loaded when a diagram contains reference to it.
+ *
+ * @author eperico
+ *
+ */
+public abstract class AbstractResourceLoadingTestModel2 extends AbstractPapyrusTest {
+
+	public static final String INITIAL_PATH = "resources/TestModel2/";
+
+	public static final String RESOURCE_URI = ITestConstants.FRAGMENT_ID + "/" + INITIAL_PATH;
+
+	private String[] resources = new String[]{ "model1", "Package0" };
+
+	private String[] extensions = new String[]{ ".di", ".notation", ".uml" };
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	protected ModelSet modelSet;
+
+	private IFile resourceLoaded;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Before
+	public void setUp() throws Exception {
+		houseKeeper.cleanUpLater(new StrategyChooserFixture(getStrategy()));
+
+		// first we need to create the test project from the plugin to the workspace test platform
+		IProject project = copyTestModelToThePlatform();
+		modelSet = houseKeeper.cleanUpLater((ModelSet)new OnDemandLoadingModelSetServiceFactory().createServiceInstance());
+		if(project != null) {
+			resourceLoaded = getResourceToLoad(project);
+			modelSet.loadModels(resourceLoaded);
+		}
+	}
+
+	/**
+	 * Copy test model from the test plugin to the platform where the tests are executed
+	 *
+	 * @return the project in the runtime platform
+	 * @throws Exception
+	 */
+	private IProject copyTestModelToThePlatform() throws Exception {
+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ITestConstants.FRAGMENT_ID);
+		IProgressMonitor monitor = new NullProgressMonitor();
+
+		if(project != null && !project.exists()) {
+			project.create(monitor);
+		}
+		project.open(monitor);
+		for(String res : resources) {
+			for(String s : extensions) {
+				IFile file = project.getFile(INITIAL_PATH + res + s);
+				// link all the models resources
+				if(!file.exists()) {
+					createFolder(project, "resources/");
+					createFolder(project, INITIAL_PATH);
+					URL url = FileLocator.find(Platform.getBundle(ITestConstants.FRAGMENT_ID), new Path(INITIAL_PATH + res + s), null);
+					URL newFile = FileLocator.resolve(url);
+
+					// encode the URI for spaces in the path
+					file.createLink(new URL(newFile.toString().replaceAll(" ", "%20")).toURI(), IResource.REPLACE, monitor);
+				}
+			}
+		}
+		project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+		return project;
+	}
+
+	/**
+	 * Gets the current resource loading strategy.
+	 *
+	 * @return the strategy
+	 */
+	public abstract int getStrategy();
+
+	/**
+	 * Gets the resource to load, the one it is opened with the papyrus editor
+	 *
+	 * @param project
+	 *        the project in which the resources should be
+	 *
+	 * @return the resource to load
+	 */
+	public abstract IFile getResourceToLoad(IProject project);
+
+	/**
+	 * Gets an object (Class0) from a reference (type of property) to the high level resource (model1)
+	 */
+	@Test
+	public void testGetReferenceInControlledRessource() {
+		URI uriProperty0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.uml", false).appendFragment("_57LlkIRSEd-ZSb15jhF0Qw");
+		EObject property0 = modelSet.getEObject(uriProperty0, true);
+		Type type = null;
+		if(property0 instanceof Property) {
+			type = ((Property)property0).getType();
+			assertTestGetDanglingReferenceFromParentResource("Get type from controlled resource is resolved", type);
+		}
+
+		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_1766sIRSEd-ZSb15jhF0Qw");
+		EObject class0 = modelSet.getEObject(uriClass0, true);
+		assertTestGetReferenceInControlledRessource("Type of property is resolved ? :", type, class0);
+	}
+
+	private void assertTestGetDanglingReferenceFromParentResource(String message, EObject eObject) {
+		switch(getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertTrue(message, !eObject.eIsProxy());
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			assertTrue(message, eObject.eIsProxy());
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			if(resourceLoaded != null && resourceLoaded.getName().contains("model1")) {
+				assertTrue(message, !eObject.eIsProxy());
+			} else {
+				// when Package0 is opened, model1 is not loaded because it is not a controlled resource
+				assertTrue(message, eObject.eIsProxy());
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	private void assertTestGetReferenceInControlledRessource(String message, EObject eObject1, EObject eObject2) {
+		switch(getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertSame(message, eObject1, eObject2);
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			assertNotSame(message, eObject1, eObject2);
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			if(resourceLoaded != null && resourceLoaded.getName().contains("model1")) {
+				assertSame(message, eObject1, eObject2);
+			} else {
+				// when Package0 is opened, model1 is not loaded because it is not a controlled resource
+				assertNotSame(message, eObject1, eObject2);
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * Gets a figure (figure of Class0) contains in the high level resource (model1) from a diagram in controlled resource (Package0)
+	 */
+	@Test
+	public void testGetFigureInControlledRessource() {
+		URI uriFigurePackage0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.notation", false).appendFragment("_-ig9EIRSEd-ZSb15jhF0Qw");
+		EObject figurePackage0 = modelSet.getEObject(uriFigurePackage0, true);
+		assertTestGetFigureInControlledRessource1("Get figure in Package0 resource", figurePackage0);
+		EObject element = null;
+		if(figurePackage0 instanceof Node) {
+			Node node = (Node)figurePackage0;
+			element = node.getElement();
+		}
+		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_1766sIRSEd-ZSb15jhF0Qw");
+		EObject class0 = modelSet.getEObject(uriClass0, true);
+		assertTestGetFigureInControlledRessource2("Load figure from high level resource", class0, element);
+	}
+
+	private void assertTestGetFigureInControlledRessource1(String message, EObject eObject) {
+		switch(getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertTrue(message, !eObject.eIsProxy());
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			if(resourceLoaded != null && resourceLoaded.getName().contains("model1")) {
+				//assertTrue(message, eObject.eIsProxy());
+				// eObject is null, not a proxy
+				assertNull(message, eObject);
+			} else {
+				// when Package0 is opened, model1 is not loaded because it is not a controlled resource
+				assertTrue(message, !eObject.eIsProxy());
+			}
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			assertTrue(message, !eObject.eIsProxy());
+			break;
+		default:
+			break;
+		}
+	}
+
+	private void assertTestGetFigureInControlledRessource2(String message, EObject eObject1, EObject eObject2) {
+		switch(getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertSame(message, eObject1, eObject2);
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			assertNotSame(message, eObject1, eObject2);
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			if(resourceLoaded != null && resourceLoaded.getName().contains("model1")) {
+				assertSame(message, eObject1, eObject2);
+			} else {
+				// when Package0 is opened, model1 is not loaded because it is not a controlled resource
+				assertNotSame(message, eObject1, eObject2);
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@After
+	public void tearDown() throws Exception {
+		// Unload models
+		List<Resource> resources = new ArrayList<Resource>(modelSet.getResources());
+		for(Resource r : resources) {
+			try {
+				r.unload();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * Creates the folder name in the specified project
+	 *
+	 * @param project
+	 * @param name
+	 * @throws CoreException
+	 */
+	private void createFolder(IProject project, String name) throws CoreException {
+		IFolder parent = project.getFolder(name);
+		if(!parent.exists()) {
+			parent.create(true, true, new NullProgressMonitor());
+		}
+		assert (parent.exists());
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy0TestModel1.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy0TestModel1.java
index 097ceba74c5..72be7e0370e 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy0TestModel1.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy0TestModel1.java
@@ -1,30 +1,30 @@
-/*****************************************************************************

- * 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.tests.testModel1;

-

-/**

- * Test strategy 0 = Load all the needed resources

- * 

- * @author eperico

- * 

- */

-public class Strategy0TestModel1 extends AbstractResourceLoadingTestModel1 {

-

-	@Override

-	public int getStrategy() {

-		// Load all the needed resources

-		return 0;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+  *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1;
+
+/**
+ * Test strategy 0 = Load all the needed resources
+ * 
+ * @author eperico
+ * 
+ */
+public class Strategy0TestModel1 extends AbstractResourceLoadingTestModel1 {
+
+	@Override
+	public int getStrategy() {
+		// Load all the needed resources
+		return 0;
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy1TestModel1.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy1TestModel1.java
index 3db1a6152b3..7e7484cdee0 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy1TestModel1.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy1TestModel1.java
@@ -1,30 +1,30 @@
-/*****************************************************************************

- * 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.tests.testModel1;

-

-/**

- * Test strategy 1 = Load the additional resources (profile and pathmap). Controlled resources are not loaded

- * 

- * @author eperico

- * 

- */

-public class Strategy1TestModel1 extends AbstractResourceLoadingTestModel1 {

-

-	@Override

-	public int getStrategy() {

-		// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-		return 1;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1;
+
+/**
+ * Test strategy 1 = Load the additional resources (profile and pathmap). Controlled resources are not loaded
+ * 
+ * @author eperico
+ * 
+ */
+public class Strategy1TestModel1 extends AbstractResourceLoadingTestModel1 {
+
+	@Override
+	public int getStrategy() {
+		// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+		return 1;
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy2TestModel1.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy2TestModel1.java
index d7ae77535e7..b9c14f30aea 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy2TestModel1.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel1/Strategy2TestModel1.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * 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.tests.testModel1;

-

-

-

-/**

- * Test strategy 2 = Load the additional resources (profile and pathmap) and the needed controlled resources

- * 

- * @author eperico

- * 

- */

-public class Strategy2TestModel1 extends AbstractResourceLoadingTestModel1 {

-

-	@Override

-	public int getStrategy() {

-		// Load the additional resources (profile and pathmap) and the needed controlled resources

-		return 2;

-	}

-}

+/*****************************************************************************
+ * 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.tests.testModel1;
+
+
+
+/**
+ * Test strategy 2 = Load the additional resources (profile and pathmap) and the needed controlled resources
+ * 
+ * @author eperico
+ * 
+ */
+public class Strategy2TestModel1 extends AbstractResourceLoadingTestModel1 {
+
+	@Override
+	public int getStrategy() {
+		// Load the additional resources (profile and pathmap) and the needed controlled resources
+		return 2;
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java
index 34b34faaa09..f8cffd8b447 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java
@@ -1,306 +1,306 @@
-/*****************************************************************************

- * 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) - Work around regression in URI parsing in EMF 2.9

- *  Christian W. Damus (CEA) - bug 437217 - control-mode strategy changes interfere with later tests

- *

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

-package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2;

-

-import static org.junit.Assert.assertNotSame;

-import static org.junit.Assert.assertNull;

-import static org.junit.Assert.assertSame;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-import java.util.List;

-

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory;

-import org.eclipse.papyrus.infra.services.resourceloading.tests.StrategyChooserFixture;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

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

-import org.eclipse.uml2.uml.Type;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-

-/**

- * Abstract class to test all the strategies with TestModel2

- * - Check that a model resource is loaded when a model contains reference to it.

- * - Check that a notation resource is loaded when a diagram contains reference to it.

- *

- * @author eperico

- *

- */

-public abstract class AbstractResourceLoadingTestModel2 extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	public static final String INITIAL_PATH = "resources/TestModel2/";

-

-	public static final String RESOURCE_URI = ITestConstants.FRAGMENT_ID + "/" + INITIAL_PATH;

-

-	private String[] resources = new String[] { "model1", "Package0" };

-

-	private String[] extensions = new String[] { ".di", ".notation", ".uml" };

-

-	protected ModelSet modelSet;

-

-	private IFile resourceLoaded;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Before

-	public void setUp() throws Exception {

-		houseKeeper.cleanUpLater(new StrategyChooserFixture(getStrategy()));

-

-		// first we need to create the test project from the plugin to the workspace test platform

-		IProject project = copyTestModelToThePlatform();

-		modelSet = houseKeeper.cleanUpLater((ModelSet) new OnDemandLoadingModelSetServiceFactory().createServiceInstance());

-		if (project != null) {

-			resourceLoaded = getResourceToLoad(project);

-			modelSet.loadModels(resourceLoaded);

-		}

-	}

-

-	/**

-	 * Copy test model from the test plugin to the platform where the tests are executed

-	 *

-	 * @return the project in the runtime platform

-	 * @throws Exception

-	 */

-	private IProject copyTestModelToThePlatform() throws Exception {

-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ITestConstants.FRAGMENT_ID);

-		IProgressMonitor monitor = new NullProgressMonitor();

-

-		if (project != null && !project.exists()) {

-			project.create(monitor);

-		}

-

-		project.open(monitor);

-

-		for (String res : resources) {

-			for (String s : extensions) {

-				IFile file = project.getFile(INITIAL_PATH + res + s);

-				// link all the models resources

-				if (!file.exists()) {

-					createFolder(project, "resources/");

-					createFolder(project, INITIAL_PATH);

-

-					String sourcePath = INITIAL_PATH + res + s;

-					houseKeeper.createFile(project, sourcePath, sourcePath);

-				}

-			}

-		}

-		project.refreshLocal(IResource.DEPTH_INFINITE, monitor);

-		return project;

-	}

-

-	/**

-	 * Gets the current resource loading strategy.

-	 *

-	 * @return the strategy

-	 */

-	public abstract int getStrategy();

-

-	/**

-	 * Gets the resource to load, the one it is opened with the papyrus editor

-	 *

-	 * @param project

-	 *            the project in which the resources should be

-	 *

-	 * @return the resource to load

-	 */

-	public abstract IFile getResourceToLoad(IProject project);

-

-	/**

-	 * Gets an object (Class0) from a reference (type of property) to the high level resource (model1)

-	 */

-	@Test

-	public void testGetReferenceInControlledRessource() {

-		URI uriProperty0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.uml", false).appendFragment("_57LlkIRSEd-ZSb15jhF0Qw");

-		EObject property0 = modelSet.getEObject(uriProperty0, true);

-		Type type = null;

-		if (property0 instanceof Property) {

-			type = ((Property) property0).getType();

-			assertTestGetDanglingReferenceFromParentResource("Get type from controlled resource is resolved", type);

-		}

-

-		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_1766sIRSEd-ZSb15jhF0Qw");

-		EObject class0 = modelSet.getEObject(uriClass0, true);

-		assertTestGetReferenceInControlledRessource("Type of property is resolved ? :", type, class0);

-	}

-

-	private void assertTestGetDanglingReferenceFromParentResource(String message, EObject eObject) {

-		switch (getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertTrue(message, !eObject.eIsProxy());

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			assertTrue(message, eObject.eIsProxy());

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			if (resourceLoaded != null && resourceLoaded.getName().contains("model1")) {

-				assertTrue(message, !eObject.eIsProxy());

-			} else {

-				// when Package0 is opened, model1 is not loaded because it is not a controlled resource

-				assertTrue(message, eObject.eIsProxy());

-			}

-			break;

-		default:

-			break;

-		}

-	}

-

-	private void assertTestGetReferenceInControlledRessource(String message, EObject eObject1, EObject eObject2) {

-		switch (getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertSame(message, eObject1, eObject2);

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			assertNotSame(message, eObject1, eObject2);

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			if (resourceLoaded != null && resourceLoaded.getName().contains("model1")) {

-				assertSame(message, eObject1, eObject2);

-			} else {

-				// when Package0 is opened, model1 is not loaded because it is not a controlled resource

-				assertNotSame(message, eObject1, eObject2);

-			}

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * Gets a figure (figure of Class0) contains in the high level resource (model1) from a diagram in controlled resource (Package0)

-	 */

-	@Test

-	public void testGetFigureInControlledRessource() {

-		URI uriFigurePackage0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.notation", false).appendFragment("_-ig9EIRSEd-ZSb15jhF0Qw");

-		EObject figurePackage0 = modelSet.getEObject(uriFigurePackage0, true);

-		assertTestGetFigureInControlledRessource1("Get figure in Package0 resource", figurePackage0);

-		EObject element = null;

-		if (figurePackage0 instanceof Node) {

-			Node node = (Node) figurePackage0;

-			element = node.getElement();

-		}

-		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_1766sIRSEd-ZSb15jhF0Qw");

-		EObject class0 = modelSet.getEObject(uriClass0, true);

-		assertTestGetFigureInControlledRessource2("Load figure from high level resource", class0, element);

-	}

-

-	private void assertTestGetFigureInControlledRessource1(String message, EObject eObject) {

-		switch (getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertTrue(message, !eObject.eIsProxy());

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			if (resourceLoaded != null && resourceLoaded.getName().contains("model1")) {

-				// assertTrue(message, eObject.eIsProxy());

-				// eObject is null, not a proxy

-				assertNull(message, eObject);

-			} else {

-				// when Package0 is opened, model1 is not loaded because it is not a controlled resource

-				assertTrue(message, !eObject.eIsProxy());

-			}

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			assertTrue(message, !eObject.eIsProxy());

-			break;

-		default:

-			break;

-		}

-	}

-

-	private void assertTestGetFigureInControlledRessource2(String message, EObject eObject1, EObject eObject2) {

-		switch (getStrategy()) {

-		case 0:

-			// Load all the needed resources

-			assertSame(message, eObject1, eObject2);

-			break;

-		case 1:

-			// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-			assertNotSame(message, eObject1, eObject2);

-			break;

-		case 2:

-			// Load the additional resources (profile and pathmap) and the needed controlled resources

-			if (resourceLoaded != null && resourceLoaded.getName().contains("model1")) {

-				assertSame(message, eObject1, eObject2);

-			} else {

-				// when Package0 is opened, model1 is not loaded because it is not a controlled resource

-				assertNotSame(message, eObject1, eObject2);

-			}

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@After

-	public void tearDown() throws Exception {

-		// Unload models

-		List<Resource> resources = new ArrayList<Resource>(modelSet.getResources());

-		for (Resource r : resources) {

-			try {

-				r.unload();

-			} catch (Exception e) {

-				e.printStackTrace();

-			}

-		}

-	}

-

-	/**

-	 * Creates the folder name in the specified project

-	 *

-	 * @param project

-	 * @param name

-	 * @throws CoreException

-	 */

-	private void createFolder(IProject project, String name) throws CoreException {

-		IFolder parent = project.getFolder(name);

-		if (!parent.exists()) {

-			parent.create(true, true, new NullProgressMonitor());

-		}

-		assert (parent.exists());

-	}

-

-}

+/*****************************************************************************
+ * 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) - Work around regression in URI parsing in EMF 2.9
+ *  Christian W. Damus (CEA) - bug 437217 - control-mode strategy changes interfere with later tests
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2;
+
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory;
+import org.eclipse.papyrus.infra.services.resourceloading.tests.StrategyChooserFixture;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+
+/**
+ * Abstract class to test all the strategies with TestModel2
+ * - Check that a model resource is loaded when a model contains reference to it.
+ * - Check that a notation resource is loaded when a diagram contains reference to it.
+ *
+ * @author eperico
+ *
+ */
+public abstract class AbstractResourceLoadingTestModel2 extends AbstractPapyrusTest {
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	public static final String INITIAL_PATH = "resources/TestModel2/";
+
+	public static final String RESOURCE_URI = ITestConstants.FRAGMENT_ID + "/" + INITIAL_PATH;
+
+	private String[] resources = new String[] { "model1", "Package0" };
+
+	private String[] extensions = new String[] { ".di", ".notation", ".uml" };
+
+	protected ModelSet modelSet;
+
+	private IFile resourceLoaded;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Before
+	public void setUp() throws Exception {
+		houseKeeper.cleanUpLater(new StrategyChooserFixture(getStrategy()));
+
+		// first we need to create the test project from the plugin to the workspace test platform
+		IProject project = copyTestModelToThePlatform();
+		modelSet = houseKeeper.cleanUpLater((ModelSet) new OnDemandLoadingModelSetServiceFactory().createServiceInstance());
+		if (project != null) {
+			resourceLoaded = getResourceToLoad(project);
+			modelSet.loadModels(resourceLoaded);
+		}
+	}
+
+	/**
+	 * Copy test model from the test plugin to the platform where the tests are executed
+	 *
+	 * @return the project in the runtime platform
+	 * @throws Exception
+	 */
+	private IProject copyTestModelToThePlatform() throws Exception {
+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ITestConstants.FRAGMENT_ID);
+		IProgressMonitor monitor = new NullProgressMonitor();
+
+		if (project != null && !project.exists()) {
+			project.create(monitor);
+		}
+
+		project.open(monitor);
+
+		for (String res : resources) {
+			for (String s : extensions) {
+				IFile file = project.getFile(INITIAL_PATH + res + s);
+				// link all the models resources
+				if (!file.exists()) {
+					createFolder(project, "resources/");
+					createFolder(project, INITIAL_PATH);
+
+					String sourcePath = INITIAL_PATH + res + s;
+					houseKeeper.createFile(project, sourcePath, sourcePath);
+				}
+			}
+		}
+		project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+		return project;
+	}
+
+	/**
+	 * Gets the current resource loading strategy.
+	 *
+	 * @return the strategy
+	 */
+	public abstract int getStrategy();
+
+	/**
+	 * Gets the resource to load, the one it is opened with the papyrus editor
+	 *
+	 * @param project
+	 *            the project in which the resources should be
+	 *
+	 * @return the resource to load
+	 */
+	public abstract IFile getResourceToLoad(IProject project);
+
+	/**
+	 * Gets an object (Class0) from a reference (type of property) to the high level resource (model1)
+	 */
+	@Test
+	public void testGetReferenceInControlledRessource() {
+		URI uriProperty0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.uml", false).appendFragment("_57LlkIRSEd-ZSb15jhF0Qw");
+		EObject property0 = modelSet.getEObject(uriProperty0, true);
+		Type type = null;
+		if (property0 instanceof Property) {
+			type = ((Property) property0).getType();
+			assertTestGetDanglingReferenceFromParentResource("Get type from controlled resource is resolved", type);
+		}
+
+		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_1766sIRSEd-ZSb15jhF0Qw");
+		EObject class0 = modelSet.getEObject(uriClass0, true);
+		assertTestGetReferenceInControlledRessource("Type of property is resolved ? :", type, class0);
+	}
+
+	private void assertTestGetDanglingReferenceFromParentResource(String message, EObject eObject) {
+		switch (getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertTrue(message, !eObject.eIsProxy());
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			assertTrue(message, eObject.eIsProxy());
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			if (resourceLoaded != null && resourceLoaded.getName().contains("model1")) {
+				assertTrue(message, !eObject.eIsProxy());
+			} else {
+				// when Package0 is opened, model1 is not loaded because it is not a controlled resource
+				assertTrue(message, eObject.eIsProxy());
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	private void assertTestGetReferenceInControlledRessource(String message, EObject eObject1, EObject eObject2) {
+		switch (getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertSame(message, eObject1, eObject2);
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			assertNotSame(message, eObject1, eObject2);
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			if (resourceLoaded != null && resourceLoaded.getName().contains("model1")) {
+				assertSame(message, eObject1, eObject2);
+			} else {
+				// when Package0 is opened, model1 is not loaded because it is not a controlled resource
+				assertNotSame(message, eObject1, eObject2);
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * Gets a figure (figure of Class0) contains in the high level resource (model1) from a diagram in controlled resource (Package0)
+	 */
+	@Test
+	public void testGetFigureInControlledRessource() {
+		URI uriFigurePackage0 = URI.createPlatformResourceURI(RESOURCE_URI + "Package0.notation", false).appendFragment("_-ig9EIRSEd-ZSb15jhF0Qw");
+		EObject figurePackage0 = modelSet.getEObject(uriFigurePackage0, true);
+		assertTestGetFigureInControlledRessource1("Get figure in Package0 resource", figurePackage0);
+		EObject element = null;
+		if (figurePackage0 instanceof Node) {
+			Node node = (Node) figurePackage0;
+			element = node.getElement();
+		}
+		URI uriClass0 = URI.createPlatformResourceURI(RESOURCE_URI + "model1.uml", false).appendFragment("_1766sIRSEd-ZSb15jhF0Qw");
+		EObject class0 = modelSet.getEObject(uriClass0, true);
+		assertTestGetFigureInControlledRessource2("Load figure from high level resource", class0, element);
+	}
+
+	private void assertTestGetFigureInControlledRessource1(String message, EObject eObject) {
+		switch (getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertTrue(message, !eObject.eIsProxy());
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			if (resourceLoaded != null && resourceLoaded.getName().contains("model1")) {
+				// assertTrue(message, eObject.eIsProxy());
+				// eObject is null, not a proxy
+				assertNull(message, eObject);
+			} else {
+				// when Package0 is opened, model1 is not loaded because it is not a controlled resource
+				assertTrue(message, !eObject.eIsProxy());
+			}
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			assertTrue(message, !eObject.eIsProxy());
+			break;
+		default:
+			break;
+		}
+	}
+
+	private void assertTestGetFigureInControlledRessource2(String message, EObject eObject1, EObject eObject2) {
+		switch (getStrategy()) {
+		case 0:
+			// Load all the needed resources
+			assertSame(message, eObject1, eObject2);
+			break;
+		case 1:
+			// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+			assertNotSame(message, eObject1, eObject2);
+			break;
+		case 2:
+			// Load the additional resources (profile and pathmap) and the needed controlled resources
+			if (resourceLoaded != null && resourceLoaded.getName().contains("model1")) {
+				assertSame(message, eObject1, eObject2);
+			} else {
+				// when Package0 is opened, model1 is not loaded because it is not a controlled resource
+				assertNotSame(message, eObject1, eObject2);
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@After
+	public void tearDown() throws Exception {
+		// Unload models
+		List<Resource> resources = new ArrayList<Resource>(modelSet.getResources());
+		for (Resource r : resources) {
+			try {
+				r.unload();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * Creates the folder name in the specified project
+	 *
+	 * @param project
+	 * @param name
+	 * @throws CoreException
+	 */
+	private void createFolder(IProject project, String name) throws CoreException {
+		IFolder parent = project.getFolder(name);
+		if (!parent.exists()) {
+			parent.create(true, true, new NullProgressMonitor());
+		}
+		assert (parent.exists());
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/ITestConstants.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/ITestConstants.java
index 49c29b3b23b..c9bf9b2962a 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/ITestConstants.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/ITestConstants.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.infra.services.resourceloading.tests.testModel2;

-

-

-/**

- * interface that contains all constants for the project

- */

-public interface ITestConstants {

-

-	/** id of the fragment */

-	public static final String FRAGMENT_ID = "org.eclipse.papyrus.infra.services.resourceloading.tests";

-}

+/*****************************************************************************
+ * 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.services.resourceloading.tests.testModel2;
+
+
+/**
+ * interface that contains all constants for the project
+ */
+public interface ITestConstants {
+
+	/** id of the fragment */
+	public static final String FRAGMENT_ID = "org.eclipse.papyrus.infra.services.resourceloading.tests";
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy0TestModel2WithModel1.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy0TestModel2WithModel1.java
index 88043fe0c42..dff2f44a162 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy0TestModel2WithModel1.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy0TestModel2WithModel1.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:

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

- *

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

-package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2;

-

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

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

-

-/**

- * Test strategy 0 = Load all the needed resources

- * The model opened is model1 (high level resource)

- * 

- * @author eperico

- * 

- */

-public class Strategy0TestModel2WithModel1 extends AbstractResourceLoadingTestModel2 {

-

-	@Override

-	public int getStrategy() {

-		// Load all the needed resources

-		return 0;

-	}

-	

-	@Override

-	public IFile getResourceToLoad(IProject project) {

-		return project.getFile(INITIAL_PATH + "model1.di");

-	}

-

-}

+/*****************************************************************************
+ * 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.tests.testModel2;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+
+/**
+ * Test strategy 0 = Load all the needed resources
+ * The model opened is model1 (high level resource)
+ * 
+ * @author eperico
+ * 
+ */
+public class Strategy0TestModel2WithModel1 extends AbstractResourceLoadingTestModel2 {
+
+	@Override
+	public int getStrategy() {
+		// Load all the needed resources
+		return 0;
+	}
+	
+	@Override
+	public IFile getResourceToLoad(IProject project) {
+		return project.getFile(INITIAL_PATH + "model1.di");
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy0TestModel2WithPackage0.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy0TestModel2WithPackage0.java
index 47d6b3e8704..c6282a14ffd 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy0TestModel2WithPackage0.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy0TestModel2WithPackage0.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:

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

- *

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

-package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2;

-

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

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

-

-/**

- * Test strategy 0 = Load all the needed resources

- * The model opened is Package0 (controlled resource)

- * 

- * @author eperico

- * 

- */

-public class Strategy0TestModel2WithPackage0 extends AbstractResourceLoadingTestModel2 {

-

-	@Override

-	public int getStrategy() {

-		// Load all the needed resources

-		return 0;

-	}

-	

-	@Override

-	public IFile getResourceToLoad(IProject project) {

-		return project.getFile(INITIAL_PATH + "Package0.di");

-	}

-

-}

+/*****************************************************************************
+ * 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.tests.testModel2;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+
+/**
+ * Test strategy 0 = Load all the needed resources
+ * The model opened is Package0 (controlled resource)
+ * 
+ * @author eperico
+ * 
+ */
+public class Strategy0TestModel2WithPackage0 extends AbstractResourceLoadingTestModel2 {
+
+	@Override
+	public int getStrategy() {
+		// Load all the needed resources
+		return 0;
+	}
+	
+	@Override
+	public IFile getResourceToLoad(IProject project) {
+		return project.getFile(INITIAL_PATH + "Package0.di");
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy1TestModel2WithModel1.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy1TestModel2WithModel1.java
index 02b925daabe..6706cd09455 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy1TestModel2WithModel1.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy1TestModel2WithModel1.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:

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

- *

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

-package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2;

-

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

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

-

-/**

- * Test strategy 1 = Load the additional resources (profile and pathmap). Controlled resources are not loaded

- * The model opened is model1 (high level resource)

- * 

- * @author eperico

- * 

- */

-public class Strategy1TestModel2WithModel1 extends AbstractResourceLoadingTestModel2 {

-

-	@Override

-	public int getStrategy() {

-		// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-		return 1;

-	}

-

-	@Override

-	public IFile getResourceToLoad(IProject project) {

-		return project.getFile(INITIAL_PATH + "model1.di");

-	}

-

-}

+/*****************************************************************************
+ * 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.tests.testModel2;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+
+/**
+ * Test strategy 1 = Load the additional resources (profile and pathmap). Controlled resources are not loaded
+ * The model opened is model1 (high level resource)
+ * 
+ * @author eperico
+ * 
+ */
+public class Strategy1TestModel2WithModel1 extends AbstractResourceLoadingTestModel2 {
+
+	@Override
+	public int getStrategy() {
+		// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+		return 1;
+	}
+
+	@Override
+	public IFile getResourceToLoad(IProject project) {
+		return project.getFile(INITIAL_PATH + "model1.di");
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy1TestModel2WithPackage0.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy1TestModel2WithPackage0.java
index ec920fd866a..3d52ca73677 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy1TestModel2WithPackage0.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy1TestModel2WithPackage0.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:

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

- *

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

-package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2;

-

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

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

-

-/**

- * Test strategy 1 = Load the additional resources (profile and pathmap). Controlled resources are not loaded

- * The model opened is Package0 (controlled resource)

- * 

- * @author eperico

- * 

- */

-public class Strategy1TestModel2WithPackage0 extends AbstractResourceLoadingTestModel2 {

-

-	@Override

-	public int getStrategy() {

-		// Load the additional resources (profile and pathmap). Controlled resources are not loaded

-		return 1;

-	}

-

-	@Override

-	public IFile getResourceToLoad(IProject project) {

-		return project.getFile(INITIAL_PATH + "Package0.di");

-	}

-

-}

+/*****************************************************************************
+ * 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.tests.testModel2;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+
+/**
+ * Test strategy 1 = Load the additional resources (profile and pathmap). Controlled resources are not loaded
+ * The model opened is Package0 (controlled resource)
+ * 
+ * @author eperico
+ * 
+ */
+public class Strategy1TestModel2WithPackage0 extends AbstractResourceLoadingTestModel2 {
+
+	@Override
+	public int getStrategy() {
+		// Load the additional resources (profile and pathmap). Controlled resources are not loaded
+		return 1;
+	}
+
+	@Override
+	public IFile getResourceToLoad(IProject project) {
+		return project.getFile(INITIAL_PATH + "Package0.di");
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy2TestModel2WithModel1.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy2TestModel2WithModel1.java
index 682e2fe6332..f6946ec9a09 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy2TestModel2WithModel1.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy2TestModel2WithModel1.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2;

-

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

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

-

-

-/**

- * Test strategy 2 = Load the additional resources (profile and pathmap) and the needed controlled resources

- * The model opened is model1 (high level resource)

- * 

- * @author eperico

- * 

- */

-public class Strategy2TestModel2WithModel1 extends AbstractResourceLoadingTestModel2 {

-

-	@Override

-	public int getStrategy() {

-		// Load the additional resources (profile and pathmap) and the needed controlled resources

-		return 2;

-	}

-	

-	@Override

-	public IFile getResourceToLoad(IProject project) {

-		return project.getFile(INITIAL_PATH + "model1.di");

-	}

-	

-}

+/*****************************************************************************
+ * 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.tests.testModel2;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+
+
+/**
+ * Test strategy 2 = Load the additional resources (profile and pathmap) and the needed controlled resources
+ * The model opened is model1 (high level resource)
+ * 
+ * @author eperico
+ * 
+ */
+public class Strategy2TestModel2WithModel1 extends AbstractResourceLoadingTestModel2 {
+
+	@Override
+	public int getStrategy() {
+		// Load the additional resources (profile and pathmap) and the needed controlled resources
+		return 2;
+	}
+	
+	@Override
+	public IFile getResourceToLoad(IProject project) {
+		return project.getFile(INITIAL_PATH + "model1.di");
+	}
+	
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy2TestModel2WithPackage0.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy2TestModel2WithPackage0.java
index c38ae72b655..4308532989b 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy2TestModel2WithPackage0.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/testModel2/Strategy2TestModel2WithPackage0.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2;

-

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

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

-

-

-/**

- * Test strategy 2 = Load the additional resources (profile and pathmap) and the needed controlled resources

- * The model opened is Package0 (controlled resource)

- * 

- * @author eperico

- * 

- */

-public class Strategy2TestModel2WithPackage0 extends AbstractResourceLoadingTestModel2 {

-

-	@Override

-	public int getStrategy() {

-		// Load the additional resources (profile and pathmap) and the needed controlled resources

-		return 2;

-	}

-	

-	@Override

-	public IFile getResourceToLoad(IProject project) {

-		return project.getFile(INITIAL_PATH + "Package0.di");

-	}

-	

-}

+/*****************************************************************************
+ * 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.tests.testModel2;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+
+
+/**
+ * Test strategy 2 = Load the additional resources (profile and pathmap) and the needed controlled resources
+ * The model opened is Package0 (controlled resource)
+ * 
+ * @author eperico
+ * 
+ */
+public class Strategy2TestModel2WithPackage0 extends AbstractResourceLoadingTestModel2 {
+
+	@Override
+	public int getStrategy() {
+		// Load the additional resources (profile and pathmap) and the needed controlled resources
+		return 2;
+	}
+	
+	@Override
+	public IFile getResourceToLoad(IProject project) {
+		return project.getFile(INITIAL_PATH + "Package0.di");
+	}
+	
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF
index 5ce211f8c68..8f09c3fd0ce 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

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

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

- org.eclipse.papyrus.junit.utils;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.services.semantic;bundle-version="[2.0.0,3.0.0)",

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

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

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

-Export-Package: org.eclipse.papyrus.infra.services.semantic.tests

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.junit.utils;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.services.semantic;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.services.semantic.tests
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF
index 0253b687203..4a9897db98a 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

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

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

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

- org.junit;bundle-version="4.10.0",

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

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

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

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

-Export-Package: org.eclipse.papyrus.infra.types.tests

-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.types.tests.Activator

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.infra.types.tests
+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.types.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/about.html b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/about.html
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/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/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/cyclicAdvices.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/cyclicAdvices.elementtypesconfigurations
index 0fe94f8fa89..ee5c22c07a3 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/cyclicAdvices.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/cyclicAdvices.elementtypesconfigurations
@@ -1,12 +1,12 @@
-<?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.tests.cyclicAdvices.elementtypesconfigurations" name="Test cyclic edvices dependencies" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" after="_nSyIoLK-EeWUIbTgfwAP3g _ojuzILK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice1" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" before="_SGAo4LK-EeWUIbTgfwAP3g" after="_ojuzILK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice2" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" before="_SGAo4LK-EeWUIbTgfwAP3g _nSyIoLK-EeWUIbTgfwAP3g" after="_SGAo4LK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice3" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </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.tests.cyclicAdvices.elementtypesconfigurations" name="Test cyclic edvices dependencies" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" after="_nSyIoLK-EeWUIbTgfwAP3g _ojuzILK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice1" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1">
+    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" before="_SGAo4LK-EeWUIbTgfwAP3g" after="_ojuzILK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice2" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2">
+    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" before="_SGAo4LK-EeWUIbTgfwAP3g _nSyIoLK-EeWUIbTgfwAP3g" after="_SGAo4LK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice3" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3">
+    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/elementtypetest.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/elementtypetest.elementtypesconfigurations
index 729d227b3e8..7cd33629583 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/elementtypetest.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/elementtypetest.elementtypesconfigurations
@@ -1,109 +1,109 @@
-<?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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:invariantcontainerrule="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1" xmlns:invariantstereotyperule="http://www.eclipse.org/papyrus/uml/types/invariantstereotyperule/1.1" xmlns:rulebased="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1" xmlns:setvaluesadvice="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.infra.types.tests.tests" name="Test element types" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.specificcomponent" description="" identifier="org.eclipse.papyrus.infra.types.tests.specificcomponent" name="Component in specific package only" hint="ElementTypes">

-    <iconEntry xmi:id="_FW5wwLg-EeS0cu6lbJ9jDQ" iconPath="icons/full/obj16/add_obj.gif" bundleId="org.eclipse.ui"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>

-    <ruleConfiguration xsi:type="invariantcontainerrule:InvariantContainerRuleConfiguration" xmi:id="_N9YeYLg-EeS0cu6lbJ9jDQ">

-      <permissions xmi:id="_Ow-egLg-EeS0cu6lbJ9jDQ" containerType="org.eclipse.papyrus.uml.Package"/>

-      <permissions xmi:id="_QsZCULg-EeS0cu6lbJ9jDQ" containerType="org.eclipse.papyrus.infra.types.tests.packagewithcomponentsonly" permitted="true" strict="true"/>

-    </ruleConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.packagewithcomponentsonly" description="Package that can contain only components" identifier="org.eclipse.papyrus.infra.types.tests.packagewithcomponentsonly" name="PackageWithComponentsOnly" hint="ElementTypes">

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>

-    <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_mzVEQLg-EeS0cu6lbJ9jDQ" stereotypeQualifiedName="ElementTypesTestsProfile::PackageWithComponents" requiredProfile=""/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.aspectabstractclass" description="Semantic element type to create abstract classes" identifier="org.eclipse.papyrus.infra.types.tests.aspectabstractclass" name="Abstract Class Creation Action" hint="Abstract Class Creation Action">

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_qI4JwNLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype" name="Class With Stereotype" hint="ElementElementTypeConfigurations">

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_8kqIkNLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename" name="Package With Stereotype And Renamed" hint="ElementElementTypeConfigurations">

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_8yABANLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues" name="Package With Stereotype And Renamed" hint="ElementElementTypeConfigurations">

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_8-EHENLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype" name="Package With Stereotype And Renamed" hint="ElementElementTypeConfigurations">

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_9KgAkNLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="#org.eclipse.papyrus.infra.types.tests.aspectabstractclass"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="setvaluesadvice:SetValuesAdviceConfiguration" xmi:id="_6Zq8QLg_EeS0cu6lbJ9jDQ" description="Aspect Semantic element type to create abstract classes" identifier="org.eclipse.papyrus.infra.types.tests.aspectabstractclass.advice" target="org.eclipse.papyrus.infra.types.tests.aspectabstractclass">

-    <featuresToSet xmi:id="_7FIUELg_EeS0cu6lbJ9jDQ" featureName="isAbstract">

-      <value xsi:type="setvaluesadvice:ConstantValue" xmi:id="_-d4_oLg_EeS0cu6lbJ9jDQ">

-        <valueInstance xsi:type="uml:LiteralBoolean" xmi:id="__mUnULg_EeS0cu6lbJ9jDQ" value="true"/>

-      </value>

-    </featuresToSet>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_NEmxYLhAEeS0cu6lbJ9jDQ" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype.advice" target="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype">

-    <stereotypesToApply xmi:id="_PuEG8LhAEeS0cu6lbJ9jDQ" stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet">

-      <requiredProfiles>ElementTypesTestProfile</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_Z3bfkMy4EeS2aYvfnAB4ZA" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename.advice" target="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename">

-    <stereotypesToApply xmi:id="_Z3bfkcy4EeS2aYvfnAB4ZA" stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true">

-      <requiredProfiles>ElementTypesTestProfile</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_havkELhAEeS0cu6lbJ9jDQ" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues.advice" target="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues">

-    <stereotypesToApply xmi:id="_vA53wLhAEeS0cu6lbJ9jDQ" stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true">

-      <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>

-      <featuresToSet xmi:id="__E3qoLhAEeS0cu6lbJ9jDQ" featureName="stringFeature">

-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_DFSzILhBEeS0cu6lbJ9jDQ">

-          <valueInstance xsi:type="uml:LiteralString" xmi:id="_MDKGALhBEeS0cu6lbJ9jDQ" value="MyStringValue"/>

-        </value>

-      </featuresToSet>

-      <featuresToSet xmi:id="_A8odgLhBEeS0cu6lbJ9jDQ" featureName="value">

-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_Eb_gULhBEeS0cu6lbJ9jDQ">

-          <valueInstance xsi:type="uml:LiteralInteger" xmi:id="_Gt4qcLhBEeS0cu6lbJ9jDQ" value="3"/>

-        </value>

-      </featuresToSet>

-      <featuresToSet xmi:id="_BSTykLhBEeS0cu6lbJ9jDQ" featureName="boolean">

-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_ExAHALhBEeS0cu6lbJ9jDQ">

-          <valueInstance xsi:type="uml:LiteralBoolean" xmi:id="_QFRQkLhBEeS0cu6lbJ9jDQ" value="true"/>

-        </value>

-      </featuresToSet>

-      <featuresToSet xmi:id="_Bm_pILhBEeS0cu6lbJ9jDQ" featureName="enumeration">

-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_FFqIYLhBEeS0cu6lbJ9jDQ">

-          <valueInstance xsi:type="uml:InstanceValue" xmi:id="_VToy4LhBEeS0cu6lbJ9jDQ">

-            <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>

-          </valueInstance>

-        </value>

-      </featuresToSet>

-      <featuresToSet xmi:id="_B7jj4LhBEeS0cu6lbJ9jDQ" featureName="multiStrings">

-        <value xsi:type="applystereotypeadvice:ListValue" xmi:id="_rQRXYLhDEeS0cu6lbJ9jDQ"/>

-      </featuresToSet>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ls9AILhAEeS0cu6lbJ9jDQ" identifier="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype.advice" target="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype">

-    <stereotypesToApply xmi:id="_u0-NMLhDEeS0cu6lbJ9jDQ" stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeatureToSet">

-      <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>

-      <featuresToSet xmi:id="_6XspgLhDEeS0cu6lbJ9jDQ" featureName="stringFeature">

-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_7YVAELhDEeS0cu6lbJ9jDQ">

-          <valueInstance xsi:type="uml:LiteralString" xmi:id="_-BmvcLhDEeS0cu6lbJ9jDQ" name="" value="MyOtherValue"/>

-        </value>

-      </featuresToSet>

-      <featuresToSet xmi:id="_Bj7msLhEEeS0cu6lbJ9jDQ" featureName="value">

-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_Dd4x8LhEEeS0cu6lbJ9jDQ">

-          <valueInstance xsi:type="uml:LiteralInteger" xmi:id="_HdrBQLhEEeS0cu6lbJ9jDQ" value="18"/>

-        </value>

-      </featuresToSet>

-      <featuresToSet xmi:id="_CKkv8LhEEeS0cu6lbJ9jDQ" featureName="boolean">

-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_It5TALhEEeS0cu6lbJ9jDQ">

-          <valueInstance xsi:type="uml:LiteralBoolean" xmi:id="_JxtgcLhEEeS0cu6lbJ9jDQ" value="true"/>

-        </value>

-      </featuresToSet>

-      <featuresToSet xmi:id="_CqCTILhEEeS0cu6lbJ9jDQ" featureName="enumeration">

-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_LYi7YLhEEeS0cu6lbJ9jDQ">

-          <valueInstance xsi:type="uml:InstanceValue" xmi:id="_NPf18LhEEeS0cu6lbJ9jDQ" name="">

-            <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>

-          </valueInstance>

-        </value>

-      </featuresToSet>

-    </stereotypesToApply>

-  </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:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:invariantcontainerrule="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1" xmlns:invariantstereotyperule="http://www.eclipse.org/papyrus/uml/types/invariantstereotyperule/1.1" xmlns:rulebased="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1" xmlns:setvaluesadvice="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.infra.types.tests.tests" name="Test element types" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.specificcomponent" description="" identifier="org.eclipse.papyrus.infra.types.tests.specificcomponent" name="Component in specific package only" hint="ElementTypes">
+    <iconEntry xmi:id="_FW5wwLg-EeS0cu6lbJ9jDQ" iconPath="icons/full/obj16/add_obj.gif" bundleId="org.eclipse.ui"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
+    <ruleConfiguration xsi:type="invariantcontainerrule:InvariantContainerRuleConfiguration" xmi:id="_N9YeYLg-EeS0cu6lbJ9jDQ">
+      <permissions xmi:id="_Ow-egLg-EeS0cu6lbJ9jDQ" containerType="org.eclipse.papyrus.uml.Package"/>
+      <permissions xmi:id="_QsZCULg-EeS0cu6lbJ9jDQ" containerType="org.eclipse.papyrus.infra.types.tests.packagewithcomponentsonly" permitted="true" strict="true"/>
+    </ruleConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.packagewithcomponentsonly" description="Package that can contain only components" identifier="org.eclipse.papyrus.infra.types.tests.packagewithcomponentsonly" name="PackageWithComponentsOnly" hint="ElementTypes">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+    <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_mzVEQLg-EeS0cu6lbJ9jDQ" stereotypeQualifiedName="ElementTypesTestsProfile::PackageWithComponents" requiredProfile=""/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.aspectabstractclass" description="Semantic element type to create abstract classes" identifier="org.eclipse.papyrus.infra.types.tests.aspectabstractclass" name="Abstract Class Creation Action" hint="Abstract Class Creation Action">
+    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_qI4JwNLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype" name="Class With Stereotype" hint="ElementElementTypeConfigurations">
+    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_8kqIkNLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename" name="Package With Stereotype And Renamed" hint="ElementElementTypeConfigurations">
+    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_8yABANLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues" name="Package With Stereotype And Renamed" hint="ElementElementTypeConfigurations">
+    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_8-EHENLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype" name="Package With Stereotype And Renamed" hint="ElementElementTypeConfigurations">
+    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_9KgAkNLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="#org.eclipse.papyrus.infra.types.tests.aspectabstractclass"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="setvaluesadvice:SetValuesAdviceConfiguration" xmi:id="_6Zq8QLg_EeS0cu6lbJ9jDQ" description="Aspect Semantic element type to create abstract classes" identifier="org.eclipse.papyrus.infra.types.tests.aspectabstractclass.advice" target="org.eclipse.papyrus.infra.types.tests.aspectabstractclass">
+    <featuresToSet xmi:id="_7FIUELg_EeS0cu6lbJ9jDQ" featureName="isAbstract">
+      <value xsi:type="setvaluesadvice:ConstantValue" xmi:id="_-d4_oLg_EeS0cu6lbJ9jDQ">
+        <valueInstance xsi:type="uml:LiteralBoolean" xmi:id="__mUnULg_EeS0cu6lbJ9jDQ" value="true"/>
+      </value>
+    </featuresToSet>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_NEmxYLhAEeS0cu6lbJ9jDQ" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype.advice" target="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype">
+    <stereotypesToApply xmi:id="_PuEG8LhAEeS0cu6lbJ9jDQ" stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet">
+      <requiredProfiles>ElementTypesTestProfile</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_Z3bfkMy4EeS2aYvfnAB4ZA" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename.advice" target="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename">
+    <stereotypesToApply xmi:id="_Z3bfkcy4EeS2aYvfnAB4ZA" stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true">
+      <requiredProfiles>ElementTypesTestProfile</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_havkELhAEeS0cu6lbJ9jDQ" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues.advice" target="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues">
+    <stereotypesToApply xmi:id="_vA53wLhAEeS0cu6lbJ9jDQ" stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true">
+      <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>
+      <featuresToSet xmi:id="__E3qoLhAEeS0cu6lbJ9jDQ" featureName="stringFeature">
+        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_DFSzILhBEeS0cu6lbJ9jDQ">
+          <valueInstance xsi:type="uml:LiteralString" xmi:id="_MDKGALhBEeS0cu6lbJ9jDQ" value="MyStringValue"/>
+        </value>
+      </featuresToSet>
+      <featuresToSet xmi:id="_A8odgLhBEeS0cu6lbJ9jDQ" featureName="value">
+        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_Eb_gULhBEeS0cu6lbJ9jDQ">
+          <valueInstance xsi:type="uml:LiteralInteger" xmi:id="_Gt4qcLhBEeS0cu6lbJ9jDQ" value="3"/>
+        </value>
+      </featuresToSet>
+      <featuresToSet xmi:id="_BSTykLhBEeS0cu6lbJ9jDQ" featureName="boolean">
+        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_ExAHALhBEeS0cu6lbJ9jDQ">
+          <valueInstance xsi:type="uml:LiteralBoolean" xmi:id="_QFRQkLhBEeS0cu6lbJ9jDQ" value="true"/>
+        </value>
+      </featuresToSet>
+      <featuresToSet xmi:id="_Bm_pILhBEeS0cu6lbJ9jDQ" featureName="enumeration">
+        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_FFqIYLhBEeS0cu6lbJ9jDQ">
+          <valueInstance xsi:type="uml:InstanceValue" xmi:id="_VToy4LhBEeS0cu6lbJ9jDQ">
+            <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>
+          </valueInstance>
+        </value>
+      </featuresToSet>
+      <featuresToSet xmi:id="_B7jj4LhBEeS0cu6lbJ9jDQ" featureName="multiStrings">
+        <value xsi:type="applystereotypeadvice:ListValue" xmi:id="_rQRXYLhDEeS0cu6lbJ9jDQ"/>
+      </featuresToSet>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ls9AILhAEeS0cu6lbJ9jDQ" identifier="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype.advice" target="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype">
+    <stereotypesToApply xmi:id="_u0-NMLhDEeS0cu6lbJ9jDQ" stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeatureToSet">
+      <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>
+      <featuresToSet xmi:id="_6XspgLhDEeS0cu6lbJ9jDQ" featureName="stringFeature">
+        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_7YVAELhDEeS0cu6lbJ9jDQ">
+          <valueInstance xsi:type="uml:LiteralString" xmi:id="_-BmvcLhDEeS0cu6lbJ9jDQ" name="" value="MyOtherValue"/>
+        </value>
+      </featuresToSet>
+      <featuresToSet xmi:id="_Bj7msLhEEeS0cu6lbJ9jDQ" featureName="value">
+        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_Dd4x8LhEEeS0cu6lbJ9jDQ">
+          <valueInstance xsi:type="uml:LiteralInteger" xmi:id="_HdrBQLhEEeS0cu6lbJ9jDQ" value="18"/>
+        </value>
+      </featuresToSet>
+      <featuresToSet xmi:id="_CKkv8LhEEeS0cu6lbJ9jDQ" featureName="boolean">
+        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_It5TALhEEeS0cu6lbJ9jDQ">
+          <valueInstance xsi:type="uml:LiteralBoolean" xmi:id="_JxtgcLhEEeS0cu6lbJ9jDQ" value="true"/>
+        </value>
+      </featuresToSet>
+      <featuresToSet xmi:id="_CqCTILhEEeS0cu6lbJ9jDQ" featureName="enumeration">
+        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_LYi7YLhEEeS0cu6lbJ9jDQ">
+          <valueInstance xsi:type="uml:InstanceValue" xmi:id="_NPf18LhEEeS0cu6lbJ9jDQ" name="">
+            <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>
+          </valueInstance>
+        </value>
+      </featuresToSet>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/validAdvicesOrder.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/validAdvicesOrder.elementtypesconfigurations
index e4bccd05705..ff29a01d6c5 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/validAdvicesOrder.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/validAdvicesOrder.elementtypesconfigurations
@@ -1,12 +1,12 @@
-<?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.tests.validAdvices.elementtypesconfigurations" name="Test cyclic edvices dependencies" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" before="_nSyIoLK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice1" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" description="" before="_ojuzILK-EeWUIbTgfwAP3g" after="_SGAo4LK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice2" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" after="_nSyIoLK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice3" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </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.tests.validAdvices.elementtypesconfigurations" name="Test cyclic edvices dependencies" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" before="_nSyIoLK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice1" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1">
+    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" description="" before="_ojuzILK-EeWUIbTgfwAP3g" after="_SGAo4LK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice2" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2">
+    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" after="_nSyIoLK-EeWUIbTgfwAP3g" identifier="TestEditHelperAdvice3" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3">
+    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice1.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice1.java
index 76d0db027aa..2d1feb8bd5a 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice1.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice1.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.tests;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-

-public class TestEditHelperAdvice1 extends AbstractEditHelperAdvice {

-

-}

+/*****************************************************************************
+ * 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.tests;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+
+public class TestEditHelperAdvice1 extends AbstractEditHelperAdvice {
+
+}
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice2.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice2.java
index eabffd14ef8..1aff451d099 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice2.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice2.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.tests;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-

-public class TestEditHelperAdvice2 extends AbstractEditHelperAdvice {

-

-}

+/*****************************************************************************
+ * 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.tests;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+
+public class TestEditHelperAdvice2 extends AbstractEditHelperAdvice {
+
+}
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice3.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice3.java
index c0bd8596c23..3a989acb414 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice3.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice3.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.tests;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-

-public class TestEditHelperAdvice3 extends AbstractEditHelperAdvice {

-

-}

+/*****************************************************************************
+ * 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.tests;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+
+public class TestEditHelperAdvice3 extends AbstractEditHelperAdvice {
+
+}
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF
index 950db34d4df..3f7234da498 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0

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

- org.junit;bundle-version="4.10.0",

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

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

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

- org.eclipse.gmf.runtime.emf.type.core,

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

-Export-Package: org.eclipse.papyrus.infra.types.ui.tests

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.types.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.types.ui.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.ui.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/WorkspaceTest.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/WorkspaceTest.elementtypesconfigurations
index f7be17b35dc..0c253fe58fa 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/WorkspaceTest.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/WorkspaceTest.elementtypesconfigurations
@@ -1,13 +1,13 @@
-<?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" xmlns:setvaluesadvice="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" description="" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.workspacetype" name="WorkspaceTypeTests" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" name="WorkspaceType_AbstractClass" hint="WorkspaceType_AbstractClass">

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="setvaluesadvice:SetValuesAdviceConfiguration" xmi:id="_1JyvELtVEeSfJNL-2_VlLg" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" target="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool">

-    <featuresToSet xmi:id="_CNnKsLtWEeSfJNL-2_VlLg" featureName="isAbstract">

-      <value xsi:type="setvaluesadvice:ConstantValue" xmi:id="_E2SdILtWEeSfJNL-2_VlLg">

-        <valueInstance xsi:type="uml:LiteralBoolean" xmi:id="_FySLULtWEeSfJNL-2_VlLg" value="true"/>

-      </value>

-    </featuresToSet>

-  </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" xmlns:setvaluesadvice="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" description="" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.workspacetype" name="WorkspaceTypeTests" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" name="WorkspaceType_AbstractClass" hint="WorkspaceType_AbstractClass">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="setvaluesadvice:SetValuesAdviceConfiguration" xmi:id="_1JyvELtVEeSfJNL-2_VlLg" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" target="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool">
+    <featuresToSet xmi:id="_CNnKsLtWEeSfJNL-2_VlLg" featureName="isAbstract">
+      <value xsi:type="setvaluesadvice:ConstantValue" xmi:id="_E2SdILtWEeSfJNL-2_VlLg">
+        <valueInstance xsi:type="uml:LiteralBoolean" xmi:id="_FySLULtWEeSfJNL-2_VlLg" value="true"/>
+      </value>
+    </featuresToSet>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/elementtypetestui.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/elementtypetestui.elementtypesconfigurations
index f501a8e6471..820d7e874e2 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/elementtypetestui.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/elementtypetestui.elementtypesconfigurations
@@ -1,12 +1,12 @@
-<?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" xmlns:runtimevaluesadvice="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests.ui" name="Test element types UI" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView" name="Package With Stereotype And Renamed - View" hint="ElementElementTypeConfigurations">

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_9WxiANLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.types.tests/model/elementtypetest.elementtypesconfigurations#org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="runtimevaluesadvice:RuntimeValuesAdviceConfiguration" xmi:id="_bmwRsMzEEeSJ0sn3znt87w" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView.advice" target="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView">

-    <viewsToDisplay xmi:id="_d7FEwMzEEeSJ0sn3znt87w">

-      <view href="ElementTypesTestsProfile.ctx#__31rg8pnEeWJM5S7C-EqVg"/>

-    </viewsToDisplay>

-  </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" xmlns:runtimevaluesadvice="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests.ui" name="Test element types UI" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView" description="Test elementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView" name="Package With Stereotype And Renamed - View" hint="ElementElementTypeConfigurations">
+    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_9WxiANLXEeSAkKOodzTEYg" matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.types.tests/model/elementtypetest.elementtypesconfigurations#org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="runtimevaluesadvice:RuntimeValuesAdviceConfiguration" xmi:id="_bmwRsMzEEeSJ0sn3znt87w" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView.advice" target="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView">
+    <viewsToDisplay xmi:id="_d7FEwMzEEeSJ0sn3znt87w">
+      <view href="ElementTypesTestsProfile.ctx#__31rg8pnEeWJM5S7C-EqVg"/>
+    </viewsToDisplay>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch
index c0b41906d45..2a532c13af5 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspacemd5"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.types.ui.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.types.ui.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m "/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="false"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspacemd5"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.types.ui.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.types.ui.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m "/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="false"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF
index 0ccfcb9acf8..82120976b67 100644
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.viewpoints.policy.tests

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",

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

- org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,

- org.junit;bundle-version="4.11.0";visibility:=reexport,

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.viewpoints.policy.tests
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
+ org.junit;bundle-version="4.11.0";visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/.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/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF
index c07de05f6ae..b57b622c6d5 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.junit.framework.classification,

- org.eclipse.papyrus.junit.framework.classification.rules,

- org.eclipse.papyrus.junit.framework.classification.tests,

- org.eclipse.papyrus.junit.framework.runner

-Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)";visibility:=reexport,

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

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

- org.eclipse.ui;bundle-version="[3.107.0,4.0.0)"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Conditional Junit Annotations

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.junit.framework;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

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

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.junit.framework.classification,
+ org.eclipse.papyrus.junit.framework.classification.rules,
+ org.eclipse.papyrus.junit.framework.classification.tests,
+ org.eclipse.papyrus.junit.framework.runner
+Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Conditional Junit Annotations
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.junit.framework;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+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/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/about.html b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/about.html
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/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/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/build.properties b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/build.properties
index 785a40c0ec7..9cbab3c135e 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/build.properties
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/build.properties
@@ -1,6 +1,6 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/pom.xml b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/pom.xml
index 681846d5b76..12bfc35fcc3 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/pom.xml
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

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

-    <artifactId>org.eclipse.papyrus.dev.releng</artifactId>

-    <version>3.0.0-SNAPSHOT</version>

-    <relativePath>../../../../../releng/dev</relativePath>

-  </parent>

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

-  <artifactId>org.eclipse.papyrus.junit.framework</artifactId>

-  <version>1.2.0-SNAPSHOT</version>

-  <packaging>eclipse-plugin</packaging>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus.dev.releng</artifactId>
+    <version>3.0.0-SNAPSHOT</version>
+    <relativePath>../../../../../releng/dev</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.junit.framework</artifactId>
+  <version>1.2.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ClassificationRunner.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ClassificationRunner.java
index 357298bd6a3..89ee5d7dcef 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ClassificationRunner.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ClassificationRunner.java
@@ -1,102 +1,102 @@
-/*****************************************************************************

- * 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 (CEA) - add support for conditional tests

- *  Christian W. Damus (CEA) - bug 432813

- *  Christian W. Damus (CEA) - bug 434993

- *  Christian W. Damus (CEA) - bug 436047

- *  Christian W. Damus - bug 485156

- *

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

-package org.eclipse.papyrus.junit.framework.classification;

-

-import java.util.List;

-

-import org.eclipse.papyrus.junit.framework.classification.rules.Conditional;

-import org.junit.rules.TestRule;

-import org.junit.runner.Description;

-import org.junit.runner.notification.RunNotifier;

-import org.junit.runners.BlockJUnit4ClassRunner;

-import org.junit.runners.model.FrameworkMethod;

-import org.junit.runners.model.InitializationError;

-import org.junit.runners.model.Statement;

-

-/**

- * A Test Runner which is aware of Classification-related annotations and {@link Conditional @Conditional} tests.

- *

- * It ignores the test methods according to their annotations, and the policy defined

- * in {@link ClassificationConfig}

- *

- *

- * @see {@link ClassificationConfig}

- * @see {@link TestCategory}

- * @see Conditional

- *

- * @author Camille Letavernier

- *

- */

-public class ClassificationRunner extends BlockJUnit4ClassRunner {

-

-	private final ClassificationRunnerImpl impl;

-

-	public ClassificationRunner(Class<?> klass) throws InitializationError {

-		super(klass);

-

-		this.impl = new ClassificationRunnerImpl(new ClassificationRunnerImpl.Delegate() {

-

-			@Override

-			public void runChild(FrameworkMethod method, RunNotifier notifier) {

-				ClassificationRunner.super.runChild(method, notifier);

-			}

-

-			@Override

-			public Description describeChild(FrameworkMethod method) {

-				return ClassificationRunner.super.describeChild(method);

-			}

-

-			@Override

-			public Object createTest() throws Exception {

-				return ClassificationRunner.super.createTest();

-			}

-

-			@Override

-			public List<TestRule> getTestRules(Object target) {

-				return ClassificationRunner.super.getTestRules(target);

-			}

-

-			@Override

-			public Statement classBlock(RunNotifier notifier) {

-				return ClassificationRunner.super.classBlock(notifier);

-			}

-

-		});

-	}

-

-	@Override

-	protected void runChild(FrameworkMethod method, RunNotifier notifier) {

-		impl.runChild(method, notifier);

-	}

-

-	@Override

-	protected Object createTest() throws Exception {

-		return impl.createTest();

-	}

-

-	@Override

-	protected List<TestRule> getTestRules(Object target) {

-		return impl.getTestRules(target);

-	}

-

-	@Override

-	protected Statement classBlock(RunNotifier notifier) {

-		return impl.classBlock(notifier);

-	}

-

-}

+/*****************************************************************************
+ * 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 (CEA) - add support for conditional tests
+ *  Christian W. Damus (CEA) - bug 432813
+ *  Christian W. Damus (CEA) - bug 434993
+ *  Christian W. Damus (CEA) - bug 436047
+ *  Christian W. Damus - bug 485156
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.framework.classification;
+
+import java.util.List;
+
+import org.eclipse.papyrus.junit.framework.classification.rules.Conditional;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+/**
+ * A Test Runner which is aware of Classification-related annotations and {@link Conditional @Conditional} tests.
+ *
+ * It ignores the test methods according to their annotations, and the policy defined
+ * in {@link ClassificationConfig}
+ *
+ *
+ * @see {@link ClassificationConfig}
+ * @see {@link TestCategory}
+ * @see Conditional
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ClassificationRunner extends BlockJUnit4ClassRunner {
+
+	private final ClassificationRunnerImpl impl;
+
+	public ClassificationRunner(Class<?> klass) throws InitializationError {
+		super(klass);
+
+		this.impl = new ClassificationRunnerImpl(new ClassificationRunnerImpl.Delegate() {
+
+			@Override
+			public void runChild(FrameworkMethod method, RunNotifier notifier) {
+				ClassificationRunner.super.runChild(method, notifier);
+			}
+
+			@Override
+			public Description describeChild(FrameworkMethod method) {
+				return ClassificationRunner.super.describeChild(method);
+			}
+
+			@Override
+			public Object createTest() throws Exception {
+				return ClassificationRunner.super.createTest();
+			}
+
+			@Override
+			public List<TestRule> getTestRules(Object target) {
+				return ClassificationRunner.super.getTestRules(target);
+			}
+
+			@Override
+			public Statement classBlock(RunNotifier notifier) {
+				return ClassificationRunner.super.classBlock(notifier);
+			}
+
+		});
+	}
+
+	@Override
+	protected void runChild(FrameworkMethod method, RunNotifier notifier) {
+		impl.runChild(method, notifier);
+	}
+
+	@Override
+	protected Object createTest() throws Exception {
+		return impl.createTest();
+	}
+
+	@Override
+	protected List<TestRule> getTestRules(Object target) {
+		return impl.getTestRules(target);
+	}
+
+	@Override
+	protected Statement classBlock(RunNotifier notifier) {
+		return impl.classBlock(notifier);
+	}
+
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ExpensiveTest.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ExpensiveTest.java
index 11c644c4e2c..2abeedb12ed 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ExpensiveTest.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/ExpensiveTest.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.junit.framework.classification;

-

-import java.lang.annotation.ElementType;

-import java.lang.annotation.Retention;

-import java.lang.annotation.RetentionPolicy;

-import java.lang.annotation.Target;

-

-

-/**

- * Indicates that a test is expensive, and should be excluded from a Lightweight test job (e.g. Gerrit)

- *

- *

- * This annotation must be used with the {@link ClassificationRule}

- *

- * @author Camille Letavernier

- *

- */

-@Target({ ElementType.METHOD, ElementType.TYPE })

-@Retention(RetentionPolicy.RUNTIME)

-public @interface ExpensiveTest {

-

-	/**

-	 * A description

-	 *

-	 * @return

-	 */

-	String value() default "";

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.framework.classification;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * Indicates that a test is expensive, and should be excluded from a Lightweight test job (e.g. Gerrit)
+ *
+ *
+ * This annotation must be used with the {@link ClassificationRule}
+ *
+ * @author Camille Letavernier
+ *
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExpensiveTest {
+
+	/**
+	 * A description
+	 *
+	 * @return
+	 */
+	String value() default "";
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/FailingTest.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/FailingTest.java
index 27793a1b091..d528a7048d8 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/FailingTest.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/FailingTest.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.junit.framework.classification;

-

-import java.lang.annotation.ElementType;

-import java.lang.annotation.Retention;

-import java.lang.annotation.RetentionPolicy;

-import java.lang.annotation.Target;

-

-

-/**

- * Indicates that a test currently fails. It can be used to sort new (unidentified) regressions

- * from known (reported) issues.

- *

- * This annotation must be used with the {@link ClassificationRule}

- * 

- * @author Camille Letavernier

- *

- */

-@Target({ ElementType.METHOD, ElementType.TYPE })

-@Retention(RetentionPolicy.RUNTIME)

-public @interface FailingTest {

-

-	/**

-	 * A specific message explaining why this test is failing

-	 *

-	 * @return

-	 */

-	String value() default "";

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.framework.classification;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * Indicates that a test currently fails. It can be used to sort new (unidentified) regressions
+ * from known (reported) issues.
+ *
+ * This annotation must be used with the {@link ClassificationRule}
+ * 
+ * @author Camille Letavernier
+ *
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FailingTest {
+
+	/**
+	 * A specific message explaining why this test is failing
+	 *
+	 * @return
+	 */
+	String value() default "";
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/InteractiveTest.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/InteractiveTest.java
index 75f0a58597f..5f941503360 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/InteractiveTest.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/InteractiveTest.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:

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

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

-package org.eclipse.papyrus.junit.framework.classification;

-

-import java.lang.annotation.ElementType;

-import java.lang.annotation.Retention;

-import java.lang.annotation.RetentionPolicy;

-import java.lang.annotation.Target;

-

-/**

- * Indicates that a test is interactive, e.g. it opens a user dialog. Such tests cannot be run

- * automatically and should be disabled on Hudson

- *

- * This annotation must be used with the {@link ClassificationRule}

- *

- * @author Camille Letavernier

- *

- */

-@Target({ ElementType.METHOD, ElementType.TYPE })

-@Retention(RetentionPolicy.RUNTIME)

-public @interface InteractiveTest {

-

-	/**

-	 * A specific message explaining why this test is failing

-	 *

-	 * @return

-	 */

-	String value() default "";

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.framework.classification;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that a test is interactive, e.g. it opens a user dialog. Such tests cannot be run
+ * automatically and should be disabled on Hudson
+ *
+ * This annotation must be used with the {@link ClassificationRule}
+ *
+ * @author Camille Letavernier
+ *
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface InteractiveTest {
+
+	/**
+	 * A specific message explaining why this test is failing
+	 *
+	 * @return
+	 */
+	String value() default "";
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/InvalidTest.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/InvalidTest.java
index e598d49a9b8..b11dc8588d1 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/InvalidTest.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/InvalidTest.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:

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

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

-package org.eclipse.papyrus.junit.framework.classification;

-

-import java.lang.annotation.ElementType;

-import java.lang.annotation.Retention;

-import java.lang.annotation.RetentionPolicy;

-import java.lang.annotation.Target;

-

-/**

- * Indicates that a test may fail because it is not properly implemented

- * (e.g. not compatible with Hudson, because it opens some blocking dialogs)

- *

- * This annotation must be used with the {@link ClassificationRule}

- *

- * @author Camille Letavernier

- *

- */

-@Target({ ElementType.METHOD, ElementType.TYPE })

-@Retention(RetentionPolicy.RUNTIME)

-public @interface InvalidTest {

-

-	/**

-	 * A specific message explaining why this test may be invalid

-	 *

-	 * @return

-	 */

-	String value() default "";

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.framework.classification;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that a test may fail because it is not properly implemented
+ * (e.g. not compatible with Hudson, because it opens some blocking dialogs)
+ *
+ * This annotation must be used with the {@link ClassificationRule}
+ *
+ * @author Camille Letavernier
+ *
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface InvalidTest {
+
+	/**
+	 * A specific message explaining why this test may be invalid
+	 *
+	 * @return
+	 */
+	String value() default "";
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/NotImplemented.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/NotImplemented.java
index 70bc0859b97..f4a98258268 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/NotImplemented.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/NotImplemented.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.junit.framework.classification;

-

-import java.lang.annotation.ElementType;

-import java.lang.annotation.Retention;

-import java.lang.annotation.RetentionPolicy;

-import java.lang.annotation.Target;

-

-/**

- * Indicates that a test may fail because the tested feature

- * is not yet implemented (Test-driven development)

- *

- * This annotation must be used with the {@link ClassificationRule}

- *

- * @author Camille Letavernier

- *

- */

-@Target({ ElementType.METHOD, ElementType.TYPE })

-@Retention(RetentionPolicy.RUNTIME)

-public @interface NotImplemented {

-

-	/**

-	 * A specific message explaining what needs to be implemented

-	 * for this test to run

-	 *

-	 * @return

-	 */

-	String value() default "";

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.framework.classification;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that a test may fail because the tested feature
+ * is not yet implemented (Test-driven development)
+ *
+ * This annotation must be used with the {@link ClassificationRule}
+ *
+ * @author Camille Letavernier
+ *
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface NotImplemented {
+
+	/**
+	 * A specific message explaining what needs to be implemented
+	 * for this test to run
+	 *
+	 * @return
+	 */
+	String value() default "";
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/tests/AbstractPapyrusTest.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/tests/AbstractPapyrusTest.java
index 956a1deb835..f77b5076241 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/tests/AbstractPapyrusTest.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/classification/tests/AbstractPapyrusTest.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:

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

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

-package org.eclipse.papyrus.junit.framework.classification.tests;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;

-import org.junit.runner.RunWith;

-

-/**

- * An abstract class which should be extended by all Papyrus tests

- *

- * It provides generic support for papyrus-specific annotations (e.g. ClassificationRunner)

- *

- * @author Camille Letavernier

- *

- */

-@RunWith(ClassificationRunner.class)

-public abstract class AbstractPapyrusTest {

-	//Abstract test class for using the Classification Runner

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.framework.classification.tests;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
+import org.junit.runner.RunWith;
+
+/**
+ * An abstract class which should be extended by all Papyrus tests
+ *
+ * It provides generic support for papyrus-specific annotations (e.g. ClassificationRunner)
+ *
+ * @author Camille Letavernier
+ *
+ */
+@RunWith(ClassificationRunner.class)
+public abstract class AbstractPapyrusTest {
+	//Abstract test class for using the Classification Runner
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/PluginTestSuiteClass.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/PluginTestSuiteClass.java
index e559a54d3cc..c7f16a20f7d 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/PluginTestSuiteClass.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/PluginTestSuiteClass.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 451230

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

-package org.eclipse.papyrus.junit.framework.runner;

-

-

-/**

- * Entry for a test suite in a test plugin

- */

-public class PluginTestSuiteClass implements ITestSuiteClass {

-

-	/** main test suite class */

-	private final Class<?> testClass;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param testClass

-	 *        the main test suite class

-	 */

-	public PluginTestSuiteClass(Class<?> testClass) {

-		this.testClass = testClass;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Class<?> getMainTestSuiteClass() {

-		return testClass;

-	}

-

-	@Override

-	public String toString() {

-		return String.format("PluginTestSuite %s", testClass);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 451230
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.framework.runner;
+
+
+/**
+ * Entry for a test suite in a test plugin
+ */
+public class PluginTestSuiteClass implements ITestSuiteClass {
+
+	/** main test suite class */
+	private final Class<?> testClass;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param testClass
+	 *        the main test suite class
+	 */
+	public PluginTestSuiteClass(Class<?> testClass) {
+		this.testClass = testClass;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Class<?> getMainTestSuiteClass() {
+		return testClass;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("PluginTestSuite %s", testClass);
+	}
+
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/.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/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
index 66c21362528..b7e93d07eb2 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0

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

- org.eclipse.papyrus.views.modelexplorer;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.uml.tools;bundle-version="[3.0.0,4.0.0)",

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

- org.eclipse.e4.ui.workbench;bundle-version="[1.4.0,2.0.0)",

- org.eclipse.e4.ui.model.workbench;bundle-version="[1.2.0,3.0.0)",

- org.eclipse.e4.core.contexts;bundle-version="[1.5.0,2.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.junit.matchers,

- org.eclipse.papyrus.junit.utils,

- org.eclipse.papyrus.junit.utils.resources,

- org.eclipse.papyrus.junit.utils.rules,

- org.eclipse.papyrus.junit.utils.tests

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.1.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.junit.utils;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

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

- com.google.common.io;version="21.0.0",

- com.google.common.primitives;version="21.0.0"

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.views.modelexplorer;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.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.e4.ui.workbench;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.e4.ui.model.workbench;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.e4.core.contexts;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.junit.matchers,
+ org.eclipse.papyrus.junit.utils,
+ org.eclipse.papyrus.junit.utils.resources,
+ org.eclipse.papyrus.junit.utils.rules,
+ org.eclipse.papyrus.junit.utils.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.1.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.junit.utils;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+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",
+ com.google.common.io;version="21.0.0",
+ com.google.common.primitives;version="21.0.0"
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/OSGI-INF/l10n/bundle.properties
index 3750a5e47bb..fbed29c7002 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/OSGI-INF/l10n/bundle.properties
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.junit.utils

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.junit.utils
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Utils classes for JUnit tests
\ No newline at end of file
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/about.html b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/about.html
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/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/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/build.properties b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/build.properties
index dfc79e0933b..bafbbb53ba0 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/build.properties
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               OSGI-INF/,\

-               about.html,\

-               build.properties

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about.html,\
+               build.properties
+src.includes = about.html
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/Activator.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/Activator.java
index c51d331687a..3f1a9deceb6 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/Activator.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/Activator.java
@@ -1,83 +1,83 @@
-/*****************************************************************************

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

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

- *  Christian W. Damus - bug 433206

- *

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

-package org.eclipse.papyrus.junit.utils;

-

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

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

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.ServiceReference;

-import org.osgi.service.application.ApplicationHandle;

-

-/**

- * 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.junit.utils"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	private String runningApplicationID;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-

-		// Get the running application ID

-		ServiceReference<ApplicationHandle> appRef = context.getServiceReference(ApplicationHandle.class);

-		if (appRef != null) {

-			ApplicationHandle appHandle = context.getService(appRef);

-			if (appHandle != null) {

-				try {

-					runningApplicationID = appHandle.getApplicationDescriptor().getApplicationId();

-				} finally {

-					context.ungetService(appRef);

-				}

-			}

-		}

-	}

-

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

-	}

-

-	public String getRunningApplicationID() {

-		return (runningApplicationID == null) ? "" : runningApplicationID; //$NON-NLS-1$

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 433206
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.utils;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.application.ApplicationHandle;
+
+/**
+ * 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.junit.utils"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	private String runningApplicationID;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+
+		// Get the running application ID
+		ServiceReference<ApplicationHandle> appRef = context.getServiceReference(ApplicationHandle.class);
+		if (appRef != null) {
+			ApplicationHandle appHandle = context.getService(appRef);
+			if (appHandle != null) {
+				try {
+					runningApplicationID = appHandle.getApplicationDescriptor().getApplicationId();
+				} finally {
+					context.ungetService(appRef);
+				}
+			}
+		}
+	}
+
+	@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;
+	}
+
+	public String getRunningApplicationID() {
+		return (runningApplicationID == null) ? "" : runningApplicationID; //$NON-NLS-1$
+	}
+
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/DisplayUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/DisplayUtils.java
index 02f025b94f5..e9ff430657d 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/DisplayUtils.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/DisplayUtils.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:

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

- *

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

-package org.eclipse.papyrus.junit.utils;

-

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

-

-

-public class DisplayUtils {

-

-	/** Processes all events waiting in the Display's event loop and then returns. */

-	public static void flushEventLoop() {

-		final Display display = Display.getDefault();

-		display.syncExec(new Runnable() {

-

-			public void run() {

-				try {

-					while(display.readAndDispatch()) {

-						// nothing

-					}

-				} catch (Exception ex) {

-					//Do not fail the test for invalid runnables

-				}

-			}

-		});

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.utils;
+
+import org.eclipse.swt.widgets.Display;
+
+
+public class DisplayUtils {
+
+	/** Processes all events waiting in the Display's event loop and then returns. */
+	public static void flushEventLoop() {
+		final Display display = Display.getDefault();
+		display.syncExec(new Runnable() {
+
+			public void run() {
+				try {
+					while(display.readAndDispatch()) {
+						// nothing
+					}
+				} catch (Exception ex) {
+					//Do not fail the test for invalid runnables
+				}
+			}
+		});
+	}
+
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/EditorUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/EditorUtils.java
index 576eece4810..b388df6b639 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/EditorUtils.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/EditorUtils.java
@@ -1,109 +1,109 @@
-/*****************************************************************************

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

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

- *  Christian W. Damus - bug 434983

- *

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

-package org.eclipse.papyrus.junit.utils;

-

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

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

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

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.ide.IDE;

-import org.junit.Assert;

-

-/**

- * 

- * useful methods for Editors

- * 

- */

-public class EditorUtils {

-

-	private EditorUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param file

-	 *            a file

-	 * @return

-	 * 		the opened editor for this file

-	 * @throws PartInitException

-	 */

-	public static final IEditorPart openEditor(final IFile file) throws PartInitException {

-		return withoutLayoutStoragePopup(() -> {

-			GenericUtils.closeIntroPart();

-			final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

-			IEditorPart editor = null;

-			editor = IDE.openEditor(activePage, file);

-			Assert.assertNotNull(editor);

-			return editor;

-		});

-	}

-

-	/**

-	 * Opens the file with the Papyrus Editor

-	 * 

-	 * @param file

-	 * @return

-	 * @throws PartInitException

-	 */

-	public static final IMultiDiagramEditor openPapyrusEditor(final IFile file) throws PartInitException {

-		return withoutLayoutStoragePopup(() -> {

-			GenericUtils.closeIntroPart();

-			final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

-			IEditorPart editor = null;

-			editor = IDE.openEditor(activePage, file, PapyrusMultiDiagramEditor.EDITOR_ID);

-			Assert.assertNotNull(editor);

-			return (IMultiDiagramEditor) editor;

-		});

-	}

-

-	/**

-	 * Opens an editor without the possibility of it showing a prompt dialog to convert

-	 * DI-file storage of the page layout to private sash-file storage.

-	 */

-	@SuppressWarnings("restriction")

-	private static <E extends IEditorPart> E withoutLayoutStoragePopup(EditorOpener<E> editorOpener) throws PartInitException {

-		E result;

-		boolean posted = false;

-

-		org.eclipse.papyrus.infra.ui.internal.preferences.YesNo originalPreference = org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences.getInstance().getConvertSharedPageLayoutToPrivate();

-		org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences.getInstance().setConvertSharedPageLayoutToPrivate(org.eclipse.papyrus.infra.ui.internal.preferences.YesNo.NO);

-

-		try {

-			result = editorOpener.openEditor();

-			result.getSite().getShell().getDisplay().asyncExec(() -> org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences.getInstance().setConvertSharedPageLayoutToPrivate(originalPreference));

-			posted = true;

-		} finally {

-			if (!posted) {

-				// Revert now because the editor failed to open and we won't be reverting asynchronously

-				org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences.getInstance().setConvertSharedPageLayoutToPrivate(originalPreference);

-			}

-		}

-

-		return result;

-	}

-

-	//

-	// Nested types

-	//

-

-	@FunctionalInterface

-	private interface EditorOpener<E extends IEditorPart> {

-		E openEditor() throws PartInitException;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 434983
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.utils;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+import org.junit.Assert;
+
+/**
+ * 
+ * useful methods for Editors
+ * 
+ */
+public class EditorUtils {
+
+	private EditorUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            a file
+	 * @return
+	 * 		the opened editor for this file
+	 * @throws PartInitException
+	 */
+	public static final IEditorPart openEditor(final IFile file) throws PartInitException {
+		return withoutLayoutStoragePopup(() -> {
+			GenericUtils.closeIntroPart();
+			final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+			IEditorPart editor = null;
+			editor = IDE.openEditor(activePage, file);
+			Assert.assertNotNull(editor);
+			return editor;
+		});
+	}
+
+	/**
+	 * Opens the file with the Papyrus Editor
+	 * 
+	 * @param file
+	 * @return
+	 * @throws PartInitException
+	 */
+	public static final IMultiDiagramEditor openPapyrusEditor(final IFile file) throws PartInitException {
+		return withoutLayoutStoragePopup(() -> {
+			GenericUtils.closeIntroPart();
+			final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+			IEditorPart editor = null;
+			editor = IDE.openEditor(activePage, file, PapyrusMultiDiagramEditor.EDITOR_ID);
+			Assert.assertNotNull(editor);
+			return (IMultiDiagramEditor) editor;
+		});
+	}
+
+	/**
+	 * Opens an editor without the possibility of it showing a prompt dialog to convert
+	 * DI-file storage of the page layout to private sash-file storage.
+	 */
+	@SuppressWarnings("restriction")
+	private static <E extends IEditorPart> E withoutLayoutStoragePopup(EditorOpener<E> editorOpener) throws PartInitException {
+		E result;
+		boolean posted = false;
+
+		org.eclipse.papyrus.infra.ui.internal.preferences.YesNo originalPreference = org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences.getInstance().getConvertSharedPageLayoutToPrivate();
+		org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences.getInstance().setConvertSharedPageLayoutToPrivate(org.eclipse.papyrus.infra.ui.internal.preferences.YesNo.NO);
+
+		try {
+			result = editorOpener.openEditor();
+			result.getSite().getShell().getDisplay().asyncExec(() -> org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences.getInstance().setConvertSharedPageLayoutToPrivate(originalPreference));
+			posted = true;
+		} finally {
+			if (!posted) {
+				// Revert now because the editor failed to open and we won't be reverting asynchronously
+				org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences.getInstance().setConvertSharedPageLayoutToPrivate(originalPreference);
+			}
+		}
+
+		return result;
+	}
+
+	//
+	// Nested types
+	//
+
+	@FunctionalInterface
+	private interface EditorOpener<E extends IEditorPart> {
+		E openEditor() throws PartInitException;
+	}
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/FilesUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/FilesUtils.java
index a93f603c901..f3ba910ea0b 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/FilesUtils.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/FilesUtils.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:

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

- *

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

-package org.eclipse.papyrus.junit.utils;

-

-import java.io.IOException;

-import java.net.URL;

-

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

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

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

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

-

-/**

- * 

- * Useful methods to manipulate files

- * 

- */

-public class FilesUtils {

-

-	/**

-	 * 

-	 * @param testProject

-	 *        the destination projecr

-	 * @param newFilename

-	 *        the new name of the copied file

-	 * @param fileURL

-	 *        the URl of the file to copy

-	 * @throws IOException

-	 * @throws CoreException

-	 */

-	public static final void copyFiles(final IProject testProject, final String newFilename, final URL fileURL) throws CoreException, IOException {

-		// Copy EmptyModel from bundle to the test project

-		final IFile emptyModel = testProject.getFile(newFilename);

-		emptyModel.create(fileURL.openStream(), true, new NullProgressMonitor());

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.utils;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+/**
+ * 
+ * Useful methods to manipulate files
+ * 
+ */
+public class FilesUtils {
+
+	/**
+	 * 
+	 * @param testProject
+	 *        the destination projecr
+	 * @param newFilename
+	 *        the new name of the copied file
+	 * @param fileURL
+	 *        the URl of the file to copy
+	 * @throws IOException
+	 * @throws CoreException
+	 */
+	public static final void copyFiles(final IProject testProject, final String newFilename, final URL fileURL) throws CoreException, IOException {
+		// Copy EmptyModel from bundle to the test project
+		final IFile emptyModel = testProject.getFile(newFilename);
+		emptyModel.create(fileURL.openStream(), true, new NullProgressMonitor());
+
+	}
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/GenericUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/GenericUtils.java
index 5f485b49496..fd3c865820a 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/GenericUtils.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/GenericUtils.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:

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

- *

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

-package org.eclipse.papyrus.junit.utils;

-

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

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

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

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

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

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.intro.IIntroPart;

-

-/**

- * 

- Some useful methods for Tests

- * 

- */

-public class GenericUtils {

-

-	private GenericUtils() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * close the Intro part

-	 */

-	public static final void closeIntroPart() {

-		final IIntroPart introPart = PlatformUI.getWorkbench().getIntroManager().getIntro();

-		PlatformUI.getWorkbench().getIntroManager().closeIntro(introPart);

-	}

-

-	/**

-	 * Close all the editors

-	 */

-	public static final void closeAllEditors() {

-		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);

-	}

-

-	/**

-	 * Clean the workspace

-	 * 

-	 * @throws CoreException

-	 */

-	public static final void cleanWorkspace() throws CoreException {

-		// we clean the workspace and create a new project to test the handlers

-		final IWorkspace workspace = ResourcesPlugin.getWorkspace();

-		for(final IProject project : workspace.getRoot().getProjects()) {

-

-			project.delete(true, new NullProgressMonitor());

-

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.utils;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroPart;
+
+/**
+ * 
+ Some useful methods for Tests
+ * 
+ */
+public class GenericUtils {
+
+	private GenericUtils() {
+		//to prevent instanciation
+	}
+
+	/**
+	 * close the Intro part
+	 */
+	public static final void closeIntroPart() {
+		final IIntroPart introPart = PlatformUI.getWorkbench().getIntroManager().getIntro();
+		PlatformUI.getWorkbench().getIntroManager().closeIntro(introPart);
+	}
+
+	/**
+	 * Close all the editors
+	 */
+	public static final void closeAllEditors() {
+		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+	}
+
+	/**
+	 * Clean the workspace
+	 * 
+	 * @throws CoreException
+	 */
+	public static final void cleanWorkspace() throws CoreException {
+		// we clean the workspace and create a new project to test the handlers
+		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		for(final IProject project : workspace.getRoot().getProjects()) {
+
+			project.delete(true, new NullProgressMonitor());
+
+		}
+	}
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/HandlerUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/HandlerUtils.java
index a2f0000a7e9..681c3fa9539 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/HandlerUtils.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/HandlerUtils.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.junit.utils;

-

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

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

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

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.commands.ICommandService;

-import org.eclipse.ui.handlers.IHandlerService;

-import org.junit.Assert;

-

-/**

- * 

- * Useful methods for the handlers and the Eclipse commands

- * 

- */

-public class HandlerUtils {

-

-	/**

-	 * Warning : you should be sure that the correct Editor/partView... has the focus to test the enablement if the handler!

-	 * 

-	 * @param commandId

-	 *        the command id

-	 * @return

-	 *         the current handler for this command

-	 */

-	public static final IHandler getActiveHandlerFor(final String commandId) {

-		return HandlerUtils.getCommand(commandId).getHandler();

-	}

-

-	/**

-	 * 

-	 * @param commandId

-	 *        the commandId

-	 * @return

-	 *         the real handler for the command

-	 */

-	public static final IHandler getRealHandlerFor(final String commandId) {

-		//commented because it works only on Eclipse4

-		//imports to add : 

-		//			- org.eclipse.e4.ui.model.application.MApplication;

-		//			- org.eclipse.e4.core.contexts.IEclipseContext

-		//			- org.eclipse.e4.core.commands.internal.HandlerServiceImpl

-		//			- org.eclipse.ui.internal.handlers.E4HandlerProxy

-		//		MApplication appl = (MApplication)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(MApplication.class);

-		//		IEclipseContext context = appl.getContext();

-		//		E4HandlerProxy handler = HandlerServiceImpl.lookUpHandler(context, commandId);

-		//		return handler.getHandler();

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * 

-	 * @param commandId

-	 *        the command id

-	 * @return

-	 *         the command object for this command id

-	 */

-	public static final Command getCommand(final String commandId) {

-		final ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);

-		commandService.refreshElements(commandId, null);

-		Assert.assertNotNull("CommandService can't be found", commandService);

-		Command cmd = commandService.getCommand(commandId);

-		Assert.assertNotNull("Command can't be found", cmd);

-		return cmd;

-	}

-

-	/**

-	 * Execute the command

-	 * 

-	 * @param cmd

-	 *        a command

-	 */

-	public static final void executeCommand(final Command cmd) throws Exception {

-		IHandlerService handlerService = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);

-		Assert.assertNotNull("Impossible to find handler service", handlerService);

-		final ParameterizedCommand parameterizedCommand = new ParameterizedCommand(cmd, null);

-		Assert.assertEquals("Command is not executable as expected", cmd.isEnabled(), true);

-		//execute the command

-		handlerService.executeCommand(parameterizedCommand, 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.junit.utils;
+
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.IHandlerService;
+import org.junit.Assert;
+
+/**
+ * 
+ * Useful methods for the handlers and the Eclipse commands
+ * 
+ */
+public class HandlerUtils {
+
+	/**
+	 * Warning : you should be sure that the correct Editor/partView... has the focus to test the enablement if the handler!
+	 * 
+	 * @param commandId
+	 *        the command id
+	 * @return
+	 *         the current handler for this command
+	 */
+	public static final IHandler getActiveHandlerFor(final String commandId) {
+		return HandlerUtils.getCommand(commandId).getHandler();
+	}
+
+	/**
+	 * 
+	 * @param commandId
+	 *        the commandId
+	 * @return
+	 *         the real handler for the command
+	 */
+	public static final IHandler getRealHandlerFor(final String commandId) {
+		//commented because it works only on Eclipse4
+		//imports to add : 
+		//			- org.eclipse.e4.ui.model.application.MApplication;
+		//			- org.eclipse.e4.core.contexts.IEclipseContext
+		//			- org.eclipse.e4.core.commands.internal.HandlerServiceImpl
+		//			- org.eclipse.ui.internal.handlers.E4HandlerProxy
+		//		MApplication appl = (MApplication)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(MApplication.class);
+		//		IEclipseContext context = appl.getContext();
+		//		E4HandlerProxy handler = HandlerServiceImpl.lookUpHandler(context, commandId);
+		//		return handler.getHandler();
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * 
+	 * @param commandId
+	 *        the command id
+	 * @return
+	 *         the command object for this command id
+	 */
+	public static final Command getCommand(final String commandId) {
+		final ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);
+		commandService.refreshElements(commandId, null);
+		Assert.assertNotNull("CommandService can't be found", commandService);
+		Command cmd = commandService.getCommand(commandId);
+		Assert.assertNotNull("Command can't be found", cmd);
+		return cmd;
+	}
+
+	/**
+	 * Execute the command
+	 * 
+	 * @param cmd
+	 *        a command
+	 */
+	public static final void executeCommand(final Command cmd) throws Exception {
+		IHandlerService handlerService = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
+		Assert.assertNotNull("Impossible to find handler service", handlerService);
+		final ParameterizedCommand parameterizedCommand = new ParameterizedCommand(cmd, null);
+		Assert.assertEquals("Command is not executable as expected", cmd.isEnabled(), true);
+		//execute the command
+		handlerService.executeCommand(parameterizedCommand, null);
+	}
+
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ModelUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ModelUtils.java
index 8bd0b967e89..b5113e57722 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ModelUtils.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ModelUtils.java
@@ -1,110 +1,110 @@
-/*****************************************************************************

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

- *  

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

-package org.eclipse.papyrus.junit.utils;

-

-import static org.hamcrest.CoreMatchers.is;

-import static org.junit.Assert.assertThat;

-

-import java.lang.reflect.Field;

-import java.util.Map;

-

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

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

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

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

-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;

-import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

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

-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;

-import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

-

-/**

- * Helper class for manipulating Papyrus ModelSets

- * 

- * @author Camille Letavernier

- * 

- */

-public class ModelUtils {

-

-	/**

-	 * Loads a ModelSet and associates a TransactionalEditingDomain to it

-	 * 

-	 * Use {@link #getEditingDomain(ModelSet)} to retrieve the EditingDomain

-	 * 

-	 * @param uri

-	 * @param resolveAll

-	 * @return

-	 * @throws ModelMultiException

-	 */

-	public static ModelSet loadModelSet(URI uri, boolean resolveAll) throws ModelMultiException {

-		ModelSet modelSet = new DiResourceSet();

-		TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(modelSet);

-

-		modelSet.loadModels(uri);

-

-		if(resolveAll) {

-			EcoreUtil.resolveAll(modelSet);

-		}

-

-		return modelSet;

-	}

-

-	public static ModelSet loadModelSet(IPath workspacePath, boolean resolveAll) throws ModelMultiException {

-		URI workspaceURI = URI.createPlatformResourceURI(workspacePath.toString(), true);

-		return loadModelSet(workspaceURI, resolveAll);

-	}

-

-	public static TransactionalEditingDomain getEditingDomain(ModelSet modelSet) {

-		return TransactionalEditingDomain.Factory.INSTANCE.getEditingDomain(modelSet);

-	}

-

-	/**

-	 * Attempts to set the specified resource URIs as writable according to the referenced-model handler.

-	 * 

-	 * @param modelSet

-	 *        a model set

-	 * @param uri

-	 *        referenced-model resource URIs to make writable

-	 */

-	public static void makeReferencedModelsWritable(ModelSet modelSet, URI... uris) {

-		IReadOnlyHandler2 handler = modelSet.getReadOnlyHandler();

-		if(handler != null) {

-			try {

-				// It will have this field if it's a ReadOnlyManager

-				Field orderedHandlersByAxisField = handler.getClass().getDeclaredField("orderedHandlersByAxis"); //$NON-NLS-1$

-				orderedHandlersByAxisField.setAccessible(true);

-

-				// Find the referenced-model handler and make it non-interactive so that we don't attempt to pop up a user dialog

-				@SuppressWarnings("unchecked")

-				Map<ReadOnlyAxis, IReadOnlyHandler2[]> orderedHandlersByAxis = (Map<ReadOnlyAxis, IReadOnlyHandler2[]>)orderedHandlersByAxisField.get(handler);

-				for(IReadOnlyHandler2 next : orderedHandlersByAxis.get(ReadOnlyAxis.DISCRETION)) {

-					// If this handler supports user interaction, try to suppress it

-					Duck nextHandler = new Duck(next);

-					if(nextHandler.understands("setInteractive", false)) {

-						nextHandler.quack("setInteractive", false);

-					}

-

-					// And make the resources writable in this handler

-					if(next.canMakeWritable(ReadOnlyAxis.discretionAxes(), uris).or(false)) {

-						next.makeWritable(ReadOnlyAxis.discretionAxes(), uris);

-					}

-				}

-			} catch (Exception e) {

-				// OK, didn't work. Fine.  It's expected for non-ReadOnlyManager

-			}

-

-			assertThat("Could not make referenced models writable: " + uris, handler.anyReadOnly(ReadOnlyAxis.discretionAxes(), uris).or(true), is(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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 437052
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.utils;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
+
+/**
+ * Helper class for manipulating Papyrus ModelSets
+ * 
+ * @author Camille Letavernier
+ * 
+ */
+public class ModelUtils {
+
+	/**
+	 * Loads a ModelSet and associates a TransactionalEditingDomain to it
+	 * 
+	 * Use {@link #getEditingDomain(ModelSet)} to retrieve the EditingDomain
+	 * 
+	 * @param uri
+	 * @param resolveAll
+	 * @return
+	 * @throws ModelMultiException
+	 */
+	public static ModelSet loadModelSet(URI uri, boolean resolveAll) throws ModelMultiException {
+		ModelSet modelSet = new DiResourceSet();
+		TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(modelSet);
+
+		modelSet.loadModels(uri);
+
+		if(resolveAll) {
+			EcoreUtil.resolveAll(modelSet);
+		}
+
+		return modelSet;
+	}
+
+	public static ModelSet loadModelSet(IPath workspacePath, boolean resolveAll) throws ModelMultiException {
+		URI workspaceURI = URI.createPlatformResourceURI(workspacePath.toString(), true);
+		return loadModelSet(workspaceURI, resolveAll);
+	}
+
+	public static TransactionalEditingDomain getEditingDomain(ModelSet modelSet) {
+		return TransactionalEditingDomain.Factory.INSTANCE.getEditingDomain(modelSet);
+	}
+
+	/**
+	 * Attempts to set the specified resource URIs as writable according to the referenced-model handler.
+	 * 
+	 * @param modelSet
+	 *        a model set
+	 * @param uri
+	 *        referenced-model resource URIs to make writable
+	 */
+	public static void makeReferencedModelsWritable(ModelSet modelSet, URI... uris) {
+		IReadOnlyHandler2 handler = modelSet.getReadOnlyHandler();
+		if(handler != null) {
+			try {
+				// It will have this field if it's a ReadOnlyManager
+				Field orderedHandlersByAxisField = handler.getClass().getDeclaredField("orderedHandlersByAxis"); //$NON-NLS-1$
+				orderedHandlersByAxisField.setAccessible(true);
+
+				// Find the referenced-model handler and make it non-interactive so that we don't attempt to pop up a user dialog
+				@SuppressWarnings("unchecked")
+				Map<ReadOnlyAxis, IReadOnlyHandler2[]> orderedHandlersByAxis = (Map<ReadOnlyAxis, IReadOnlyHandler2[]>)orderedHandlersByAxisField.get(handler);
+				for(IReadOnlyHandler2 next : orderedHandlersByAxis.get(ReadOnlyAxis.DISCRETION)) {
+					// If this handler supports user interaction, try to suppress it
+					Duck nextHandler = new Duck(next);
+					if(nextHandler.understands("setInteractive", false)) {
+						nextHandler.quack("setInteractive", false);
+					}
+
+					// And make the resources writable in this handler
+					if(next.canMakeWritable(ReadOnlyAxis.discretionAxes(), uris).or(false)) {
+						next.makeWritable(ReadOnlyAxis.discretionAxes(), uris);
+					}
+				}
+			} catch (Exception e) {
+				// OK, didn't work. Fine.  It's expected for non-ReadOnlyManager
+			}
+
+			assertThat("Could not make referenced models writable: " + uris, handler.anyReadOnly(ReadOnlyAxis.discretionAxes(), uris).or(true), is(false));
+		}
+	}
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ProjectUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ProjectUtils.java
index 6599fa365ac..19bbcbf7309 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ProjectUtils.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ProjectUtils.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:

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

- *

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

-package org.eclipse.papyrus.junit.utils;

-

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

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

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

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

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

-import org.junit.Assert;

-

-/**

- * 

- * Useful methods for projects

- * 

- */

-public class ProjectUtils {

-

-	private ProjectUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param projectName

-	 *        the name of the projecy

-	 * @return

-	 *         the created project

-	 * @throws CoreException

-	 */

-	public static final IProject createProject(final String projectName) throws CoreException {

-		final IWorkspace workspace = ResourcesPlugin.getWorkspace();

-		final IProject testProject = workspace.getRoot().getProject(projectName);

-

-		if(testProject.exists()) {

-			testProject.delete(true, new NullProgressMonitor());

-		}

-		testProject.create(new NullProgressMonitor());

-		testProject.open(new NullProgressMonitor());

-

-		Assert.assertNotNull(testProject);

-		return testProject;

-	}

-

-	/**

-	 * Remove all the projects in a workspace

-	 * 

-	 * @throws CoreException

-	 */

-	public static final void removeAllProjectFromTheWorkspace() throws CoreException {

-		IWorkspace workspace = ResourcesPlugin.getWorkspace();

-		for(IProject project : workspace.getRoot().getProjects()) {

-			project.delete(true, new NullProgressMonitor());

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.utils;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.junit.Assert;
+
+/**
+ * 
+ * Useful methods for projects
+ * 
+ */
+public class ProjectUtils {
+
+	private ProjectUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * 
+	 * @param projectName
+	 *        the name of the projecy
+	 * @return
+	 *         the created project
+	 * @throws CoreException
+	 */
+	public static final IProject createProject(final String projectName) throws CoreException {
+		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		final IProject testProject = workspace.getRoot().getProject(projectName);
+
+		if(testProject.exists()) {
+			testProject.delete(true, new NullProgressMonitor());
+		}
+		testProject.create(new NullProgressMonitor());
+		testProject.open(new NullProgressMonitor());
+
+		Assert.assertNotNull(testProject);
+		return testProject;
+	}
+
+	/**
+	 * Remove all the projects in a workspace
+	 * 
+	 * @throws CoreException
+	 */
+	public static final void removeAllProjectFromTheWorkspace() throws CoreException {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		for(IProject project : workspace.getRoot().getProjects()) {
+			project.delete(true, new NullProgressMonitor());
+		}
+	}
+
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/NoTransactionFixture.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/NoTransactionFixture.java
index 1f4cefd6ae8..dcada7fc60e 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/NoTransactionFixture.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/NoTransactionFixture.java
@@ -1,95 +1,95 @@
-/*****************************************************************************

- * 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.junit.utils.rules;

-

-import java.util.concurrent.atomic.AtomicReference;

-

-import org.eclipse.emf.common.command.AbstractCommand;

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

-import org.junit.rules.TestRule;

-import org.junit.runner.Description;

-import org.junit.runners.model.Statement;

-

-/**

- * This rule provides a ResourceSet with a TransactionalEditingDomain

- *

- * All test methods are executed within a Transaction (Which means test method

- * do not need to care about transactions)

- *

- * This fixture is meant to be used through {@link NoTransactionRule}

- *

- * @author Camille Letavernier

- *

- * @see {@link NoTransactionRule}

- */

-public class NoTransactionFixture implements TestRule {

-

-

-	private final ModelSetFixture modelSet;

-

-	public NoTransactionFixture(ModelSetFixture modelSet) {

-		this.modelSet = modelSet;

-	}

-

-	/**

-	 * @see org.junit.rules.TestRule#apply(org.junit.runners.model.Statement, org.junit.runner.Description)

-	 *

-	 * @param arg0

-	 * @param arg1

-	 * @return

-	 */

-	public Statement apply(final Statement base, final Description description) {

-		return new Statement() {

-			@Override

-			public void evaluate() throws Throwable {

-

-				final AtomicReference<Throwable> throwable = new AtomicReference<Throwable>();

-				modelSet.getEditingDomain().getCommandStack().execute(new AbstractCommand() {

-

-					public void execute() {

-						try {

-							base.evaluate();

-						} catch (Throwable t) {

-							throwable.set(t);

-						}

-					}

-

-					public void redo() {

-						// Nothing

-					}

-

-					/**

-					 * @see org.eclipse.emf.common.command.AbstractCommand#prepare()

-					 *

-					 * @return

-					 */

-					@Override

-					protected boolean prepare() {

-						return true;

-					}

-

-				});

-

-				if (throwable.get() != null) {

-					throw throwable.get();

-				}

-			}

-		};

-	}

-

-	public ResourceSet getResourceSet() {

-		return modelSet.getResourceSet();

-	}

-

-}

+/*****************************************************************************
+ * 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.junit.utils.rules;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * This rule provides a ResourceSet with a TransactionalEditingDomain
+ *
+ * All test methods are executed within a Transaction (Which means test method
+ * do not need to care about transactions)
+ *
+ * This fixture is meant to be used through {@link NoTransactionRule}
+ *
+ * @author Camille Letavernier
+ *
+ * @see {@link NoTransactionRule}
+ */
+public class NoTransactionFixture implements TestRule {
+
+
+	private final ModelSetFixture modelSet;
+
+	public NoTransactionFixture(ModelSetFixture modelSet) {
+		this.modelSet = modelSet;
+	}
+
+	/**
+	 * @see org.junit.rules.TestRule#apply(org.junit.runners.model.Statement, org.junit.runner.Description)
+	 *
+	 * @param arg0
+	 * @param arg1
+	 * @return
+	 */
+	public Statement apply(final Statement base, final Description description) {
+		return new Statement() {
+			@Override
+			public void evaluate() throws Throwable {
+
+				final AtomicReference<Throwable> throwable = new AtomicReference<Throwable>();
+				modelSet.getEditingDomain().getCommandStack().execute(new AbstractCommand() {
+
+					public void execute() {
+						try {
+							base.evaluate();
+						} catch (Throwable t) {
+							throwable.set(t);
+						}
+					}
+
+					public void redo() {
+						// Nothing
+					}
+
+					/**
+					 * @see org.eclipse.emf.common.command.AbstractCommand#prepare()
+					 *
+					 * @return
+					 */
+					@Override
+					protected boolean prepare() {
+						return true;
+					}
+
+				});
+
+				if (throwable.get() != null) {
+					throw throwable.get();
+				}
+			}
+		};
+	}
+
+	public ResourceSet getResourceSet() {
+		return modelSet.getResourceSet();
+	}
+
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/NoTransactionRule.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/NoTransactionRule.java
index 46797e4a31b..b3dee015fda 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/NoTransactionRule.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/NoTransactionRule.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * 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.junit.utils.rules;

-

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

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

-import org.junit.rules.RuleChain;

-import org.junit.rules.TestRule;

-import org.junit.runner.Description;

-import org.junit.runners.model.Statement;

-

-/**

- * This rule provides a ResourceSet with a TransactionalEditingDomain

- *

- * All test methods are executed within a Transaction (Which means test method

- * do not need to care about transactions)

- *

- * Usage:

- *

- * <pre>

- * &#064;Rule

- * public NoTransactionRule noTransaction = new NoTransactionRule();

- * </pre>

- *

- * @author Camille Letavernier

- */

-public class NoTransactionRule implements TestRule {

-

-	private final ModelSetFixture modelSet = new ModelSetFixture();

-

-	private final NoTransactionFixture noTransaction = new NoTransactionFixture(modelSet);

-

-	public RuleChain getRuleChain() {

-		return RuleChain.outerRule(modelSet).around(noTransaction);

-	}

-

-	public Statement apply(Statement base, Description description) {

-		return getRuleChain().apply(base, description);

-	}

-

-	public ResourceSet getResourceSet() {

-		return modelSet.getResourceSet();

-	}

-

-	public Resource getModelResource() {

-		return modelSet.getModelResource();

-	}

-}

+/*****************************************************************************
+ * 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.junit.utils.rules;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * This rule provides a ResourceSet with a TransactionalEditingDomain
+ *
+ * All test methods are executed within a Transaction (Which means test method
+ * do not need to care about transactions)
+ *
+ * Usage:
+ *
+ * <pre>
+ * &#064;Rule
+ * public NoTransactionRule noTransaction = new NoTransactionRule();
+ * </pre>
+ *
+ * @author Camille Letavernier
+ */
+public class NoTransactionRule implements TestRule {
+
+	private final ModelSetFixture modelSet = new ModelSetFixture();
+
+	private final NoTransactionFixture noTransaction = new NoTransactionFixture(modelSet);
+
+	public RuleChain getRuleChain() {
+		return RuleChain.outerRule(modelSet).around(noTransaction);
+	}
+
+	public Statement apply(Statement base, Description description) {
+		return getRuleChain().apply(base, description);
+	}
+
+	public ResourceSet getResourceSet() {
+		return modelSet.getResourceSet();
+	}
+
+	public Resource getModelResource() {
+		return modelSet.getModelResource();
+	}
+}
diff --git a/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 5eae0df29bf..63c53380f83 100644
--- a/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -1,94 +1,94 @@
-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.100.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

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

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

- org.eclipse.papyrus.eclipse.project.editors.tests;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",

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

- org.eclipse.papyrus.infra.services.resourceloading.tests;bundle-version="[1.2.0,2.0.0)",

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

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

- org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="[1.4.0,2.0.0)",

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

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

- org.eclipse.papyrus.infra.internationalization.tests;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.uml.internationalization.tests;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.uml.internationalization.controlmode.tests;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",

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

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

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

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

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

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

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

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

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

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

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

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

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

- org.eclipse.papyrus.infra.core.tests;bundle-version="[3.0.1,4.0.0)",

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

- org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="[1.2.0,2.0.0)",

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

- org.eclipse.papyrus.uml.tools.tests;bundle-version="[3.0.0,4.0.0)",

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

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

- org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="[1.2.0,2.0.0)",

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

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

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

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

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

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

- org.eclipse.papyrus.infra.emf.readonly.tests;bundle-version="[1.2.0,2.0.0)",

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

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

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

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

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

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

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

- org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="[1.2.0,2.0.0)",

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

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

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

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

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

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

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

- org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="[1.2.0,2.0.0)",

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

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

- org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="[1.3.0,2.0.0)",

- org.eclipse.papyrus.uml.nattable.stereotype.display.tests;bundle-version="[1.2.0,2.0.0)",

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

- org.eclipse.xtend.lib;bundle-version="2.8.1",

- org.eclipse.papyrus.infra.nattable.common.tests;bundle-version="[1.2.0,2.0.0)",

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

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

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

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

- org.eclipse.papyrus.infra.ui.emf.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.edit.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.edit.ui.tests;bundle-version="[1.2.0,2.0.0)",

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

- org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="[1.2.0,2.0.0)",

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

- org.eclipse.papyrus.infra.emf.gmf.tests;bundle-version="[1.2.0,2.0.0)",

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

+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.100.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.bundles.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.eclipse.project.editors.tests;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.resourceloading.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile.drafter.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization.tests;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.internationalization.tests;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.internationalization.controlmode.tests;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.tests;bundle-version="[3.0.1,4.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.types.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.tools.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.modelrepair.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.port.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.property.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.decoratormodel.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.stereotype.display.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.papyrus.infra.nattable.common.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.welcome.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.validation.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui.emf.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit.ui.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.types.ui.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.properties.ui.tests;bundle-version="[2.0.0,3.0.0)"
diff --git a/tests/junit/plugins/org.eclipse.papyrus.tests/pom.xml b/tests/junit/plugins/org.eclipse.papyrus.tests/pom.xml
index 705cf80bb40..6e3d3709ffa 100644
--- a/tests/junit/plugins/org.eclipse.papyrus.tests/pom.xml
+++ b/tests/junit/plugins/org.eclipse.papyrus.tests/pom.xml
@@ -1,139 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-		<artifactId>org.eclipse.papyrus.tests.releng</artifactId>

-		<version>1.2.0-SNAPSHOT</version>

-		<relativePath>../../../../releng/main-tests/pom.xml</relativePath>

-	</parent>

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

-	<artifactId>org.eclipse.papyrus.tests</artifactId>

-	<version>1.2.100-SNAPSHOT</version>

-	<packaging>eclipse-test-plugin</packaging>

-	<build>

-		<plugins>

-			<plugin>

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

-				<artifactId>tycho-surefire-plugin</artifactId>

-				<version>${tycho-version}</version>

-				<configuration>

-					<useUIHarness>true</useUIHarness>

-					<useUIThread>true</useUIThread>

-					<testFailureIgnore>true</testFailureIgnore>

-					<product>org.eclipse.sdk.ide</product>

-					<!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) -->

-					<skipTests>true</skipTests>

-					<testClass>org.eclipse.papyrus.tests.AllTests</testClass>

-				</configuration>

-			</plugin>

-			<plugin>

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

-				<artifactId>target-platform-configuration</artifactId>

-				<version>${tycho-version}</version>

-				<configuration>

-					<dependency-resolution>

-						<extraRequirements>

-							<requirement>

-								<type>p2-installable-unit</type>

-								<id>org.eclipse.sdk.feature.group</id>

-								<versionRange>0.0.0</versionRange>

-							</requirement>

-							<requirement>

-								<type>eclipse-feature</type>

-								<id>org.eclipse.papyrus.sdk.feature</id>

-								<versionRange>0.0.0</versionRange>

-							</requirement>

-						</extraRequirements>

-					</dependency-resolution>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

-	

-	<profiles>

-		<profile>

-  			<id>exec-gen-tests</id>

-	  		<activation>

-	  			<!-- Activate this profile when running generated tests. --> 

-				<property>

-					<name>testConfig</name>

-					<value>GENERATED_TESTS_CONFIG</value>

-				</property>

-	  		</activation>

-			<build>

-				<plugins>

-					<plugin>

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

-						<artifactId>tycho-surefire-plugin</artifactId>

-						<version>${tycho-version}</version>

-						<configuration>

-							<useUIHarness>true</useUIHarness>

-							<useUIThread>true</useUIThread>

-							<testFailureIgnore>true</testFailureIgnore>

-							<argLine>-Xms512m -Xmx2048m -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100</argLine>

-							<appArgLine>-testConfig=${testConfig}</appArgLine>

-							<product>org.eclipse.sdk.ide</product>

-						</configuration>

-						<executions>

-							<execution>

-								<id>suite1</id>

-								<phase>integration-test</phase>

-								<goals>

-									<goal>test</goal>

-								</goals>

-								<configuration>

-									<!-- Don't put skipTests in the common section because that

-									     would then also apply to the default execution, above -->

-									<skipTests>false</skipTests>

-									<testClass>org.eclipse.papyrus.tests.AllGenTests$Suite1</testClass>

-								</configuration>

-							</execution>

-							<execution>

-								<id>suite2</id>

-								<phase>integration-test</phase>

-								<goals>

-									<goal>test</goal>

-								</goals>

-								<configuration>

-									<!-- Don't put skipTests in the common section because that

-									     would then also apply to the default execution, above -->

-									<skipTests>false</skipTests>

-									<testClass>org.eclipse.papyrus.tests.AllGenTests$Suite2</testClass>

-								</configuration>

-							</execution>

-							<execution>

-								<id>suite3</id>

-								<phase>integration-test</phase>

-								<goals>

-									<goal>test</goal>

-								</goals>

-								<configuration>

-									<!-- Don't put skipTests in the common section because that

-									     would then also apply to the default execution, above -->

-									<skipTests>false</skipTests>

-									<testClass>org.eclipse.papyrus.tests.AllGenTests$Suite3</testClass>

-								</configuration>

-							</execution>

-							<execution>

-								<id>suite4</id>

-								<phase>integration-test</phase>

-								<goals>

-									<goal>test</goal>

-								</goals>

-								<configuration>

-									<!-- Don't put skipTests in the common section because that

-									     would then also apply to the default execution, above -->

-									<skipTests>false</skipTests>

-									<testClass>org.eclipse.papyrus.tests.AllGenTests$Suite4</testClass>

-								</configuration>

-							</execution>

-						</executions>

-					</plugin>

-				</plugins>

-			</build>

-		</profile>

-	</profiles>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.tests.releng</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>../../../../releng/main-tests/pom.xml</relativePath>
+	</parent>
+	<groupId>org.eclipse.papyrus.tests</groupId>
+	<artifactId>org.eclipse.papyrus.tests</artifactId>
+	<version>1.2.100-SNAPSHOT</version>
+	<packaging>eclipse-test-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<useUIHarness>true</useUIHarness>
+					<useUIThread>true</useUIThread>
+					<testFailureIgnore>true</testFailureIgnore>
+					<product>org.eclipse.sdk.ide</product>
+					<!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) -->
+					<skipTests>true</skipTests>
+					<testClass>org.eclipse.papyrus.tests.AllTests</testClass>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<dependency-resolution>
+						<extraRequirements>
+							<requirement>
+								<type>p2-installable-unit</type>
+								<id>org.eclipse.sdk.feature.group</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.papyrus.sdk.feature</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+						</extraRequirements>
+					</dependency-resolution>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+	<profiles>
+		<profile>
+  			<id>exec-gen-tests</id>
+	  		<activation>
+	  			<!-- Activate this profile when running generated tests. --> 
+				<property>
+					<name>testConfig</name>
+					<value>GENERATED_TESTS_CONFIG</value>
+				</property>
+	  		</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-surefire-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<configuration>
+							<useUIHarness>true</useUIHarness>
+							<useUIThread>true</useUIThread>
+							<testFailureIgnore>true</testFailureIgnore>
+							<argLine>-Xms512m -Xmx2048m -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100</argLine>
+							<appArgLine>-testConfig=${testConfig}</appArgLine>
+							<product>org.eclipse.sdk.ide</product>
+						</configuration>
+						<executions>
+							<execution>
+								<id>suite1</id>
+								<phase>integration-test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<!-- Don't put skipTests in the common section because that
+									     would then also apply to the default execution, above -->
+									<skipTests>false</skipTests>
+									<testClass>org.eclipse.papyrus.tests.AllGenTests$Suite1</testClass>
+								</configuration>
+							</execution>
+							<execution>
+								<id>suite2</id>
+								<phase>integration-test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<!-- Don't put skipTests in the common section because that
+									     would then also apply to the default execution, above -->
+									<skipTests>false</skipTests>
+									<testClass>org.eclipse.papyrus.tests.AllGenTests$Suite2</testClass>
+								</configuration>
+							</execution>
+							<execution>
+								<id>suite3</id>
+								<phase>integration-test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<!-- Don't put skipTests in the common section because that
+									     would then also apply to the default execution, above -->
+									<skipTests>false</skipTests>
+									<testClass>org.eclipse.papyrus.tests.AllGenTests$Suite3</testClass>
+								</configuration>
+							</execution>
+							<execution>
+								<id>suite4</id>
+								<phase>integration-test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<!-- Don't put skipTests in the common section because that
+									     would then also apply to the default execution, above -->
+									<skipTests>false</skipTests>
+									<testClass>org.eclipse.papyrus.tests.AllGenTests$Suite4</testClass>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.classpath b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.classpath
index b1dabee3829..098194ca4b7 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.classpath
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.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.7"/>

-	<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.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.project b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.project
index f0f5cd74caf..1f60e10c575 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.project
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.alf.backend.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.alf.backend.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF
index a65c98de860..263ced7a771 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ALF Backend Tests

-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.backend.tests;singleton:=true

-Bundle-Version: 1.1.0.qualifier

-Bundle-Activator: org.eclipse.papyrus.uml.alf.backend.tests.Activator

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

- org.junit,

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.emf.ecore;bundle-version="2.11.0",

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

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

- org.eclipse.core.commands;bundle-version="3.7.0",

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

- org.eclipse.emf.transaction;bundle-version="1.9.0",

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

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

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

- org.eclipse.gmf.common;bundle-version="1.3.0",

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

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

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-Bundle-ActivationPolicy: lazy

-Bundle-Vendor: Eclipse Modeling Project

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ALF Backend Tests
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.backend.tests;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.alf.backend.tests.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit,
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="2.11.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.emf.edit;bundle-version="2.11.0",
+ org.eclipse.core.commands;bundle-version="3.7.0",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.transaction;bundle-version="1.9.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.libraries;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.common;bundle-version="1.3.0",
+ org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/about.html b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/about.html
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/build.properties b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/build.properties
index 783f3733b01..00342acaf66 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/build.properties
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               test-models/,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               test-models/,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/Activator.java b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/Activator.java
index 411fb99eaf8..f9d8d397629 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/Activator.java
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/Activator.java
@@ -1,30 +1,30 @@
-package org.eclipse.papyrus.uml.alf.backend.tests;

-

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

-	}

-

-}

+package org.eclipse.papyrus.uml.alf.backend.tests;
+
+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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/AlfUtilTests.java b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/AlfUtilTests.java
index 51dbaee89e7..2d01b4527d1 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/AlfUtilTests.java
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/AlfUtilTests.java
@@ -1,162 +1,162 @@
-package org.eclipse.papyrus.uml.alf.backend.tests;

-

-import java.util.Collections;

-import java.util.Iterator;

-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.resource.Resource;

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

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

-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.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.eclipse.papyrus.uml.alf.libraries.helper.AlfUtil;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Model;

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

-import org.junit.Assert;

-import org.junit.Rule;

-import org.junit.Test;

-

-public class AlfUtilTests extends AbstractPapyrusTest {

-

-	@Rule

-	public final ModelSetFixture modelSetFixture = new ModelSetFixture();

-

-	@Test

-	@PluginResource({ "test-models/empty-model.di" })

-	public void testActionLanguageNotApplied() {

-		Assert.assertFalse(AlfUtil.getInstance().isActionLanguageProfileApplied(this.modelSetFixture.getModel()));

-	}

-

-	@Test

-	@PluginResource({ "test-models/empty-model.di" })

-	public void testStandardProfileNotapplied() {

-		Assert.assertFalse(AlfUtil.getInstance().isStandardProfileApplied(this.modelSetFixture.getModel()));

-	}

-

-	@Test

-	@PluginResource({ "test-models/empty-model.di" })

-	public void testActionLanguageProfileApplication() {

-		AlfUtil.getInstance().applyActionLanguageProfile(

-				this.modelSetFixture.getModel());

-		List<Profile> appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();

-		Assert.assertEquals("Unexpected number of applied profiles",

-				1, appliedProfiles.size());

-		Assert.assertTrue(appliedProfiles.get(0).getName().equals("ActionLanguage"));

-		AlfUtil.getInstance().applyActionLanguageProfile(

-				this.modelSetFixture.getModel());

-		appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();

-		Assert.assertEquals("Unexpected number of applied profiles",

-				1, appliedProfiles.size());

-		Assert.assertTrue("The action language profile should detected as applied", AlfUtil.getInstance().isActionLanguageProfileApplied(this.modelSetFixture.getModel()));

-	}

-

-	@Test

-	@PluginResource({ "test-models/empty-model.di" })

-	public void testStandardProfileApplication() {

-		AlfUtil.getInstance().applyStandardProfile(

-				this.modelSetFixture.getModel());

-		List<Profile> appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();

-		Assert.assertEquals("Unexpected number of applied profiles",

-				1, appliedProfiles.size());

-		AlfUtil.getInstance().applyStandardProfile(

-				this.modelSetFixture.getModel());

-		appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();

-		Assert.assertEquals("Unexpected number of applied profiles",

-				1, appliedProfiles.size());

-		Assert.assertTrue("The standard profile should detected as applied", AlfUtil.getInstance().

-				isStandardProfileApplied(this.modelSetFixture.getModel()));

-	}

-

-	@Test

-	@PluginResource({ "test-models/empty-model.di" })

-	public void testProfileLoading() {

-		Iterator<Resource> resourcesIterator = this.modelSetFixture.getResourceSet().getResources().iterator();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("ActionLanguage");

-		if (registeredProfile == null) {

-			Assert.fail("The Action language profile should a registered profile of Papyrus");

-		}

-		while (resourcesIterator.hasNext()) {

-			if (resourcesIterator.next().getURI().equals(registeredProfile.getUri())) {

-				Assert.fail("The Action language profile should not already be loaded");

-			}

-		}

-		/* A. The profile must be loaded in a Resource located in the resource set of the current model */

-		Profile actionLanguageProfileRef1 = AlfUtil.getInstance().loadProfile((Model) this.modelSetFixture.getModel(), "ActionLanguage");

-		resourcesIterator = this.modelSetFixture.getResourceSet().getResources().iterator();

-		Resource foundResource = null;

-		while (foundResource == null && resourcesIterator.hasNext()) {

-			Resource current = resourcesIterator.next();

-			if (current.getURI().equals(registeredProfile.getUri())) {

-				foundResource = current;

-			}

-		}

-		Assert.assertNotNull("The action language profile was not loaded", foundResource);

-		/* B. If we retry to load the profile the number of loaded resource does not vary */

-		int sizeBeforeLoading = this.modelSetFixture.getResourceSet().getResources().size();

-		Profile actionLanguageProfileRef2 = AlfUtil.getInstance().loadProfile((Model) this.modelSetFixture.getModel(), "ActionLanguage");

-		int sizeAfterLoading = this.modelSetFixture.getResourceSet().getResources().size();

-		Assert.assertEquals("The number of loaded resources must be the same", sizeBeforeLoading,

-				sizeAfterLoading);

-		Assert.assertTrue("Both references should point on the same profile instance", 

-				actionLanguageProfileRef1==actionLanguageProfileRef2);

-	}

-

-	@Test

-	@PluginResource({ "test-models/model-with-alf.di" })

-	public void testDetectTextualRepresentationStereotype() {

-		Class testClass1 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass1");

-		Class testClass2 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass2");

-		final Class testClass3 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass3");

-		Assert.assertNotNull(testClass1);

-		Assert.assertNotNull(testClass2);

-		Assert.assertNotNull(testClass3);

-		/* A. TestClass1 must have a textual representation comment */

-		Assert.assertNotNull(AlfUtil.getInstance().getTextualRepresentationComment(testClass1));

-		/* B. TestClass2 must have a textual representation comment */

-		Assert.assertNotNull(AlfUtil.getInstance().getTextualRepresentationComment(testClass2));

-		/* C. TestClass3 must not have a textual representation comment */

-		Assert.assertNull(AlfUtil.getInstance().getTextualRepresentationComment(testClass3));

-		/* D. TestClass3 must now have a textual representation comment */

-		TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(this.modelSetFixture.getModel());

-		GMFtoEMFCommandWrapper command = new GMFtoEMFCommandWrapper(

-				new AbstractTransactionalCommand(domain, "", Collections.EMPTY_LIST) {

-					@Override

-					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-						AlfUtil.getInstance().applyTextualRepresentation(testClass3.getOwnedComments().get(0));

-						return CommandResult.newOKCommandResult();

-					}

-		});

-		domain.getCommandStack().execute(command);

-		Assert.assertNotNull(AlfUtil.getInstance().getTextualRepresentationComment(testClass3));

-		/*E. Another attempt to apply the textual representation stereotype should not result in an error*/

-		try{

-			domain.getCommandStack().execute(command);

-		}catch(Exception e){

-			Assert.fail(e.getMessage());

-		}

-	}

-	

-	@Test

-	@PluginResource({ "test-models/model-with-alf.di" })

-	public void testRetrieveActionLanguageProfileReference(){

-		Assert.assertNotNull("It should be possible to obtain a reference on the action language profile",

-				AlfUtil.getInstance().getActionLanguageProfile((Model)this.modelSetFixture.getModel()));

-	}

-	

-	@Test

-	@PluginResource({ "test-models/model-with-alf.di" })

-	public void testRetrieveStandardProfileReference(){

-		Assert.assertNotNull("It should be possible to obtain a reference on the standard profile",

-				AlfUtil.getInstance().getStandardProfile((Model)this.modelSetFixture.getModel()));

-	}

-}

+package org.eclipse.papyrus.uml.alf.backend.tests;
+
+import java.util.Collections;
+import java.util.Iterator;
+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.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+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.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.alf.libraries.helper.AlfUtil;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class AlfUtilTests extends AbstractPapyrusTest {
+
+	@Rule
+	public final ModelSetFixture modelSetFixture = new ModelSetFixture();
+
+	@Test
+	@PluginResource({ "test-models/empty-model.di" })
+	public void testActionLanguageNotApplied() {
+		Assert.assertFalse(AlfUtil.getInstance().isActionLanguageProfileApplied(this.modelSetFixture.getModel()));
+	}
+
+	@Test
+	@PluginResource({ "test-models/empty-model.di" })
+	public void testStandardProfileNotapplied() {
+		Assert.assertFalse(AlfUtil.getInstance().isStandardProfileApplied(this.modelSetFixture.getModel()));
+	}
+
+	@Test
+	@PluginResource({ "test-models/empty-model.di" })
+	public void testActionLanguageProfileApplication() {
+		AlfUtil.getInstance().applyActionLanguageProfile(
+				this.modelSetFixture.getModel());
+		List<Profile> appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();
+		Assert.assertEquals("Unexpected number of applied profiles",
+				1, appliedProfiles.size());
+		Assert.assertTrue(appliedProfiles.get(0).getName().equals("ActionLanguage"));
+		AlfUtil.getInstance().applyActionLanguageProfile(
+				this.modelSetFixture.getModel());
+		appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();
+		Assert.assertEquals("Unexpected number of applied profiles",
+				1, appliedProfiles.size());
+		Assert.assertTrue("The action language profile should detected as applied", AlfUtil.getInstance().isActionLanguageProfileApplied(this.modelSetFixture.getModel()));
+	}
+
+	@Test
+	@PluginResource({ "test-models/empty-model.di" })
+	public void testStandardProfileApplication() {
+		AlfUtil.getInstance().applyStandardProfile(
+				this.modelSetFixture.getModel());
+		List<Profile> appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();
+		Assert.assertEquals("Unexpected number of applied profiles",
+				1, appliedProfiles.size());
+		AlfUtil.getInstance().applyStandardProfile(
+				this.modelSetFixture.getModel());
+		appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();
+		Assert.assertEquals("Unexpected number of applied profiles",
+				1, appliedProfiles.size());
+		Assert.assertTrue("The standard profile should detected as applied", AlfUtil.getInstance().
+				isStandardProfileApplied(this.modelSetFixture.getModel()));
+	}
+
+	@Test
+	@PluginResource({ "test-models/empty-model.di" })
+	public void testProfileLoading() {
+		Iterator<Resource> resourcesIterator = this.modelSetFixture.getResourceSet().getResources().iterator();
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("ActionLanguage");
+		if (registeredProfile == null) {
+			Assert.fail("The Action language profile should a registered profile of Papyrus");
+		}
+		while (resourcesIterator.hasNext()) {
+			if (resourcesIterator.next().getURI().equals(registeredProfile.getUri())) {
+				Assert.fail("The Action language profile should not already be loaded");
+			}
+		}
+		/* A. The profile must be loaded in a Resource located in the resource set of the current model */
+		Profile actionLanguageProfileRef1 = AlfUtil.getInstance().loadProfile((Model) this.modelSetFixture.getModel(), "ActionLanguage");
+		resourcesIterator = this.modelSetFixture.getResourceSet().getResources().iterator();
+		Resource foundResource = null;
+		while (foundResource == null && resourcesIterator.hasNext()) {
+			Resource current = resourcesIterator.next();
+			if (current.getURI().equals(registeredProfile.getUri())) {
+				foundResource = current;
+			}
+		}
+		Assert.assertNotNull("The action language profile was not loaded", foundResource);
+		/* B. If we retry to load the profile the number of loaded resource does not vary */
+		int sizeBeforeLoading = this.modelSetFixture.getResourceSet().getResources().size();
+		Profile actionLanguageProfileRef2 = AlfUtil.getInstance().loadProfile((Model) this.modelSetFixture.getModel(), "ActionLanguage");
+		int sizeAfterLoading = this.modelSetFixture.getResourceSet().getResources().size();
+		Assert.assertEquals("The number of loaded resources must be the same", sizeBeforeLoading,
+				sizeAfterLoading);
+		Assert.assertTrue("Both references should point on the same profile instance", 
+				actionLanguageProfileRef1==actionLanguageProfileRef2);
+	}
+
+	@Test
+	@PluginResource({ "test-models/model-with-alf.di" })
+	public void testDetectTextualRepresentationStereotype() {
+		Class testClass1 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass1");
+		Class testClass2 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass2");
+		final Class testClass3 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass3");
+		Assert.assertNotNull(testClass1);
+		Assert.assertNotNull(testClass2);
+		Assert.assertNotNull(testClass3);
+		/* A. TestClass1 must have a textual representation comment */
+		Assert.assertNotNull(AlfUtil.getInstance().getTextualRepresentationComment(testClass1));
+		/* B. TestClass2 must have a textual representation comment */
+		Assert.assertNotNull(AlfUtil.getInstance().getTextualRepresentationComment(testClass2));
+		/* C. TestClass3 must not have a textual representation comment */
+		Assert.assertNull(AlfUtil.getInstance().getTextualRepresentationComment(testClass3));
+		/* D. TestClass3 must now have a textual representation comment */
+		TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(this.modelSetFixture.getModel());
+		GMFtoEMFCommandWrapper command = new GMFtoEMFCommandWrapper(
+				new AbstractTransactionalCommand(domain, "", Collections.EMPTY_LIST) {
+					@Override
+					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+						AlfUtil.getInstance().applyTextualRepresentation(testClass3.getOwnedComments().get(0));
+						return CommandResult.newOKCommandResult();
+					}
+		});
+		domain.getCommandStack().execute(command);
+		Assert.assertNotNull(AlfUtil.getInstance().getTextualRepresentationComment(testClass3));
+		/*E. Another attempt to apply the textual representation stereotype should not result in an error*/
+		try{
+			domain.getCommandStack().execute(command);
+		}catch(Exception e){
+			Assert.fail(e.getMessage());
+		}
+	}
+	
+	@Test
+	@PluginResource({ "test-models/model-with-alf.di" })
+	public void testRetrieveActionLanguageProfileReference(){
+		Assert.assertNotNull("It should be possible to obtain a reference on the action language profile",
+				AlfUtil.getInstance().getActionLanguageProfile((Model)this.modelSetFixture.getModel()));
+	}
+	
+	@Test
+	@PluginResource({ "test-models/model-with-alf.di" })
+	public void testRetrieveStandardProfileReference(){
+		Assert.assertNotNull("It should be possible to obtain a reference on the standard profile",
+				AlfUtil.getInstance().getStandardProfile((Model)this.modelSetFixture.getModel()));
+	}
+}
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/AllTests.java b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/AllTests.java
index b4e4e90f078..cbd870fc80a 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/AllTests.java
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/AllTests.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.uml.alf.backend.tests;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(Suite.class)

-@SuiteClasses({AlfUtilTests.class, BackupUtilTests.class})

-public class AllTests {

-

-}

+package org.eclipse.papyrus.uml.alf.backend.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({AlfUtilTests.class, BackupUtilTests.class})
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/BackupUtilTests.java b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/BackupUtilTests.java
index 767ac96106d..e1868a4eeea 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/BackupUtilTests.java
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/src/org/eclipse/papyrus/uml/alf/backend/tests/BackupUtilTests.java
@@ -1,144 +1,144 @@
-package org.eclipse.papyrus.uml.alf.backend.tests;

-

-import java.sql.Timestamp;

-import java.util.Calendar;

-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.transaction.TransactionalEditingDomain;

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

-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.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState;

-import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState.EditionStatus;

-import org.eclipse.papyrus.uml.alf.libraries.helper.BackupUtil;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Model;

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

-import org.eclipse.uml2.uml.Enumeration;

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

-import org.junit.Assert;

-import org.junit.Rule;

-import org.junit.Test;

-

-public class BackupUtilTests {

-	

-	@Rule

-	public final ModelSetFixture modelSetFixture = new ModelSetFixture();

-	

-	@Test

-	@PluginResource({ "test-models/empty-model.di" })

-	public void testBackupProfileNotApplied(){

-		Assert.assertFalse(BackupUtil.getInstance().

-				isBackupProfileApplied(this.modelSetFixture.getModel()));

-	}

-	

-	@Test

-	@PluginResource({ "test-models/model-with-alf.di" })

-	public void testBackupProfileIsApplied(){

-		Assert.assertTrue("The backup profile should be applied", BackupUtil.getInstance().

-				isBackupProfileApplied(this.modelSetFixture.getModel()));

-	}

-	

-	@Test

-	@PluginResource({ "test-models/model-with-alf.di" })

-	public void testRetrieveBackupProfileReference(){

-		Assert.assertNotNull("It should be possible to obtain a reference on the backup profile",

-				BackupUtil.getInstance().getBackupProfile((Model)this.modelSetFixture.getModel()));

-	}

-	

-	@Test

-	@PluginResource({ "test-models/empty-model.di" })

-	public void testBackupProfileApplication(){

-		BackupUtil.getInstance().applyBackupProfile(

-				this.modelSetFixture.getModel());

-		List<Profile> appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();

-		Assert.assertEquals("Unexpected number of applied profiles",

-				1, appliedProfiles.size());

-		BackupUtil.getInstance().applyBackupProfile(

-				this.modelSetFixture.getModel());

-		appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();

-		Assert.assertEquals("Unexpected number of applied profiles",

-				1, appliedProfiles.size());

-		Assert.assertTrue("The backup profile should be detected as being applied", 

-				BackupUtil.getInstance().isBackupProfileApplied(this.modelSetFixture.getModel()));

-	}

-

-	@Test

-	@PluginResource({ "test-models/model-with-alf.di" })

-	public void testRetrievalOfBackupStereotype(){

-		Class testClass1 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass1");

-		Stereotype backupStereotype = BackupUtil.getInstance().getBackupStereotype(testClass1);

-		Assert.assertNotNull("In this context the Backup stereotype should be accessible", backupStereotype);

-		Assert.assertTrue(BackupUtil.getInstance().getBackupProfile((Model)this.modelSetFixture.getModel())

-				== backupStereotype.getProfile());

-	}

-	

-	@Test

-	@PluginResource({ "test-models/model-with-alf.di" })

-	public void testRetrievalOfBackupStateDefinition(){

-		Class testClass1 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass1");

-		Enumeration backupState = BackupUtil.getInstance().getBackupStateDefinition(testClass1);

-		Assert.assertNotNull("In this context the BackupState type should be accessible", backupState);

-		Assert.assertTrue(BackupUtil.getInstance().getBackupProfile((Model)this.modelSetFixture.getModel())

-				== backupState.getOwner());

-	}

-	

-	@Test

-	@PluginResource({ "test-models/model-with-alf.di" })

-	public void testDetectBackupStereotype(){

-		Class testClass1 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass1");

-		Class testClass2 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass2");

-		final Class testClass3 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass3");

-		Assert.assertNotNull(testClass1);

-		Assert.assertNotNull(testClass2);

-		Assert.assertNotNull(testClass3);

-		/*A. The backup stereotype must be applied on a comment owned by TestClass1*/

-		Assert.assertNotNull(BackupUtil.getInstance().getBackupComment(testClass1));

-		/*B. The backup stereotype must be applied on a comment owned by TestClass2*/

-		Assert.assertNotNull(BackupUtil.getInstance().getBackupComment(testClass2));

-		/*C. The backup stereotype must not be applied on comment owned by TestClass3*/

-		Assert.assertNull(BackupUtil.getInstance().getBackupComment(testClass3));

-	}

-	

-	@Test

-	@PluginResource({ "test-models/model-with-alf.di" })

-	public void testBackupStereotypeApplication(){

-		final Class testClass3 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass3");

-		Assert.assertNotNull(testClass3);

-		/*A.Apply the stereotype and set the properties values*/

-		final Timestamp timestamp = new Timestamp(Calendar.getInstance().getTimeInMillis());

-		TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(this.modelSetFixture.getModel());

-		GMFtoEMFCommandWrapper command = new GMFtoEMFCommandWrapper(

-				new AbstractTransactionalCommand(domain, "", Collections.EMPTY_LIST) {

-					@Override

-					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-						BackupState state = new BackupState();

-						state.timestamp = timestamp;

-						state.status = EditionStatus.MERGED;

-						BackupUtil.getInstance().applyBackup(testClass3.getOwnedComments().get(0), state);

-						return CommandResult.newOKCommandResult();

-					}

-		});

-		domain.getCommandStack().execute(command);

-		/*B. Ensure it was correctly applied (i.e., check properties values)*/

-		Comment stereotypedComment = BackupUtil.getInstance().getBackupComment(testClass3);

-		Assert.assertNotNull(stereotypedComment);

-		BackupState state = BackupUtil.getInstance().getBackupState(stereotypedComment);

-		Assert.assertEquals("Timestamps should be equivalent", timestamp, state.timestamp);

-		Assert.assertEquals("Edition status should be equivalent", EditionStatus.MERGED, state.status);

-		/*C. Another attempt to apply the stereotype should not result in an error*/

-		try{

-			domain.getCommandStack().execute(command);

-		}catch(Exception e){

-			Assert.fail(e.getMessage());

-		}

-	}

-}

+package org.eclipse.papyrus.uml.alf.backend.tests;
+
+import java.sql.Timestamp;
+import java.util.Calendar;
+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.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+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.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState;
+import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState.EditionStatus;
+import org.eclipse.papyrus.uml.alf.libraries.helper.BackupUtil;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class BackupUtilTests {
+	
+	@Rule
+	public final ModelSetFixture modelSetFixture = new ModelSetFixture();
+	
+	@Test
+	@PluginResource({ "test-models/empty-model.di" })
+	public void testBackupProfileNotApplied(){
+		Assert.assertFalse(BackupUtil.getInstance().
+				isBackupProfileApplied(this.modelSetFixture.getModel()));
+	}
+	
+	@Test
+	@PluginResource({ "test-models/model-with-alf.di" })
+	public void testBackupProfileIsApplied(){
+		Assert.assertTrue("The backup profile should be applied", BackupUtil.getInstance().
+				isBackupProfileApplied(this.modelSetFixture.getModel()));
+	}
+	
+	@Test
+	@PluginResource({ "test-models/model-with-alf.di" })
+	public void testRetrieveBackupProfileReference(){
+		Assert.assertNotNull("It should be possible to obtain a reference on the backup profile",
+				BackupUtil.getInstance().getBackupProfile((Model)this.modelSetFixture.getModel()));
+	}
+	
+	@Test
+	@PluginResource({ "test-models/empty-model.di" })
+	public void testBackupProfileApplication(){
+		BackupUtil.getInstance().applyBackupProfile(
+				this.modelSetFixture.getModel());
+		List<Profile> appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();
+		Assert.assertEquals("Unexpected number of applied profiles",
+				1, appliedProfiles.size());
+		BackupUtil.getInstance().applyBackupProfile(
+				this.modelSetFixture.getModel());
+		appliedProfiles = this.modelSetFixture.getModel().getAppliedProfiles();
+		Assert.assertEquals("Unexpected number of applied profiles",
+				1, appliedProfiles.size());
+		Assert.assertTrue("The backup profile should be detected as being applied", 
+				BackupUtil.getInstance().isBackupProfileApplied(this.modelSetFixture.getModel()));
+	}
+
+	@Test
+	@PluginResource({ "test-models/model-with-alf.di" })
+	public void testRetrievalOfBackupStereotype(){
+		Class testClass1 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass1");
+		Stereotype backupStereotype = BackupUtil.getInstance().getBackupStereotype(testClass1);
+		Assert.assertNotNull("In this context the Backup stereotype should be accessible", backupStereotype);
+		Assert.assertTrue(BackupUtil.getInstance().getBackupProfile((Model)this.modelSetFixture.getModel())
+				== backupStereotype.getProfile());
+	}
+	
+	@Test
+	@PluginResource({ "test-models/model-with-alf.di" })
+	public void testRetrievalOfBackupStateDefinition(){
+		Class testClass1 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass1");
+		Enumeration backupState = BackupUtil.getInstance().getBackupStateDefinition(testClass1);
+		Assert.assertNotNull("In this context the BackupState type should be accessible", backupState);
+		Assert.assertTrue(BackupUtil.getInstance().getBackupProfile((Model)this.modelSetFixture.getModel())
+				== backupState.getOwner());
+	}
+	
+	@Test
+	@PluginResource({ "test-models/model-with-alf.di" })
+	public void testDetectBackupStereotype(){
+		Class testClass1 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass1");
+		Class testClass2 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass2");
+		final Class testClass3 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass3");
+		Assert.assertNotNull(testClass1);
+		Assert.assertNotNull(testClass2);
+		Assert.assertNotNull(testClass3);
+		/*A. The backup stereotype must be applied on a comment owned by TestClass1*/
+		Assert.assertNotNull(BackupUtil.getInstance().getBackupComment(testClass1));
+		/*B. The backup stereotype must be applied on a comment owned by TestClass2*/
+		Assert.assertNotNull(BackupUtil.getInstance().getBackupComment(testClass2));
+		/*C. The backup stereotype must not be applied on comment owned by TestClass3*/
+		Assert.assertNull(BackupUtil.getInstance().getBackupComment(testClass3));
+	}
+	
+	@Test
+	@PluginResource({ "test-models/model-with-alf.di" })
+	public void testBackupStereotypeApplication(){
+		final Class testClass3 = (Class) this.modelSetFixture.getModel().getOwnedType("TestClass3");
+		Assert.assertNotNull(testClass3);
+		/*A.Apply the stereotype and set the properties values*/
+		final Timestamp timestamp = new Timestamp(Calendar.getInstance().getTimeInMillis());
+		TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(this.modelSetFixture.getModel());
+		GMFtoEMFCommandWrapper command = new GMFtoEMFCommandWrapper(
+				new AbstractTransactionalCommand(domain, "", Collections.EMPTY_LIST) {
+					@Override
+					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+						BackupState state = new BackupState();
+						state.timestamp = timestamp;
+						state.status = EditionStatus.MERGED;
+						BackupUtil.getInstance().applyBackup(testClass3.getOwnedComments().get(0), state);
+						return CommandResult.newOKCommandResult();
+					}
+		});
+		domain.getCommandStack().execute(command);
+		/*B. Ensure it was correctly applied (i.e., check properties values)*/
+		Comment stereotypedComment = BackupUtil.getInstance().getBackupComment(testClass3);
+		Assert.assertNotNull(stereotypedComment);
+		BackupState state = BackupUtil.getInstance().getBackupState(stereotypedComment);
+		Assert.assertEquals("Timestamps should be equivalent", timestamp, state.timestamp);
+		Assert.assertEquals("Edition status should be equivalent", EditionStatus.MERGED, state.status);
+		/*C. Another attempt to apply the stereotype should not result in an error*/
+		try{
+			domain.getCommandStack().execute(command);
+		}catch(Exception e){
+			Assert.fail(e.getMessage());
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.di b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.di
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.notation b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.notation
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.notation
@@ -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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.uml
index 6d376f3b610..23cd8cc800e 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/empty-model.uml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_HorksDBkEeWIG7E3TDTNig" name="RootElement">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_IJ6CcDBkEeWIG7E3TDTNig">

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

-  </packageImport>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_HorksDBkEeWIG7E3TDTNig" name="RootElement">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_IJ6CcDBkEeWIG7E3TDTNig">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.di b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.di
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.notation b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.notation
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.notation
@@ -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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.uml
index 5d62b70cfc2..6323362d747 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/test-models/model-with-alf.uml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:BackupProfile="http:///schemas/BackupProfile/_J7IFgKInEeS_KNX0nfvIVQ/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ http:///schemas/BackupProfile/_J7IFgKInEeS_KNX0nfvIVQ/1 pathmap://PAPYRUS_BACKUP_PROFILE/backup-profile.profile.uml#_J7IFgaInEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_s4hsMDB0EeWIG7E3TDTNig" name="RootElement">

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_s_FAIDB0EeWIG7E3TDTNig">

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

-    </packageImport>

-    <packagedElement xmi:type="uml:Class" xmi:id="_z7R9QDB0EeWIG7E3TDTNig" name="TestClass1">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_9LJmIDB0EeWIG7E3TDTNig">

-        <body>namespace RootElement;&#xD;

-&#xD;

-class TestClass{&#xD;

-&#xD;

-}</body>

-      </ownedComment>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_TIpYMDB1EeWIG7E3TDTNig" name="TestClass2">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_VSvRMDB1EeWIG7E3TDTNig">

-        <body>This is a test class&#xD;

-</body>

-      </ownedComment>

-      <ownedComment xmi:type="uml:Comment" xmi:id="_XFaIsDB1EeWIG7E3TDTNig">

-        <body>namespace RootElement;&#xD;

-&#xD;

-class TestClass2{&#xD;

-&#xD;

-}</body>

-      </ownedComment>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_pybBcDB1EeWIG7E3TDTNig" name="TestClass3">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_Kx-rYDB5EeWIG7E3TDTNig">

-        <body>namespace RootElement;&#xD;

-&#xD;

-class TestClass3{&#xD;

-&#xD;

-}</body>

-      </ownedComment>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_4vMYMDB0EeWIG7E3TDTNig">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4vQpoDB0EeWIG7E3TDTNig" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQpoTB0EeWIG7E3TDTNig" key="Version" value="0.1.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQpojB0EeWIG7E3TDTNig" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQpozB0EeWIG7E3TDTNig" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQppDB0EeWIG7E3TDTNig" key="Date" value="2015-01-21"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQppTB0EeWIG7E3TDTNig" key="Author" value=""/>

-      </eAnnotations>

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_4vRQsDB0EeWIG7E3TDTNig">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4vR3wDB0EeWIG7E3TDTNig" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3wTB0EeWIG7E3TDTNig" key="Version" value="0.0.2"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3wjB0EeWIG7E3TDTNig" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3wzB0EeWIG7E3TDTNig" key="Copyright" value="CEA LIST"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3xDB0EeWIG7E3TDTNig" key="Date" value="2015-01-22"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3xTB0EeWIG7E3TDTNig" key="Author" value=""/>

-      </eAnnotations>

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_BACKUP_PROFILE/backup-profile.profile.uml#_J7IFgaInEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_BACKUP_PROFILE/backup-profile.profile.uml#_74TbUKFzEeS_KNX0nfvIVQ"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_7fcSQDB0EeWIG7E3TDTNig">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7fc5UDB0EeWIG7E3TDTNig" 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>

-  </uml:Model>

-  <BackupProfile:Backup xmi:id="_-QwjUDB0EeWIG7E3TDTNig" timestamp="2015-07-21 16:17:47.476" base_Comment="_9LJmIDB0EeWIG7E3TDTNig"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_-RHIoDB0EeWIG7E3TDTNig" base_Comment="_9LJmIDB0EeWIG7E3TDTNig" language="Alf"/>

-  <BackupProfile:Backup xmi:id="_YNaSkDB1EeWIG7E3TDTNig" timestamp="2015-07-21 16:17:47.476" base_Comment="_XFaIsDB1EeWIG7E3TDTNig"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_YNhnUDB1EeWIG7E3TDTNig" base_Comment="_XFaIsDB1EeWIG7E3TDTNig" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:BackupProfile="http:///schemas/BackupProfile/_J7IFgKInEeS_KNX0nfvIVQ/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ http:///schemas/BackupProfile/_J7IFgKInEeS_KNX0nfvIVQ/1 pathmap://PAPYRUS_BACKUP_PROFILE/backup-profile.profile.uml#_J7IFgaInEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_s4hsMDB0EeWIG7E3TDTNig" name="RootElement">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_s_FAIDB0EeWIG7E3TDTNig">
+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Class" xmi:id="_z7R9QDB0EeWIG7E3TDTNig" name="TestClass1">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_9LJmIDB0EeWIG7E3TDTNig">
+        <body>namespace RootElement;&#xD;
+&#xD;
+class TestClass{&#xD;
+&#xD;
+}</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_TIpYMDB1EeWIG7E3TDTNig" name="TestClass2">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_VSvRMDB1EeWIG7E3TDTNig">
+        <body>This is a test class&#xD;
+</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_XFaIsDB1EeWIG7E3TDTNig">
+        <body>namespace RootElement;&#xD;
+&#xD;
+class TestClass2{&#xD;
+&#xD;
+}</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_pybBcDB1EeWIG7E3TDTNig" name="TestClass3">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Kx-rYDB5EeWIG7E3TDTNig">
+        <body>namespace RootElement;&#xD;
+&#xD;
+class TestClass3{&#xD;
+&#xD;
+}</body>
+      </ownedComment>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_4vMYMDB0EeWIG7E3TDTNig">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4vQpoDB0EeWIG7E3TDTNig" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQpoTB0EeWIG7E3TDTNig" key="Version" value="0.1.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQpojB0EeWIG7E3TDTNig" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQpozB0EeWIG7E3TDTNig" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQppDB0EeWIG7E3TDTNig" key="Date" value="2015-01-21"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vQppTB0EeWIG7E3TDTNig" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4vNmUDB0EeWIG7E3TDTNig" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_4vRQsDB0EeWIG7E3TDTNig">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4vR3wDB0EeWIG7E3TDTNig" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3wTB0EeWIG7E3TDTNig" key="Version" value="0.0.2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3wjB0EeWIG7E3TDTNig" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3wzB0EeWIG7E3TDTNig" key="Copyright" value="CEA LIST"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3xDB0EeWIG7E3TDTNig" key="Date" value="2015-01-22"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4vR3xTB0EeWIG7E3TDTNig" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4vRQsTB0EeWIG7E3TDTNig" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_BACKUP_PROFILE/backup-profile.profile.uml#_J7IFgaInEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_BACKUP_PROFILE/backup-profile.profile.uml#_74TbUKFzEeS_KNX0nfvIVQ"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_7fcSQDB0EeWIG7E3TDTNig">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7fc5UDB0EeWIG7E3TDTNig" 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>
+  </uml:Model>
+  <BackupProfile:Backup xmi:id="_-QwjUDB0EeWIG7E3TDTNig" timestamp="2015-07-21 16:17:47.476" base_Comment="_9LJmIDB0EeWIG7E3TDTNig"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_-RHIoDB0EeWIG7E3TDTNig" base_Comment="_9LJmIDB0EeWIG7E3TDTNig" language="Alf"/>
+  <BackupProfile:Backup xmi:id="_YNaSkDB1EeWIG7E3TDTNig" timestamp="2015-07-21 16:17:47.476" base_Comment="_XFaIsDB1EeWIG7E3TDTNig"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_YNhnUDB1EeWIG7E3TDTNig" base_Comment="_XFaIsDB1EeWIG7E3TDTNig" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.classpath b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.classpath
index c76b7dcedf7..1bfb4f7a60c 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.classpath
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

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

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

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

-	<classpathentry kind="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.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins" />
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/ALF Tests.launch b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/ALF Tests.launch
index 0753fd01661..5a7a656522a 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/ALF Tests.launch
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/ALF Tests.launch
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.alf.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.alf.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2048m"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.alf.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.alf.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2048m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment.alf
index fb3d48bff53..afc8f274aa6 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment.alf
@@ -1,5 +1,5 @@
-/**

- * Test non-indexed assignment expressions.

+/**
+ * Test non-indexed assignment expressions.
  **/
 active class Expressions_Assignment {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Feature.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Feature.alf
index a64400062e8..f7b3f4ebc5a 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Feature.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Feature.alf
@@ -1,5 +1,5 @@
-/**

- * Test non-indexed feature assignment expressions

+/**
+ * Test non-indexed feature assignment expressions
  **/
 active class Expressions_Assignment_Feature {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Feature_Indexed.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Feature_Indexed.alf
index 2c48a0890de..93fc0696194 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Feature_Indexed.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Feature_Indexed.alf
@@ -1,5 +1,5 @@
-/**

- * Test indexed feature assignment expressions

+/**
+ * Test indexed feature assignment expressions
  **/
 active class Expressions_Assignment_Feature_Indexed {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Indexed.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Indexed.alf
index 3e1060d0afe..939029c5087 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Indexed.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Assignment_Indexed.alf
@@ -1,5 +1,5 @@
-/**

- * Test indexed assignment expressions.

+/**
+ * Test indexed assignment expressions.
  **/
 active class Expressions_Assignment_Indexed {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Association.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Association.alf
index e802d25843a..92a3a6678ed 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Association.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Association.alf
@@ -1,5 +1,5 @@
-/**

- * Test association-related expressions.

+/**
+ * Test association-related expressions.
  **/
 active class Expressions_Association {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Constructor_Destructor.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Constructor_Destructor.alf
index 92bcfecec46..3ccc0329353 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Constructor_Destructor.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Constructor_Destructor.alf
@@ -1,5 +1,5 @@
-/**

- * Test constructor and destructor expressions.

+/**
+ * Test constructor and destructor expressions.
  **/
 active class Expressions_Constructor_Destructor {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Increment_Decrement.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Increment_Decrement.alf
index 75d09aceac9..f6813b67f2b 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Increment_Decrement.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Increment_Decrement.alf
@@ -1,5 +1,5 @@
-/**

- * Test increment and decrement expressions.

+/**
+ * Test increment and decrement expressions.
  **/
 active class Expressions_Increment_Decrement {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Invocation.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Invocation.alf
index c37f2e529c7..daa70020f13 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Invocation.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Invocation.alf
@@ -1,8 +1,8 @@
 private import
 FoundationalModelLibrary::PrimitiveBehaviors::IntegerFunctions::ToString;
 
-/**

- * Test behavior, operation and super invocation expressions.

+/**
+ * Test behavior, operation and super invocation expressions.
  **/
 active class Expressions_Invocation {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Literal_Name.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Literal_Name.alf
index 8c78a2eac93..17d8abdce06 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Literal_Name.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Literal_Name.alf
@@ -1,5 +1,5 @@
-/**

- * Test literal and name expressions.

+/**
+ * Test literal and name expressions.
  **/
 active class Expressions_Literal_Name {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Object.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Object.alf
index e2499a47a89..9acb3ef26d4 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Object.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Object.alf
@@ -1,5 +1,5 @@
-/**

- * Test object structure expressions.

+/**
+ * Test object structure expressions.
  **/
 active class Expressions_Object {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Operator.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Operator.alf
index 935d1555812..3d2f323c2e4 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Operator.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Operator.alf
@@ -1,5 +1,5 @@
-/**

- * Test various operator expressions.

+/**
+ * Test various operator expressions.
  **/
 active class Expressions_Operator {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Construction.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Construction.alf
index 83fb9c602ca..9249b479e2d 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Construction.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Construction.alf
@@ -1,5 +1,5 @@
-/**

- * Test sequence construction expressions.

+/**
+ * Test sequence construction expressions.
  **/
 active class Expressions_Sequence_Construction {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Expansion_Reduction.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Expansion_Reduction.alf
index ec2a8b47a9d..5f87775b788 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Expansion_Reduction.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Expansion_Reduction.alf
@@ -1,7 +1,7 @@
 private import Alf::Library::PrimitiveBehaviors::IntegerFunctions::*;
 
-/**

- * Test sequence expansion and reduction expressions.

+/**
+ * Test sequence expansion and reduction expressions.
  **/
 active class Expressions_Sequence_Expansion_Reduction {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Operation.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Operation.alf
index 41cdc27c1f9..95e45ad8288 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Operation.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Sequence_Operation.alf
@@ -1,5 +1,5 @@
-/**

- * Test sequence operation expressions.

+/**
+ * Test sequence operation expressions.
  **/
 active class Expressions_Sequence_Operation {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Template.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Template.alf
index 68b9286fc3d..ce4457d6577 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Template.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Expressions_Template.alf
@@ -1,5 +1,5 @@
-/**

- * Test expressions involving templates.

+/**
+ * Test expressions involving templates.
  **/
 active class Expressions_Template {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Accept.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Accept.alf
index 4f055e98296..6d6c755fa8d 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Accept.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Accept.alf
@@ -1,5 +1,5 @@
-/**

- * Test accept statements.

+/**
+ * Test accept statements.
  **/
 active class Statements_Accept {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Classify.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Classify.alf
index bd0541d8540..a01b4fc1cdd 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Classify.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Classify.alf
@@ -1,5 +1,5 @@
-/**

- * Test classify statements.

+/**
+ * Test classify statements.
  **/
 active class Statements_Classify {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Conditional.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Conditional.alf
index b0b11f07338..e7e8efbbef2 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Conditional.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Conditional.alf
@@ -1,5 +1,5 @@
-/**

- * Test if and switch statements.

+/**
+ * Test if and switch statements.
  **/
 active class Statements_Conditional {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_For_Looping.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_For_Looping.alf
index 7ac166dcb38..a151a559e14 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_For_Looping.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_For_Looping.alf
@@ -1,5 +1,5 @@
-/**

- * Test for statements.

+/**
+ * Test for statements.
  **/
 active class Statements_For_Looping {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Return.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Return.alf
index 01a07d3fdc4..5432f160c5b 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Return.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Return.alf
@@ -1,5 +1,5 @@
-/**

- * Test return statements.

+/**
+ * Test return statements.
  **/
 active class Statements_Return {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Simple.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Simple.alf
index 74c533c969a..20ad4cea2c6 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Simple.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_Simple.alf
@@ -1,5 +1,5 @@
-/** 

- * Test block, empty and local name declaration statements.

+/** 
+ * Test block, empty and local name declaration statements.
  **/
 active class Statements_Simple {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_While_Do_Looping.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_While_Do_Looping.alf
index c64a543a5ad..060c9e6ec84 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_While_Do_Looping.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/Alf/Statements_While_Do_Looping.alf
@@ -1,5 +1,5 @@
-/**

- * Test while and do statements.

+/**
+ * Test while and do statements.
  **/
 active class Statements_While_Do_Looping {
 
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
index f9949debc42..5de2ef512c4 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
@@ -1,49 +1,49 @@
-Manifest-Version: 1.0

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

- org.eclipse.xtext.junit4,

- org.eclipse.ui.workbench;resolution:=optional,

- org.eclipse.m2m.qvt.oml;bundle-version="3.3.0",

- org.eclipse.emf.common,

- org.eclipse.emf.ecore,

- org.eclipse.m2m.qvt.oml.common;bundle-version="3.3.0",

- org.eclipse.m2m.qvt.oml.emf.util;bundle-version="3.3.0",

- org.eclipse.m2m.qvt.oml.ocl;bundle-version="3.3.0",

- org.eclipse.m2m.qvt.oml.runtime;bundle-version="3.3.0",

- org.eclipse.xtend.lib,

- org.eclipse.xtext.xbase.lib,

- org.eclipse.xtend;bundle-version="1.4.0",

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

- org.junit;visibility:=reexport,

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

- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,

- org.eclipse.ocl.uml;bundle-version="5.0.0",

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

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

- org.eclipse.papyrus.uml.alf.ui;bundle-version="[3.0.0,4.0.0)",

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

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

- org.eclipse.xtext,

- org.eclipse.ocl.pivot,

- org.eclipse.ocl,

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

- org.eclipse.papyrus.infra.core.log

-Export-Package: org.eclipse.papyrus.uml.alf,

- org.eclipse.papyrus.uml.alf.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .,

- Alf/,

- UML/

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: ALF Tests

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.tests;singleton:=true

-Import-Package: org.apache.log4j,

- org.hamcrest.core,

- org.junit;version="4.5.0",

- org.junit.runner;version="4.5.0",

- org.junit.runner.manipulation;version="4.5.0",

- org.junit.runner.notification;version="4.5.0",

- org.junit.runners;version="4.5.0",

- org.junit.runners.model;version="4.5.0"

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.xtext.junit4,
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.m2m.qvt.oml;bundle-version="3.3.0",
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore,
+ org.eclipse.m2m.qvt.oml.common;bundle-version="3.3.0",
+ org.eclipse.m2m.qvt.oml.emf.util;bundle-version="3.3.0",
+ org.eclipse.m2m.qvt.oml.ocl;bundle-version="3.3.0",
+ org.eclipse.m2m.qvt.oml.runtime;bundle-version="3.3.0",
+ org.eclipse.xtend.lib,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend;bundle-version="1.4.0",
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.junit;visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
+ org.eclipse.ocl.uml;bundle-version="5.0.0",
+ org.eclipse.uml2.uml.resources;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.alf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.alf.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.alf.to.fuml;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtext,
+ org.eclipse.ocl.pivot,
+ org.eclipse.ocl,
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.log
+Export-Package: org.eclipse.papyrus.uml.alf,
+ org.eclipse.papyrus.uml.alf.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .,
+ Alf/,
+ UML/
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: ALF Tests
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.tests;singleton:=true
+Import-Package: org.apache.log4j,
+ org.hamcrest.core,
+ org.junit;version="4.5.0",
+ org.junit.runner;version="4.5.0",
+ org.junit.runner.manipulation;version="4.5.0",
+ org.junit.runner.notification;version="4.5.0",
+ org.junit.runners;version="4.5.0",
+ org.junit.runners.model;version="4.5.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/AssertFalse.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/AssertFalse.uml
index 7439f55620a..81d61d5df36 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/AssertFalse.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/AssertFalse.uml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_q8QTYIKGEeSFEt9m3bH63A" name="Model">

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_tTJUgLeHEeS7pqPIgMux2Q">

-      <importedPackage xmi:type="uml:Model" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf"/>

-    </packageImport>

-    <packagedElement xmi:type="uml:Activity" xmi:id="_rHG4gIKGEeSFEt9m3bH63A" name="AssertFalse" visibility="protected">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_rHG4iIKGEeSFEt9m3bH63A" annotatedElement="_rHG4gIKGEeSFEt9m3bH63A">

-        <body>activity AssertFalse(in label: String, in condition: Boolean[0..1]) { AssertTrue(&quot;! &quot; + label, condition == false);

-}</body>

-      </ownedComment>

-      <elementImport xmi:type="uml:ElementImport" xmi:id="_rHG4h4KGEeSFEt9m3bH63A" alias="" visibility="private">

-        <importedElement xmi:type="uml:FunctionBehavior" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#PrimitiveBehaviors-BooleanFunctions-ToString"/>

-      </elementImport>

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_rHG4gYKGEeSFEt9m3bH63A" name="label">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rHG4goKGEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rHG4g4KGEeSFEt9m3bH63A" value="1"/>

-      </ownedParameter>

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_rHG4hIKGEeSFEt9m3bH63A" name="condition">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rHG4hYKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rHG4hoKGEeSFEt9m3bH63A" value="1"/>

-      </ownedParameter>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_q8QTYYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q8QTYoKGEeSFEt9m3bH63A" 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="_TAijYLeHEeS7pqPIgMux2Q">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_rHG4iYKGEeSFEt9m3bH63A" base_Comment="_rHG4iIKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_q8QTYIKGEeSFEt9m3bH63A" name="Model">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_tTJUgLeHEeS7pqPIgMux2Q">
+      <importedPackage xmi:type="uml:Model" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Activity" xmi:id="_rHG4gIKGEeSFEt9m3bH63A" name="AssertFalse" visibility="protected">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_rHG4iIKGEeSFEt9m3bH63A" annotatedElement="_rHG4gIKGEeSFEt9m3bH63A">
+        <body>activity AssertFalse(in label: String, in condition: Boolean[0..1]) { AssertTrue(&quot;! &quot; + label, condition == false);
+}</body>
+      </ownedComment>
+      <elementImport xmi:type="uml:ElementImport" xmi:id="_rHG4h4KGEeSFEt9m3bH63A" alias="" visibility="private">
+        <importedElement xmi:type="uml:FunctionBehavior" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#PrimitiveBehaviors-BooleanFunctions-ToString"/>
+      </elementImport>
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_rHG4gYKGEeSFEt9m3bH63A" name="label">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rHG4goKGEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rHG4g4KGEeSFEt9m3bH63A" value="1"/>
+      </ownedParameter>
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_rHG4hIKGEeSFEt9m3bH63A" name="condition">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rHG4hYKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rHG4hoKGEeSFEt9m3bH63A" value="1"/>
+      </ownedParameter>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_q8QTYYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q8QTYoKGEeSFEt9m3bH63A" 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="_TAijYLeHEeS7pqPIgMux2Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TAjKcLeHEeS7pqPIgMux2Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_rHG4iYKGEeSFEt9m3bH63A" base_Comment="_rHG4iIKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/AssertTrue.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/AssertTrue.uml
index a62a79177c8..294eeeb54ab 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/AssertTrue.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/AssertTrue.uml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_rSykEIKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Activity" xmi:id="_rao4gIKGEeSFEt9m3bH63A" name="AssertTrue" visibility="protected">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_rapflYKGEeSFEt9m3bH63A" annotatedElement="_rao4gIKGEeSFEt9m3bH63A">

-        <body>activity AssertTrue(in label: String, in condition: Boolean[0..1]) { if (condition != true) { WriteLine(&quot;FAILED: &quot; + label);

-} }</body>

-      </ownedComment>

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_rao4gYKGEeSFEt9m3bH63A" name="label">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rapfkIKGEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rapfkYKGEeSFEt9m3bH63A" value="1"/>

-      </ownedParameter>

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_rapfkoKGEeSFEt9m3bH63A" name="condition">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rapfk4KGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rapflIKGEeSFEt9m3bH63A" value="1"/>

-      </ownedParameter>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_rSykEYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rSykEoKGEeSFEt9m3bH63A" 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="_Eu0p4LeKEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_rapfloKGEeSFEt9m3bH63A" base_Comment="_rapflYKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_rSykEIKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Activity" xmi:id="_rao4gIKGEeSFEt9m3bH63A" name="AssertTrue" visibility="protected">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_rapflYKGEeSFEt9m3bH63A" annotatedElement="_rao4gIKGEeSFEt9m3bH63A">
+        <body>activity AssertTrue(in label: String, in condition: Boolean[0..1]) { if (condition != true) { WriteLine(&quot;FAILED: &quot; + label);
+} }</body>
+      </ownedComment>
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_rao4gYKGEeSFEt9m3bH63A" name="label">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rapfkIKGEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rapfkYKGEeSFEt9m3bH63A" value="1"/>
+      </ownedParameter>
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_rapfkoKGEeSFEt9m3bH63A" name="condition">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rapfk4KGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rapflIKGEeSFEt9m3bH63A" value="1"/>
+      </ownedParameter>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_rSykEYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rSykEoKGEeSFEt9m3bH63A" 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="_Eu0p4LeKEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eu1Q8LeKEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_rapfloKGEeSFEt9m3bH63A" base_Comment="_rapflYKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Feature_Indexed.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Feature_Indexed.uml
index fb8c99595ca..4196a8d5dea 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Feature_Indexed.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Feature_Indexed.uml
@@ -1,235 +1,235 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_sbc1QIKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_s03a0IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed" classifierBehavior="_s04B6YKGEeSFEt9m3bH63A" isActive="true">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_s04B6oKGEeSFEt9m3bH63A" annotatedElement="_s03a0IKGEeSFEt9m3bH63A">

-        <body>&#xD;

- * Test indexed feature assignment expressions&#xD;

- *</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_s03a0YKGEeSFEt9m3bH63A" name="y" visibility="private" isOrdered="true" isUnique="false">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a0oKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a04KGEeSFEt9m3bH63A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_s03bGYKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bGoKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bG4KGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03bCYKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_s03a-YKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B64KGEeSFEt9m3bH63A" annotatedElement="_s03bCYKGEeSFEt9m3bH63A">

-          <body>activity 'test$method$1'(out c: C, out d: D, out n: Integer, out m: Integer, out self: Expressions_Assignment_Feature_Indexed) { c = new C();

-c.y = new Integer [] { 1, 2, 3 };

-c.y[2] = 4;

-c.y[1] = null;

-c.n[1] = 4;

-n = A::n(c)[1];

-d = new D(new Integer [] { 1, 2, 3 });

-d.y[2] = 4;

-d.y[1] = null;

-d.m[1] = 4;

-m = B::m(d)[1];

-this.y = new Integer [] { 1, 2 };

-this.y[2] = 4;

-this.y[1] = null;

-self = this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bCoKGEeSFEt9m3bH63A" name="c" type="_s03a1IKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bC4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bDIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bDYKGEeSFEt9m3bH63A" name="d" type="_s03a54KGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bDoKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bD4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bEIKGEeSFEt9m3bH63A" name="n" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bEYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bEoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bE4KGEeSFEt9m3bH63A" name="m" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bFIKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bFYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bFoKGEeSFEt9m3bH63A" name="self" type="_s03a0IKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bF4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bGIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03bHIKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$initialization$1" visibility="protected" specification="_s03bHYKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B8oKGEeSFEt9m3bH63A" annotatedElement="_s03bHIKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Assignment_Feature_Indexed$initialization$1'(){

-  if (this.'Expressions_Assignment_Feature_Indexed$initializationFlag$1' == null) {

-    this.'Expressions_Assignment_Feature_Indexed$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03bHoKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$method$1" specification="_s04B44KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B7oKGEeSFEt9m3bH63A" annotatedElement="_s03bHoKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Assignment_Feature_Indexed$method$1'(): Expressions_Assignment_Feature_Indexed {

-	this.'Expressions_Assignment_Feature_Indexed$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s04B4IKGEeSFEt9m3bH63A" type="_s03a0IKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s04B4YKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s04B4oKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s04B54KGEeSFEt9m3bH63A" name="destroy$method$1" specification="_s04B6IKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B7YKGEeSFEt9m3bH63A" annotatedElement="_s04B54KGEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s04B6YKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B8YKGEeSFEt9m3bH63A" annotatedElement="_s04B6YKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Assignment_Feature_Indexed$behavior$1'() { this.test(c, d, n, m, self);

-AssertEqual(&quot;c.y[1]&quot;, c.y[1], 4);

-AssertEqual(&quot;c.n[1]&quot;, c.n[1], 4);

-AssertEqual(&quot;d.y[1]&quot;, d.y[1], 4);

-AssertEqual(&quot;d.m[1]&quot;, d.m[1], 4);

-AssertEqual(&quot;n&quot;, n, 4);

-AssertEqual(&quot;m&quot;, m, 4);

-AssertEqual(&quot;self.y[1]&quot;, self.y[1], 4);

-WriteLine(&quot;Done&quot;);

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_s03a-YKGEeSFEt9m3bH63A" name="test" visibility="public" method="_s03bCYKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03a-oKGEeSFEt9m3bH63A" name="c" type="_s03a1IKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a-4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a_IKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03a_YKGEeSFEt9m3bH63A" name="d" type="_s03a54KGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a_oKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a_4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bAIKGEeSFEt9m3bH63A" name="n" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bAYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bAoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bA4KGEeSFEt9m3bH63A" name="m" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bBIKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bBYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bBoKGEeSFEt9m3bH63A" name="self" type="_s03a0IKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bB4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bCIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_s03bHYKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$initialization$1" visibility="protected" method="_s03bHIKGEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_s04B44KGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed" method="_s03bHoKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s04B5IKGEeSFEt9m3bH63A" type="_s03a0IKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s04B5YKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s04B5oKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_s04B6IKGEeSFEt9m3bH63A" name="destroy" method="_s04B54KGEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_s03a1IKGEeSFEt9m3bH63A" name="C" visibility="private">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_s03a1YKGEeSFEt9m3bH63A" name="y" visibility="public" isOrdered="true" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a1oKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a14KGEeSFEt9m3bH63A" value="*"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_s03a2IKGEeSFEt9m3bH63A" name="C$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a2YKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a2oKGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03a24KGEeSFEt9m3bH63A" name="C$initialization$1" visibility="protected" specification="_s03a3IKGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_s04B8IKGEeSFEt9m3bH63A" annotatedElement="_s03a24KGEeSFEt9m3bH63A">

-            <body>activity 'C$initialization$1'(){

-  if (this.'C$initializationFlag$1' == null) {

-    this.'C$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03a3YKGEeSFEt9m3bH63A" name="C$method$1" specification="_s03a4YKGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_s04B7IKGEeSFEt9m3bH63A" annotatedElement="_s03a3YKGEeSFEt9m3bH63A">

-            <body>activity 'C$method$1'(): C {

-	this.'C$initialization$1'();

-	return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03a3oKGEeSFEt9m3bH63A" type="_s03a1IKGEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a34KGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a4IKGEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03a5YKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_s03a5oKGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_s04B74KGEeSFEt9m3bH63A" annotatedElement="_s03a5YKGEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_s03a3IKGEeSFEt9m3bH63A" name="C$initialization$1" visibility="protected" method="_s03a24KGEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_s03a4YKGEeSFEt9m3bH63A" name="C" method="_s03a3YKGEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03a4oKGEeSFEt9m3bH63A" type="_s03a1IKGEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a44KGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a5IKGEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_s03a5oKGEeSFEt9m3bH63A" name="destroy" method="_s03a5YKGEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:DataType" xmi:id="_s03a54KGEeSFEt9m3bH63A" name="D" visibility="private">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_s03a6IKGEeSFEt9m3bH63A" name="y" visibility="public" isOrdered="true" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a6YKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a6oKGEeSFEt9m3bH63A" value="*"/>

-        </ownedAttribute>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Association" xmi:id="_s03a64KGEeSFEt9m3bH63A" name="A" visibility="private" memberEnd="_s03a7IKGEeSFEt9m3bH63A _s03a74KGEeSFEt9m3bH63A">

-        <ownedEnd xmi:type="uml:Property" xmi:id="_s03a7IKGEeSFEt9m3bH63A" name="c" visibility="public" type="_s03a1IKGEeSFEt9m3bH63A" association="_s03a64KGEeSFEt9m3bH63A">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a7YKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a7oKGEeSFEt9m3bH63A" value="1"/>

-        </ownedEnd>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_s03a74KGEeSFEt9m3bH63A" name="n" visibility="public" isOrdered="true" isUnique="false" association="_s03a64KGEeSFEt9m3bH63A">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a8IKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a8YKGEeSFEt9m3bH63A" value="*"/>

-        </ownedEnd>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Association" xmi:id="_s03a8oKGEeSFEt9m3bH63A" name="B" visibility="private" memberEnd="_s03a84KGEeSFEt9m3bH63A _s03a9oKGEeSFEt9m3bH63A">

-        <ownedEnd xmi:type="uml:Property" xmi:id="_s03a84KGEeSFEt9m3bH63A" name="d" visibility="public" type="_s03a54KGEeSFEt9m3bH63A" association="_s03a8oKGEeSFEt9m3bH63A">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a9IKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a9YKGEeSFEt9m3bH63A" value="1"/>

-        </ownedEnd>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_s03a9oKGEeSFEt9m3bH63A" name="m" visibility="public" isOrdered="true" isUnique="false" association="_s03a8oKGEeSFEt9m3bH63A">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a94KGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a-IKGEeSFEt9m3bH63A" value="*"/>

-        </ownedEnd>

-      </nestedClassifier>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sbc1QYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sbc1QoKGEeSFEt9m3bH63A" 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="__kKtd7eKEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_s04B84KGEeSFEt9m3bH63A" base_Comment="_s04B74KGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_s04B9IKGEeSFEt9m3bH63A" base_BehavioralFeature="_s04B44KGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_s04B9YKGEeSFEt9m3bH63A" base_Comment="_s04B7oKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_s04B9oKGEeSFEt9m3bH63A" base_BehavioralFeature="_s03a4YKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_s04B94KGEeSFEt9m3bH63A" base_Comment="_s04B7YKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_s04B-IKGEeSFEt9m3bH63A" base_Comment="_s04B64KGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_s04B-YKGEeSFEt9m3bH63A" base_Comment="_s04B8IKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_s04B-oKGEeSFEt9m3bH63A" base_BehavioralFeature="_s03a5oKGEeSFEt9m3bH63A"/>

-  <standard:Destroy xmi:id="_s04B-4KGEeSFEt9m3bH63A" base_BehavioralFeature="_s04B6IKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_s04B_IKGEeSFEt9m3bH63A" base_Comment="_s04B7IKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_s04B_YKGEeSFEt9m3bH63A" base_Comment="_s04B8oKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_s04B_oKGEeSFEt9m3bH63A" base_Comment="_s04B8YKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_sbc1QIKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_s03a0IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed" classifierBehavior="_s04B6YKGEeSFEt9m3bH63A" isActive="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_s04B6oKGEeSFEt9m3bH63A" annotatedElement="_s03a0IKGEeSFEt9m3bH63A">
+        <body>&#xD;
+ * Test indexed feature assignment expressions&#xD;
+ *</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_s03a0YKGEeSFEt9m3bH63A" name="y" visibility="private" isOrdered="true" isUnique="false">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a0oKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a04KGEeSFEt9m3bH63A" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_s03bGYKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bGoKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bG4KGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03bCYKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_s03a-YKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B64KGEeSFEt9m3bH63A" annotatedElement="_s03bCYKGEeSFEt9m3bH63A">
+          <body>activity 'test$method$1'(out c: C, out d: D, out n: Integer, out m: Integer, out self: Expressions_Assignment_Feature_Indexed) { c = new C();
+c.y = new Integer [] { 1, 2, 3 };
+c.y[2] = 4;
+c.y[1] = null;
+c.n[1] = 4;
+n = A::n(c)[1];
+d = new D(new Integer [] { 1, 2, 3 });
+d.y[2] = 4;
+d.y[1] = null;
+d.m[1] = 4;
+m = B::m(d)[1];
+this.y = new Integer [] { 1, 2 };
+this.y[2] = 4;
+this.y[1] = null;
+self = this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bCoKGEeSFEt9m3bH63A" name="c" type="_s03a1IKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bC4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bDIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bDYKGEeSFEt9m3bH63A" name="d" type="_s03a54KGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bDoKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bD4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bEIKGEeSFEt9m3bH63A" name="n" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bEYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bEoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bE4KGEeSFEt9m3bH63A" name="m" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bFIKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bFYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bFoKGEeSFEt9m3bH63A" name="self" type="_s03a0IKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bF4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bGIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03bHIKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$initialization$1" visibility="protected" specification="_s03bHYKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B8oKGEeSFEt9m3bH63A" annotatedElement="_s03bHIKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Assignment_Feature_Indexed$initialization$1'(){
+  if (this.'Expressions_Assignment_Feature_Indexed$initializationFlag$1' == null) {
+    this.'Expressions_Assignment_Feature_Indexed$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03bHoKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$method$1" specification="_s04B44KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B7oKGEeSFEt9m3bH63A" annotatedElement="_s03bHoKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Assignment_Feature_Indexed$method$1'(): Expressions_Assignment_Feature_Indexed {
+	this.'Expressions_Assignment_Feature_Indexed$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s04B4IKGEeSFEt9m3bH63A" type="_s03a0IKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s04B4YKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s04B4oKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s04B54KGEeSFEt9m3bH63A" name="destroy$method$1" specification="_s04B6IKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B7YKGEeSFEt9m3bH63A" annotatedElement="_s04B54KGEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_s04B6YKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_s04B8YKGEeSFEt9m3bH63A" annotatedElement="_s04B6YKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Assignment_Feature_Indexed$behavior$1'() { this.test(c, d, n, m, self);
+AssertEqual(&quot;c.y[1]&quot;, c.y[1], 4);
+AssertEqual(&quot;c.n[1]&quot;, c.n[1], 4);
+AssertEqual(&quot;d.y[1]&quot;, d.y[1], 4);
+AssertEqual(&quot;d.m[1]&quot;, d.m[1], 4);
+AssertEqual(&quot;n&quot;, n, 4);
+AssertEqual(&quot;m&quot;, m, 4);
+AssertEqual(&quot;self.y[1]&quot;, self.y[1], 4);
+WriteLine(&quot;Done&quot;);
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_s03a-YKGEeSFEt9m3bH63A" name="test" visibility="public" method="_s03bCYKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03a-oKGEeSFEt9m3bH63A" name="c" type="_s03a1IKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a-4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a_IKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03a_YKGEeSFEt9m3bH63A" name="d" type="_s03a54KGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a_oKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a_4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bAIKGEeSFEt9m3bH63A" name="n" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bAYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bAoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bA4KGEeSFEt9m3bH63A" name="m" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bBIKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bBYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03bBoKGEeSFEt9m3bH63A" name="self" type="_s03a0IKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03bB4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03bCIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_s03bHYKGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed$initialization$1" visibility="protected" method="_s03bHIKGEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_s04B44KGEeSFEt9m3bH63A" name="Expressions_Assignment_Feature_Indexed" method="_s03bHoKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_s04B5IKGEeSFEt9m3bH63A" type="_s03a0IKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s04B5YKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s04B5oKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_s04B6IKGEeSFEt9m3bH63A" name="destroy" method="_s04B54KGEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_s03a1IKGEeSFEt9m3bH63A" name="C" visibility="private">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_s03a1YKGEeSFEt9m3bH63A" name="y" visibility="public" isOrdered="true" isUnique="false">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a1oKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a14KGEeSFEt9m3bH63A" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_s03a2IKGEeSFEt9m3bH63A" name="C$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a2YKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a2oKGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03a24KGEeSFEt9m3bH63A" name="C$initialization$1" visibility="protected" specification="_s03a3IKGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_s04B8IKGEeSFEt9m3bH63A" annotatedElement="_s03a24KGEeSFEt9m3bH63A">
+            <body>activity 'C$initialization$1'(){
+  if (this.'C$initializationFlag$1' == null) {
+    this.'C$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03a3YKGEeSFEt9m3bH63A" name="C$method$1" specification="_s03a4YKGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_s04B7IKGEeSFEt9m3bH63A" annotatedElement="_s03a3YKGEeSFEt9m3bH63A">
+            <body>activity 'C$method$1'(): C {
+	this.'C$initialization$1'();
+	return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03a3oKGEeSFEt9m3bH63A" type="_s03a1IKGEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a34KGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a4IKGEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_s03a5YKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_s03a5oKGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_s04B74KGEeSFEt9m3bH63A" annotatedElement="_s03a5YKGEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_s03a3IKGEeSFEt9m3bH63A" name="C$initialization$1" visibility="protected" method="_s03a24KGEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_s03a4YKGEeSFEt9m3bH63A" name="C" method="_s03a3YKGEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_s03a4oKGEeSFEt9m3bH63A" type="_s03a1IKGEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a44KGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a5IKGEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_s03a5oKGEeSFEt9m3bH63A" name="destroy" method="_s03a5YKGEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:DataType" xmi:id="_s03a54KGEeSFEt9m3bH63A" name="D" visibility="private">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_s03a6IKGEeSFEt9m3bH63A" name="y" visibility="public" isOrdered="true" isUnique="false">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a6YKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a6oKGEeSFEt9m3bH63A" value="*"/>
+        </ownedAttribute>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Association" xmi:id="_s03a64KGEeSFEt9m3bH63A" name="A" visibility="private" memberEnd="_s03a7IKGEeSFEt9m3bH63A _s03a74KGEeSFEt9m3bH63A">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_s03a7IKGEeSFEt9m3bH63A" name="c" visibility="public" type="_s03a1IKGEeSFEt9m3bH63A" association="_s03a64KGEeSFEt9m3bH63A">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a7YKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a7oKGEeSFEt9m3bH63A" value="1"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_s03a74KGEeSFEt9m3bH63A" name="n" visibility="public" isOrdered="true" isUnique="false" association="_s03a64KGEeSFEt9m3bH63A">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a8IKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a8YKGEeSFEt9m3bH63A" value="*"/>
+        </ownedEnd>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Association" xmi:id="_s03a8oKGEeSFEt9m3bH63A" name="B" visibility="private" memberEnd="_s03a84KGEeSFEt9m3bH63A _s03a9oKGEeSFEt9m3bH63A">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_s03a84KGEeSFEt9m3bH63A" name="d" visibility="public" type="_s03a54KGEeSFEt9m3bH63A" association="_s03a8oKGEeSFEt9m3bH63A">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a9IKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a9YKGEeSFEt9m3bH63A" value="1"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_s03a9oKGEeSFEt9m3bH63A" name="m" visibility="public" isOrdered="true" isUnique="false" association="_s03a8oKGEeSFEt9m3bH63A">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s03a94KGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s03a-IKGEeSFEt9m3bH63A" value="*"/>
+        </ownedEnd>
+      </nestedClassifier>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sbc1QYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sbc1QoKGEeSFEt9m3bH63A" 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="__kKtd7eKEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__kL7kLeKEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_s04B84KGEeSFEt9m3bH63A" base_Comment="_s04B74KGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_s04B9IKGEeSFEt9m3bH63A" base_BehavioralFeature="_s04B44KGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_s04B9YKGEeSFEt9m3bH63A" base_Comment="_s04B7oKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_s04B9oKGEeSFEt9m3bH63A" base_BehavioralFeature="_s03a4YKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_s04B94KGEeSFEt9m3bH63A" base_Comment="_s04B7YKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_s04B-IKGEeSFEt9m3bH63A" base_Comment="_s04B64KGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_s04B-YKGEeSFEt9m3bH63A" base_Comment="_s04B8IKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_s04B-oKGEeSFEt9m3bH63A" base_BehavioralFeature="_s03a5oKGEeSFEt9m3bH63A"/>
+  <standard:Destroy xmi:id="_s04B-4KGEeSFEt9m3bH63A" base_BehavioralFeature="_s04B6IKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_s04B_IKGEeSFEt9m3bH63A" base_Comment="_s04B7IKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_s04B_YKGEeSFEt9m3bH63A" base_Comment="_s04B8oKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_s04B_oKGEeSFEt9m3bH63A" base_Comment="_s04B8YKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Indexed.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Indexed.uml
index 18993c39566..bafecb92999 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Indexed.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Indexed.uml
@@ -1,122 +1,122 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_s1u9gIKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_tKYX0IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed" classifierBehavior="_tKYX7oKGEeSFEt9m3bH63A" isActive="true">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX74KGEeSFEt9m3bH63A" annotatedElement="_tKYX0IKGEeSFEt9m3bH63A">

-        <body>&#xD;

- * Test indexed assignment expressions.&#xD;

- *</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_tKYX34KGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX4IKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX4YKGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX2IKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_tKYX0YKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX9IKGEeSFEt9m3bH63A" annotatedElement="_tKYX2IKGEeSFEt9m3bH63A">

-          <body>activity 'test$method$1'(out i: Integer[0..*], out a: Integer[0..*]) { i = new Integer [] { 1..4 };

-i[1] = 0;

-i[2] += i[3];

-a = i;

-a[3] = 5;

-test::a[3] = 5;

-test.a[3] = 5;

-a[4] += 1;

-test::a[4] += 1;

-test.a[4] += 1;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX2YKGEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX2oKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX24KGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX3IKGEeSFEt9m3bH63A" name="a" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX3YKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX3oKGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX4oKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$initialization$1" visibility="protected" specification="_tKYX44KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX84KGEeSFEt9m3bH63A" annotatedElement="_tKYX4oKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Assignment_Indexed$initialization$1'(){

-  if (this.'Expressions_Assignment_Indexed$initializationFlag$1' == null) {

-    this.'Expressions_Assignment_Indexed$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX5IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$method$1" specification="_tKYX6IKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX8YKGEeSFEt9m3bH63A" annotatedElement="_tKYX5IKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Assignment_Indexed$method$1'(): Expressions_Assignment_Indexed {

-	this.'Expressions_Assignment_Indexed$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX5YKGEeSFEt9m3bH63A" type="_tKYX0IKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX5oKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX54KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX7IKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_tKYX7YKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX8oKGEeSFEt9m3bH63A" annotatedElement="_tKYX7IKGEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX7oKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX8IKGEeSFEt9m3bH63A" annotatedElement="_tKYX7oKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Assignment_Indexed$behavior$1'() { this.test(i, a);

-AssertEqual(&quot;i[1]&quot;, i[1], 0);

-AssertEqual(&quot;i[2]&quot;, i[2], 5);

-AssertEqual(&quot;i[3]&quot;, i[3], 3);

-AssertEqual(&quot;i[4]&quot;, i[4], 4);

-AssertEqual(&quot;a[1]&quot;, a[1], 0);

-AssertEqual(&quot;a[2]&quot;, a[2], 5);

-AssertEqual(&quot;a[3]&quot;, a[3], 5);

-AssertEqual(&quot;a[4]&quot;, a[4], 7);

-WriteLine(&quot;Done&quot;);

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_tKYX0YKGEeSFEt9m3bH63A" name="test" visibility="public" method="_tKYX2IKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX0oKGEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX04KGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX1IKGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX1YKGEeSFEt9m3bH63A" name="a" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX1oKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX14KGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_tKYX44KGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$initialization$1" visibility="protected" method="_tKYX4oKGEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_tKYX6IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed" method="_tKYX5IKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX6YKGEeSFEt9m3bH63A" type="_tKYX0IKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX6oKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX64KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_tKYX7YKGEeSFEt9m3bH63A" name="destroy" method="_tKYX7IKGEeSFEt9m3bH63A"/>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_s1u9gYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s1u9goKGEeSFEt9m3bH63A" 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="_QqvM0LeLEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_tKYX9YKGEeSFEt9m3bH63A" base_Comment="_tKYX84KGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_tKYX9oKGEeSFEt9m3bH63A" base_Comment="_tKYX8IKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_tKYX94KGEeSFEt9m3bH63A" base_Comment="_tKYX8oKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_tKYX-IKGEeSFEt9m3bH63A" base_BehavioralFeature="_tKYX7YKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_tKYX-YKGEeSFEt9m3bH63A" base_Comment="_tKYX9IKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_tKYX-oKGEeSFEt9m3bH63A" base_BehavioralFeature="_tKYX6IKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_tKYX-4KGEeSFEt9m3bH63A" base_Comment="_tKYX8YKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_s1u9gIKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_tKYX0IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed" classifierBehavior="_tKYX7oKGEeSFEt9m3bH63A" isActive="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX74KGEeSFEt9m3bH63A" annotatedElement="_tKYX0IKGEeSFEt9m3bH63A">
+        <body>&#xD;
+ * Test indexed assignment expressions.&#xD;
+ *</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_tKYX34KGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX4IKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX4YKGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX2IKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_tKYX0YKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX9IKGEeSFEt9m3bH63A" annotatedElement="_tKYX2IKGEeSFEt9m3bH63A">
+          <body>activity 'test$method$1'(out i: Integer[0..*], out a: Integer[0..*]) { i = new Integer [] { 1..4 };
+i[1] = 0;
+i[2] += i[3];
+a = i;
+a[3] = 5;
+test::a[3] = 5;
+test.a[3] = 5;
+a[4] += 1;
+test::a[4] += 1;
+test.a[4] += 1;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX2YKGEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX2oKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX24KGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX3IKGEeSFEt9m3bH63A" name="a" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX3YKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX3oKGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX4oKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$initialization$1" visibility="protected" specification="_tKYX44KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX84KGEeSFEt9m3bH63A" annotatedElement="_tKYX4oKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Assignment_Indexed$initialization$1'(){
+  if (this.'Expressions_Assignment_Indexed$initializationFlag$1' == null) {
+    this.'Expressions_Assignment_Indexed$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX5IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$method$1" specification="_tKYX6IKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX8YKGEeSFEt9m3bH63A" annotatedElement="_tKYX5IKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Assignment_Indexed$method$1'(): Expressions_Assignment_Indexed {
+	this.'Expressions_Assignment_Indexed$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX5YKGEeSFEt9m3bH63A" type="_tKYX0IKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX5oKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX54KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX7IKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_tKYX7YKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX8oKGEeSFEt9m3bH63A" annotatedElement="_tKYX7IKGEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_tKYX7oKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_tKYX8IKGEeSFEt9m3bH63A" annotatedElement="_tKYX7oKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Assignment_Indexed$behavior$1'() { this.test(i, a);
+AssertEqual(&quot;i[1]&quot;, i[1], 0);
+AssertEqual(&quot;i[2]&quot;, i[2], 5);
+AssertEqual(&quot;i[3]&quot;, i[3], 3);
+AssertEqual(&quot;i[4]&quot;, i[4], 4);
+AssertEqual(&quot;a[1]&quot;, a[1], 0);
+AssertEqual(&quot;a[2]&quot;, a[2], 5);
+AssertEqual(&quot;a[3]&quot;, a[3], 5);
+AssertEqual(&quot;a[4]&quot;, a[4], 7);
+WriteLine(&quot;Done&quot;);
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_tKYX0YKGEeSFEt9m3bH63A" name="test" visibility="public" method="_tKYX2IKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX0oKGEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX04KGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX1IKGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX1YKGEeSFEt9m3bH63A" name="a" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX1oKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX14KGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_tKYX44KGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed$initialization$1" visibility="protected" method="_tKYX4oKGEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_tKYX6IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Indexed" method="_tKYX5IKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tKYX6YKGEeSFEt9m3bH63A" type="_tKYX0IKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tKYX6oKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKYX64KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_tKYX7YKGEeSFEt9m3bH63A" name="destroy" method="_tKYX7IKGEeSFEt9m3bH63A"/>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_s1u9gYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s1u9goKGEeSFEt9m3bH63A" 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="_QqvM0LeLEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QqvM0beLEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_tKYX9YKGEeSFEt9m3bH63A" base_Comment="_tKYX84KGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_tKYX9oKGEeSFEt9m3bH63A" base_Comment="_tKYX8IKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_tKYX94KGEeSFEt9m3bH63A" base_Comment="_tKYX8oKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_tKYX-IKGEeSFEt9m3bH63A" base_BehavioralFeature="_tKYX7YKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_tKYX-YKGEeSFEt9m3bH63A" base_Comment="_tKYX9IKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_tKYX-oKGEeSFEt9m3bH63A" base_BehavioralFeature="_tKYX6IKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_tKYX-4KGEeSFEt9m3bH63A" base_Comment="_tKYX8YKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Null.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Null.uml
index 78c3d9231a2..8ccc9e486df 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Null.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Assignment_Null.uml
@@ -1,305 +1,305 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_tLlRsIKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_t5p4oIKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null" classifierBehavior="_t5qf2oKGEeSFEt9m3bH63A" isActive="true">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf24KGEeSFEt9m3bH63A" annotatedElement="_t5p4oIKGEeSFEt9m3bH63A">

-        <body>

- * Test non-literal assignment of null.

- *</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t5p4oYKGEeSFEt9m3bH63A" name="i" visibility="private">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4ooKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4o4KGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t5p4pIKGEeSFEt9m3bH63A" name="j" visibility="private" isOrdered="true" isUnique="false">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4pYKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4poKGEeSFEt9m3bH63A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t5p4p4KGEeSFEt9m3bH63A" name="d" visibility="private" type="_t5p4qoKGEeSFEt9m3bH63A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4qIKGEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4qYKGEeSFEt9m3bH63A" value="1"/>

-        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_t5p4roKGEeSFEt9m3bH63A" behavior="_t5p4r4KGEeSFEt9m3bH63A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t5qfy4KGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfzIKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfzYKGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p4t4KGEeSFEt9m3bH63A" name="set$method$1" visibility="protected" specification="_t5p4s4KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf44KGEeSFEt9m3bH63A" annotatedElement="_t5p4t4KGEeSFEt9m3bH63A">

-          <body>activity 'set$method$1'(in i: Integer[0..1]) { this.i = i;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4uIKGEeSFEt9m3bH63A" name="i">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4uYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4uoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p4v4KGEeSFEt9m3bH63A" name="get$method$1" visibility="protected" specification="_t5p4u4KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf5oKGEeSFEt9m3bH63A" annotatedElement="_t5p4v4KGEeSFEt9m3bH63A">

-          <body>activity 'get$method$1'(): Integer[0..1] { return this.i;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4wIKGEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4wYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4woKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p4yoKGEeSFEt9m3bH63A" name="setAt$method$1" visibility="protected" specification="_t5p4w4KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf5YKGEeSFEt9m3bH63A" annotatedElement="_t5p4yoKGEeSFEt9m3bH63A">

-          <body>activity 'setAt$method$1'(in j: Integer[0..1], in index: Integer) { this.j[index] = j;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4y4KGEeSFEt9m3bH63A" name="j">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4zIKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4zYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4zoKGEeSFEt9m3bH63A" name="index">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4z4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p40IKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p42IKGEeSFEt9m3bH63A" name="getAt$method$1" visibility="protected" specification="_t5p40YKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf54KGEeSFEt9m3bH63A" annotatedElement="_t5p42IKGEeSFEt9m3bH63A">

-          <body>activity 'getAt$method$1'(in index: Integer): Integer[0..1] { return this.j[index];

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p42YKGEeSFEt9m3bH63A" name="index">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p42oKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p424KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p43IKGEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p43YKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p43oKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p444KGEeSFEt9m3bH63A" name="setData$method$1" visibility="protected" specification="_t5p434KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf4YKGEeSFEt9m3bH63A" annotatedElement="_t5p444KGEeSFEt9m3bH63A">

-          <body>activity 'setData$method$1'(in k: Integer[0..1]) { d = this.d;

-d.k = k;

-this.d = d;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p45IKGEeSFEt9m3bH63A" name="k">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p45YKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p45oKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qfs4KGEeSFEt9m3bH63A" name="getData$method$1" visibility="protected" specification="_t5p454KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf3oKGEeSFEt9m3bH63A" annotatedElement="_t5qfs4KGEeSFEt9m3bH63A">

-          <body>activity 'getData$method$1'(): Integer { return this.d.k;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qftIKGEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qftYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qftoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qfwYKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_t5qft4KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf34KGEeSFEt9m3bH63A" annotatedElement="_t5qfwYKGEeSFEt9m3bH63A">

-          <body>activity 'test$method$1'(out i: Integer[0..1], out j: Integer[0..1], out k: Integer[0..1]) { this.set(5);

-this.set(null);

-i = this.get();

-this.j = new Integer [] { 1, 2 };

-this.setAt(5, 1);

-this.setAt(null, 1);

-j = this.getAt(1);

-this.setData(5);

-this.setData(null);

-k = this.getData();

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfwoKGEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfw4KGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfxIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfxYKGEeSFEt9m3bH63A" name="j" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfxoKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfx4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfyIKGEeSFEt9m3bH63A" name="k" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfyYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfyoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p4r4KGEeSFEt9m3bH63A" name="d$defaultValue$1">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf5IKGEeSFEt9m3bH63A" annotatedElement="_t5p4r4KGEeSFEt9m3bH63A">

-          <body>activity 'd$defaultValue$1'(): D {

-	return  new D();

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4sIKGEeSFEt9m3bH63A" type="_t5p4qoKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4sYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4soKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qfzoKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$initialization$1" visibility="protected" specification="_t5qfz4KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf3YKGEeSFEt9m3bH63A" annotatedElement="_t5qfzoKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Assignment_Null$initialization$1'(){

-  if (this.'Expressions_Assignment_Null$initializationFlag$1' == null) {

-    this.d = 'd$defaultValue$1'();

-    this.'Expressions_Assignment_Null$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qf0IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$method$1" specification="_t5qf1IKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf3IKGEeSFEt9m3bH63A" annotatedElement="_t5qf0IKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Assignment_Null$method$1'(): Expressions_Assignment_Null {

-	this.'Expressions_Assignment_Null$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qf0YKGEeSFEt9m3bH63A" type="_t5p4oIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qf0oKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qf04KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qf2IKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_t5qf2YKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf4IKGEeSFEt9m3bH63A" annotatedElement="_t5qf2IKGEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qf2oKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf4oKGEeSFEt9m3bH63A" annotatedElement="_t5qf2oKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Assignment_Null$behavior$1'() { this.test(i, j, k);

-AssertEqual(&quot;i&quot;, i, null);

-AssertEqual(&quot;j&quot;, j, 2);

-AssertEqual(&quot;k&quot;, k, null);

-AssertTrue(&quot;this.d->notEmpty()&quot;, this.d->notEmpty());

-WriteLine(&quot;Done&quot;);

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p4s4KGEeSFEt9m3bH63A" name="set" visibility="public" method="_t5p4t4KGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4tIKGEeSFEt9m3bH63A" name="i">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4tYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4toKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p4u4KGEeSFEt9m3bH63A" name="get" visibility="public" method="_t5p4v4KGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4vIKGEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4vYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4voKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p4w4KGEeSFEt9m3bH63A" name="setAt" visibility="public" method="_t5p4yoKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4xIKGEeSFEt9m3bH63A" name="j">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4xYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4xoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4x4KGEeSFEt9m3bH63A" name="index">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4yIKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4yYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p40YKGEeSFEt9m3bH63A" name="getAt" visibility="public" method="_t5p42IKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p40oKGEeSFEt9m3bH63A" name="index">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p404KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p41IKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p41YKGEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p41oKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p414KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p434KGEeSFEt9m3bH63A" name="setData" visibility="public" method="_t5p444KGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p44IKGEeSFEt9m3bH63A" name="k">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p44YKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p44oKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p454KGEeSFEt9m3bH63A" name="getData" visibility="public" method="_t5qfs4KGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfsIKGEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfsYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfsoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5qft4KGEeSFEt9m3bH63A" name="test" visibility="public" method="_t5qfwYKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfuIKGEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfuYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfuoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfu4KGEeSFEt9m3bH63A" name="j" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfvIKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfvYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfvoKGEeSFEt9m3bH63A" name="k" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfv4KGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfwIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5qfz4KGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$initialization$1" visibility="protected" method="_t5qfzoKGEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5qf1IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null" method="_t5qf0IKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qf1YKGEeSFEt9m3bH63A" type="_t5p4oIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qf1oKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qf14KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5qf2YKGEeSFEt9m3bH63A" name="destroy" method="_t5qf2IKGEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:DataType" xmi:id="_t5p4qoKGEeSFEt9m3bH63A" name="D" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_t5p4q4KGEeSFEt9m3bH63A" name="k" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4rIKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4rYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-      </nestedClassifier>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_tLlRsYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tLlRsoKGEeSFEt9m3bH63A" 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="_XSAbybeLEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf6IKGEeSFEt9m3bH63A" base_Comment="_t5qf5IKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf6YKGEeSFEt9m3bH63A" base_Comment="_t5qf3YKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf6oKGEeSFEt9m3bH63A" base_Comment="_t5qf4oKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf64KGEeSFEt9m3bH63A" base_Comment="_t5qf5oKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf7IKGEeSFEt9m3bH63A" base_Comment="_t5qf54KGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf7YKGEeSFEt9m3bH63A" base_Comment="_t5qf3IKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf7oKGEeSFEt9m3bH63A" base_Comment="_t5qf44KGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf74KGEeSFEt9m3bH63A" base_Comment="_t5qf5YKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf8IKGEeSFEt9m3bH63A" base_Comment="_t5qf3oKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_t5qf8YKGEeSFEt9m3bH63A" base_BehavioralFeature="_t5qf2YKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf8oKGEeSFEt9m3bH63A" base_Comment="_t5qf34KGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_t5qf84KGEeSFEt9m3bH63A" base_BehavioralFeature="_t5qf1IKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf9IKGEeSFEt9m3bH63A" base_Comment="_t5qf4YKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_t5qf9YKGEeSFEt9m3bH63A" base_Comment="_t5qf4IKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_tLlRsIKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_t5p4oIKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null" classifierBehavior="_t5qf2oKGEeSFEt9m3bH63A" isActive="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf24KGEeSFEt9m3bH63A" annotatedElement="_t5p4oIKGEeSFEt9m3bH63A">
+        <body>
+ * Test non-literal assignment of null.
+ *</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_t5p4oYKGEeSFEt9m3bH63A" name="i" visibility="private">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4ooKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4o4KGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_t5p4pIKGEeSFEt9m3bH63A" name="j" visibility="private" isOrdered="true" isUnique="false">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4pYKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4poKGEeSFEt9m3bH63A" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_t5p4p4KGEeSFEt9m3bH63A" name="d" visibility="private" type="_t5p4qoKGEeSFEt9m3bH63A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4qIKGEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4qYKGEeSFEt9m3bH63A" value="1"/>
+        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_t5p4roKGEeSFEt9m3bH63A" behavior="_t5p4r4KGEeSFEt9m3bH63A"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_t5qfy4KGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfzIKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfzYKGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p4t4KGEeSFEt9m3bH63A" name="set$method$1" visibility="protected" specification="_t5p4s4KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf44KGEeSFEt9m3bH63A" annotatedElement="_t5p4t4KGEeSFEt9m3bH63A">
+          <body>activity 'set$method$1'(in i: Integer[0..1]) { this.i = i;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4uIKGEeSFEt9m3bH63A" name="i">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4uYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4uoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p4v4KGEeSFEt9m3bH63A" name="get$method$1" visibility="protected" specification="_t5p4u4KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf5oKGEeSFEt9m3bH63A" annotatedElement="_t5p4v4KGEeSFEt9m3bH63A">
+          <body>activity 'get$method$1'(): Integer[0..1] { return this.i;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4wIKGEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4wYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4woKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p4yoKGEeSFEt9m3bH63A" name="setAt$method$1" visibility="protected" specification="_t5p4w4KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf5YKGEeSFEt9m3bH63A" annotatedElement="_t5p4yoKGEeSFEt9m3bH63A">
+          <body>activity 'setAt$method$1'(in j: Integer[0..1], in index: Integer) { this.j[index] = j;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4y4KGEeSFEt9m3bH63A" name="j">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4zIKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4zYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4zoKGEeSFEt9m3bH63A" name="index">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4z4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p40IKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p42IKGEeSFEt9m3bH63A" name="getAt$method$1" visibility="protected" specification="_t5p40YKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf54KGEeSFEt9m3bH63A" annotatedElement="_t5p42IKGEeSFEt9m3bH63A">
+          <body>activity 'getAt$method$1'(in index: Integer): Integer[0..1] { return this.j[index];
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p42YKGEeSFEt9m3bH63A" name="index">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p42oKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p424KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p43IKGEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p43YKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p43oKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p444KGEeSFEt9m3bH63A" name="setData$method$1" visibility="protected" specification="_t5p434KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf4YKGEeSFEt9m3bH63A" annotatedElement="_t5p444KGEeSFEt9m3bH63A">
+          <body>activity 'setData$method$1'(in k: Integer[0..1]) { d = this.d;
+d.k = k;
+this.d = d;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p45IKGEeSFEt9m3bH63A" name="k">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p45YKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p45oKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qfs4KGEeSFEt9m3bH63A" name="getData$method$1" visibility="protected" specification="_t5p454KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf3oKGEeSFEt9m3bH63A" annotatedElement="_t5qfs4KGEeSFEt9m3bH63A">
+          <body>activity 'getData$method$1'(): Integer { return this.d.k;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qftIKGEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qftYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qftoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qfwYKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_t5qft4KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf34KGEeSFEt9m3bH63A" annotatedElement="_t5qfwYKGEeSFEt9m3bH63A">
+          <body>activity 'test$method$1'(out i: Integer[0..1], out j: Integer[0..1], out k: Integer[0..1]) { this.set(5);
+this.set(null);
+i = this.get();
+this.j = new Integer [] { 1, 2 };
+this.setAt(5, 1);
+this.setAt(null, 1);
+j = this.getAt(1);
+this.setData(5);
+this.setData(null);
+k = this.getData();
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfwoKGEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfw4KGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfxIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfxYKGEeSFEt9m3bH63A" name="j" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfxoKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfx4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfyIKGEeSFEt9m3bH63A" name="k" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfyYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfyoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5p4r4KGEeSFEt9m3bH63A" name="d$defaultValue$1">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf5IKGEeSFEt9m3bH63A" annotatedElement="_t5p4r4KGEeSFEt9m3bH63A">
+          <body>activity 'd$defaultValue$1'(): D {
+	return  new D();
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4sIKGEeSFEt9m3bH63A" type="_t5p4qoKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4sYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4soKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qfzoKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$initialization$1" visibility="protected" specification="_t5qfz4KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf3YKGEeSFEt9m3bH63A" annotatedElement="_t5qfzoKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Assignment_Null$initialization$1'(){
+  if (this.'Expressions_Assignment_Null$initializationFlag$1' == null) {
+    this.d = 'd$defaultValue$1'();
+    this.'Expressions_Assignment_Null$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qf0IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$method$1" specification="_t5qf1IKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf3IKGEeSFEt9m3bH63A" annotatedElement="_t5qf0IKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Assignment_Null$method$1'(): Expressions_Assignment_Null {
+	this.'Expressions_Assignment_Null$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qf0YKGEeSFEt9m3bH63A" type="_t5p4oIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qf0oKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qf04KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qf2IKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_t5qf2YKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf4IKGEeSFEt9m3bH63A" annotatedElement="_t5qf2IKGEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_t5qf2oKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_t5qf4oKGEeSFEt9m3bH63A" annotatedElement="_t5qf2oKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Assignment_Null$behavior$1'() { this.test(i, j, k);
+AssertEqual(&quot;i&quot;, i, null);
+AssertEqual(&quot;j&quot;, j, 2);
+AssertEqual(&quot;k&quot;, k, null);
+AssertTrue(&quot;this.d->notEmpty()&quot;, this.d->notEmpty());
+WriteLine(&quot;Done&quot;);
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p4s4KGEeSFEt9m3bH63A" name="set" visibility="public" method="_t5p4t4KGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4tIKGEeSFEt9m3bH63A" name="i">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4tYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4toKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p4u4KGEeSFEt9m3bH63A" name="get" visibility="public" method="_t5p4v4KGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4vIKGEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4vYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4voKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p4w4KGEeSFEt9m3bH63A" name="setAt" visibility="public" method="_t5p4yoKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4xIKGEeSFEt9m3bH63A" name="j">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4xYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4xoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p4x4KGEeSFEt9m3bH63A" name="index">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4yIKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4yYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p40YKGEeSFEt9m3bH63A" name="getAt" visibility="public" method="_t5p42IKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p40oKGEeSFEt9m3bH63A" name="index">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p404KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p41IKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p41YKGEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p41oKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p414KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p434KGEeSFEt9m3bH63A" name="setData" visibility="public" method="_t5p444KGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5p44IKGEeSFEt9m3bH63A" name="k">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p44YKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p44oKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5p454KGEeSFEt9m3bH63A" name="getData" visibility="public" method="_t5qfs4KGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfsIKGEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfsYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfsoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5qft4KGEeSFEt9m3bH63A" name="test" visibility="public" method="_t5qfwYKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfuIKGEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfuYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfuoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfu4KGEeSFEt9m3bH63A" name="j" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfvIKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfvYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qfvoKGEeSFEt9m3bH63A" name="k" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qfv4KGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qfwIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5qfz4KGEeSFEt9m3bH63A" name="Expressions_Assignment_Null$initialization$1" visibility="protected" method="_t5qfzoKGEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5qf1IKGEeSFEt9m3bH63A" name="Expressions_Assignment_Null" method="_t5qf0IKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_t5qf1YKGEeSFEt9m3bH63A" type="_t5p4oIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5qf1oKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5qf14KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_t5qf2YKGEeSFEt9m3bH63A" name="destroy" method="_t5qf2IKGEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:DataType" xmi:id="_t5p4qoKGEeSFEt9m3bH63A" name="D" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_t5p4q4KGEeSFEt9m3bH63A" name="k" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t5p4rIKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t5p4rYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+      </nestedClassifier>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_tLlRsYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tLlRsoKGEeSFEt9m3bH63A" 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="_XSAbybeLEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XSBC0LeLEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf6IKGEeSFEt9m3bH63A" base_Comment="_t5qf5IKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf6YKGEeSFEt9m3bH63A" base_Comment="_t5qf3YKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf6oKGEeSFEt9m3bH63A" base_Comment="_t5qf4oKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf64KGEeSFEt9m3bH63A" base_Comment="_t5qf5oKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf7IKGEeSFEt9m3bH63A" base_Comment="_t5qf54KGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf7YKGEeSFEt9m3bH63A" base_Comment="_t5qf3IKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf7oKGEeSFEt9m3bH63A" base_Comment="_t5qf44KGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf74KGEeSFEt9m3bH63A" base_Comment="_t5qf5YKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf8IKGEeSFEt9m3bH63A" base_Comment="_t5qf3oKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_t5qf8YKGEeSFEt9m3bH63A" base_BehavioralFeature="_t5qf2YKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf8oKGEeSFEt9m3bH63A" base_Comment="_t5qf34KGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_t5qf84KGEeSFEt9m3bH63A" base_BehavioralFeature="_t5qf1IKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf9IKGEeSFEt9m3bH63A" base_Comment="_t5qf4YKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_t5qf9YKGEeSFEt9m3bH63A" base_Comment="_t5qf4IKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Increment_Decrement.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Increment_Decrement.uml
index 7147e4f393b..f072299765b 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Increment_Decrement.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Increment_Decrement.uml
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_xYhMMIKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_xwPIoIKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement" classifierBehavior="_xwPv5IKGEeSFEt9m3bH63A" isActive="true">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv5YKGEeSFEt9m3bH63A" annotatedElement="_xwPIoIKGEeSFEt9m3bH63A">

-        <body>&#xD;

- * Test increment and decrement expressions.&#xD;

- *</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_xwPIoYKGEeSFEt9m3bH63A" name="x" visibility="private">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPIooKGEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPIo4KGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_xwPIpIKGEeSFEt9m3bH63A" name="list" visibility="private" isOrdered="true" isUnique="false">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPIpYKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPIpoKGEeSFEt9m3bH63A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_xwPv1YKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv1oKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv14KGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPvwoKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_xwPIp4KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv6YKGEeSFEt9m3bH63A" annotatedElement="_xwPvwoKGEeSFEt9m3bH63A">

-          <body>activity 'test$method$1'(out s: Integer[0..*] sequence, out i: Integer, out x: Integer, out list: Integer[0..*] sequence, out j: Integer, out k: Integer) { s = new Integer [] { 1, 2 };

-i = 1;

-this.x = 2;

-this.list = s;

-++ i;

-++ i;

-j = -- i;

-++ s[i];

-++ s[i];

--- s[i];

-++ this.x;

-++ this.x;

--- this.x;

-++ this.list[i];

-++ this.list[i];

--- this.list[i];

-++ i;

-k = -- i;

-++ s[i];

--- s[i];

-++ this.x;

--- this.x;

-++ this.list[i];

--- this.list[i];

-x = this.x;

-list = this.list;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvw4KGEeSFEt9m3bH63A" name="s" isOrdered="true" isUnique="false" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvxIKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvxYKGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvxoKGEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvx4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvyIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvyYKGEeSFEt9m3bH63A" name="x" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvyoKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvy4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvzIKGEeSFEt9m3bH63A" name="list" isOrdered="true" isUnique="false" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvzYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvzoKGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvz4KGEeSFEt9m3bH63A" name="j" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv0IKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv0YKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPv0oKGEeSFEt9m3bH63A" name="k" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv04KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv1IKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPv2IKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$initialization$1" visibility="protected" specification="_xwPv2YKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv54KGEeSFEt9m3bH63A" annotatedElement="_xwPv2IKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Increment_Decrement$initialization$1'(){

-  if (this.'Expressions_Increment_Decrement$initializationFlag$1' == null) {

-    this.'Expressions_Increment_Decrement$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPv2oKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$method$1" specification="_xwPv3oKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv6IKGEeSFEt9m3bH63A" annotatedElement="_xwPv2oKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Increment_Decrement$method$1'(): Expressions_Increment_Decrement {

-	this.'Expressions_Increment_Decrement$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPv24KGEeSFEt9m3bH63A" type="_xwPIoIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv3IKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv3YKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPv4oKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_xwPv44KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv5oKGEeSFEt9m3bH63A" annotatedElement="_xwPv4oKGEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPv5IKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv6oKGEeSFEt9m3bH63A" annotatedElement="_xwPv5IKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Increment_Decrement$behavior$1'() { this.test(s, i, x, list, j, k);

-AssertList(&quot;s&quot;, s, new Integer [] { 1, 3 });

-AssertEqual(&quot;i&quot;, i, 2);

-AssertEqual(&quot;x&quot;, x, 3);

-AssertList(&quot;list&quot;, list, new Integer [] { 1, 3 });

-AssertEqual(&quot;j&quot;, j, 3);

-AssertEqual(&quot;k&quot;, k, 2);

-WriteLine(&quot;Done&quot;);

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_xwPIp4KGEeSFEt9m3bH63A" name="test" visibility="public" method="_xwPvwoKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvsIKGEeSFEt9m3bH63A" name="s" isOrdered="true" isUnique="false" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvsYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvsoKGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvs4KGEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvtIKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvtYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvtoKGEeSFEt9m3bH63A" name="x" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvt4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvuIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvuYKGEeSFEt9m3bH63A" name="list" isOrdered="true" isUnique="false" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvuoKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvu4KGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvvIKGEeSFEt9m3bH63A" name="j" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvvYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvvoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvv4KGEeSFEt9m3bH63A" name="k" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvwIKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvwYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_xwPv2YKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$initialization$1" visibility="protected" method="_xwPv2IKGEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_xwPv3oKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement" method="_xwPv2oKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPv34KGEeSFEt9m3bH63A" type="_xwPIoIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv4IKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv4YKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_xwPv44KGEeSFEt9m3bH63A" name="destroy" method="_xwPv4oKGEeSFEt9m3bH63A"/>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_xYhMMYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xYhMMoKGEeSFEt9m3bH63A" 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="_r3ZLZLeLEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_xwPv64KGEeSFEt9m3bH63A" base_Comment="_xwPv5oKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_xwPv7IKGEeSFEt9m3bH63A" base_Comment="_xwPv54KGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_xwPv7YKGEeSFEt9m3bH63A" base_BehavioralFeature="_xwPv3oKGEeSFEt9m3bH63A"/>

-  <standard:Destroy xmi:id="_xwPv7oKGEeSFEt9m3bH63A" base_BehavioralFeature="_xwPv44KGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_xwPv74KGEeSFEt9m3bH63A" base_Comment="_xwPv6IKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_xwPv8IKGEeSFEt9m3bH63A" base_Comment="_xwPv6YKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_xwPv8YKGEeSFEt9m3bH63A" base_Comment="_xwPv6oKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_xYhMMIKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_xwPIoIKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement" classifierBehavior="_xwPv5IKGEeSFEt9m3bH63A" isActive="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv5YKGEeSFEt9m3bH63A" annotatedElement="_xwPIoIKGEeSFEt9m3bH63A">
+        <body>&#xD;
+ * Test increment and decrement expressions.&#xD;
+ *</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_xwPIoYKGEeSFEt9m3bH63A" name="x" visibility="private">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPIooKGEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPIo4KGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_xwPIpIKGEeSFEt9m3bH63A" name="list" visibility="private" isOrdered="true" isUnique="false">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPIpYKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPIpoKGEeSFEt9m3bH63A" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_xwPv1YKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv1oKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv14KGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPvwoKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_xwPIp4KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv6YKGEeSFEt9m3bH63A" annotatedElement="_xwPvwoKGEeSFEt9m3bH63A">
+          <body>activity 'test$method$1'(out s: Integer[0..*] sequence, out i: Integer, out x: Integer, out list: Integer[0..*] sequence, out j: Integer, out k: Integer) { s = new Integer [] { 1, 2 };
+i = 1;
+this.x = 2;
+this.list = s;
+++ i;
+++ i;
+j = -- i;
+++ s[i];
+++ s[i];
+-- s[i];
+++ this.x;
+++ this.x;
+-- this.x;
+++ this.list[i];
+++ this.list[i];
+-- this.list[i];
+++ i;
+k = -- i;
+++ s[i];
+-- s[i];
+++ this.x;
+-- this.x;
+++ this.list[i];
+-- this.list[i];
+x = this.x;
+list = this.list;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvw4KGEeSFEt9m3bH63A" name="s" isOrdered="true" isUnique="false" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvxIKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvxYKGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvxoKGEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvx4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvyIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvyYKGEeSFEt9m3bH63A" name="x" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvyoKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvy4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvzIKGEeSFEt9m3bH63A" name="list" isOrdered="true" isUnique="false" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvzYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvzoKGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvz4KGEeSFEt9m3bH63A" name="j" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv0IKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv0YKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPv0oKGEeSFEt9m3bH63A" name="k" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv04KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv1IKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPv2IKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$initialization$1" visibility="protected" specification="_xwPv2YKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv54KGEeSFEt9m3bH63A" annotatedElement="_xwPv2IKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Increment_Decrement$initialization$1'(){
+  if (this.'Expressions_Increment_Decrement$initializationFlag$1' == null) {
+    this.'Expressions_Increment_Decrement$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPv2oKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$method$1" specification="_xwPv3oKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv6IKGEeSFEt9m3bH63A" annotatedElement="_xwPv2oKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Increment_Decrement$method$1'(): Expressions_Increment_Decrement {
+	this.'Expressions_Increment_Decrement$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPv24KGEeSFEt9m3bH63A" type="_xwPIoIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv3IKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv3YKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPv4oKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_xwPv44KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv5oKGEeSFEt9m3bH63A" annotatedElement="_xwPv4oKGEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_xwPv5IKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xwPv6oKGEeSFEt9m3bH63A" annotatedElement="_xwPv5IKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Increment_Decrement$behavior$1'() { this.test(s, i, x, list, j, k);
+AssertList(&quot;s&quot;, s, new Integer [] { 1, 3 });
+AssertEqual(&quot;i&quot;, i, 2);
+AssertEqual(&quot;x&quot;, x, 3);
+AssertList(&quot;list&quot;, list, new Integer [] { 1, 3 });
+AssertEqual(&quot;j&quot;, j, 3);
+AssertEqual(&quot;k&quot;, k, 2);
+WriteLine(&quot;Done&quot;);
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_xwPIp4KGEeSFEt9m3bH63A" name="test" visibility="public" method="_xwPvwoKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvsIKGEeSFEt9m3bH63A" name="s" isOrdered="true" isUnique="false" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvsYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvsoKGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvs4KGEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvtIKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvtYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvtoKGEeSFEt9m3bH63A" name="x" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvt4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvuIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvuYKGEeSFEt9m3bH63A" name="list" isOrdered="true" isUnique="false" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvuoKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvu4KGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvvIKGEeSFEt9m3bH63A" name="j" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvvYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvvoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPvv4KGEeSFEt9m3bH63A" name="k" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPvwIKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPvwYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_xwPv2YKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement$initialization$1" visibility="protected" method="_xwPv2IKGEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_xwPv3oKGEeSFEt9m3bH63A" name="Expressions_Increment_Decrement" method="_xwPv2oKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xwPv34KGEeSFEt9m3bH63A" type="_xwPIoIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwPv4IKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwPv4YKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_xwPv44KGEeSFEt9m3bH63A" name="destroy" method="_xwPv4oKGEeSFEt9m3bH63A"/>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_xYhMMYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xYhMMoKGEeSFEt9m3bH63A" 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="_r3ZLZLeLEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r3ZycLeLEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_xwPv64KGEeSFEt9m3bH63A" base_Comment="_xwPv5oKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_xwPv7IKGEeSFEt9m3bH63A" base_Comment="_xwPv54KGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_xwPv7YKGEeSFEt9m3bH63A" base_BehavioralFeature="_xwPv3oKGEeSFEt9m3bH63A"/>
+  <standard:Destroy xmi:id="_xwPv7oKGEeSFEt9m3bH63A" base_BehavioralFeature="_xwPv44KGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_xwPv74KGEeSFEt9m3bH63A" base_Comment="_xwPv6IKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_xwPv8IKGEeSFEt9m3bH63A" base_Comment="_xwPv6YKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_xwPv8YKGEeSFEt9m3bH63A" base_Comment="_xwPv6oKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Object.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Object.uml
index f221d6ce741..e0c60e41809 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Object.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Expressions_Object.uml
@@ -1,252 +1,252 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_0LrQUIKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_0nS1UIKGEeSFEt9m3bH63A" name="Expressions_Object" classifierBehavior="_0nS1r4KGEeSFEt9m3bH63A" isActive="true">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1sIKGEeSFEt9m3bH63A" annotatedElement="_0nS1UIKGEeSFEt9m3bH63A">

-        <body>&#xD;

- * Test object structure expressions.&#xD;

- *</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1UYKGEeSFEt9m3bH63A" name="members" visibility="package" type="_0nS1VIKGEeSFEt9m3bH63A" isOrdered="true" isUnique="false">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1UoKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1U4KGEeSFEt9m3bH63A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1bYKGEeSFEt9m3bH63A" name="principal" visibility="package">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1boKGEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1b4KGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1cIKGEeSFEt9m3bH63A" name="rate" visibility="package">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1cYKGEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1coKGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1c4KGEeSFEt9m3bH63A" name="interest" visibility="package">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1dIKGEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1dYKGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1oIKGEeSFEt9m3bH63A" name="Expressions_Object$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1oYKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1ooKGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1kIKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_0nS1gIKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1s4KGEeSFEt9m3bH63A" annotatedElement="_0nS1kIKGEeSFEt9m3bH63A">

-          <body>activity 'test$method$1'(out member: Member, out customer0: Customer, out customer1: Customer, out names: String[0..*], out self: Expressions_Object) { this.members[1] = new Member();

-this.members[2] = new Member();

-this.members[1].name = &quot;A&quot;;

-this.members[2].name = &quot;B&quot;;

-member = this.members[1];

-member.isActive = true;

-member.address = &quot;Easy Street&quot;;

-customer0 = new Customer(name=>&quot;Fred&quot;, email=>&quot;fred@blah.com&quot;,

-address=>&quot;Unknown&quot;);

-customer1 = customer0;

-customer1.address = member.address;

-this.principal = 1000;

-this.rate = 5;

-this.interest = this.principal * this.rate / 100 * 10;

-names = this.members.name;

-self = this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1kYKGEeSFEt9m3bH63A" name="member" type="_0nS1VIKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1koKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1k4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1lIKGEeSFEt9m3bH63A" name="customer0" type="_0nS1doKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1lYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1loKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1l4KGEeSFEt9m3bH63A" name="customer1" type="_0nS1doKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1mIKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1mYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1moKGEeSFEt9m3bH63A" name="names" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1m4KGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1nIKGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1nYKGEeSFEt9m3bH63A" name="self" type="_0nS1UIKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1noKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1n4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1o4KGEeSFEt9m3bH63A" name="Expressions_Object$initialization$1" visibility="protected" specification="_0nS1pIKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1t4KGEeSFEt9m3bH63A" annotatedElement="_0nS1o4KGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Object$initialization$1'(){

-  if (this.'Expressions_Object$initializationFlag$1' == null) {

-    this.'Expressions_Object$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1pYKGEeSFEt9m3bH63A" name="Expressions_Object$method$1" specification="_0nS1qYKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1sYKGEeSFEt9m3bH63A" annotatedElement="_0nS1pYKGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Object$method$1'(): Expressions_Object {

-	this.'Expressions_Object$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1poKGEeSFEt9m3bH63A" type="_0nS1UIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1p4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1qIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1rYKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_0nS1roKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1toKGEeSFEt9m3bH63A" annotatedElement="_0nS1rYKGEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1r4KGEeSFEt9m3bH63A" name="Expressions_Object$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1uIKGEeSFEt9m3bH63A" annotatedElement="_0nS1r4KGEeSFEt9m3bH63A">

-          <body>activity 'Expressions_Object$behavior$1'() { this.test(member, customer0, customer1, names, self);

-AssertEqual(&quot;member.name&quot;, member.name, &quot;A&quot;);

-AssertTrue(&quot;member.isActive&quot;, member.isActive);

-AssertEqual(&quot;member.address&quot;, member.address, &quot;Easy Street&quot;);

-AssertEqual(&quot;customer0.name&quot;, customer0.name, &quot;Fred&quot;);

-AssertEqual(&quot;customer0.email&quot;, customer0.email, &quot;fred@blah.com&quot;);

-AssertList(&quot;customer0.address&quot;, customer0.address, &quot;Unknown&quot;);

-AssertEqual(&quot;customer1.name&quot;, customer1.name, &quot;Fred&quot;);

-AssertEqual(&quot;customer1.email&quot;, customer1.email, &quot;fred@blah.com&quot;);

-AssertList(&quot;customer1.address&quot;, customer1.address, &quot;Easy Street&quot;);

-AssertEqual(&quot;self.principal&quot;, self.principal, 1000);

-AssertEqual(&quot;self.rate&quot;, self.rate, 5);

-AssertEqual(&quot;self.interest&quot;, self.interest, 500);

-AssertList(&quot;names&quot;, names, new String [] { &quot;A&quot;, &quot;B&quot; });

-WriteLine(&quot;Done&quot;);

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1gIKGEeSFEt9m3bH63A" name="test" visibility="package" method="_0nS1kIKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1gYKGEeSFEt9m3bH63A" name="member" type="_0nS1VIKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1goKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1g4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1hIKGEeSFEt9m3bH63A" name="customer0" type="_0nS1doKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1hYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1hoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1h4KGEeSFEt9m3bH63A" name="customer1" type="_0nS1doKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1iIKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1iYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1ioKGEeSFEt9m3bH63A" name="names" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1i4KGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1jIKGEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1jYKGEeSFEt9m3bH63A" name="self" type="_0nS1UIKGEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1joKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1j4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1pIKGEeSFEt9m3bH63A" name="Expressions_Object$initialization$1" visibility="protected" method="_0nS1o4KGEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1qYKGEeSFEt9m3bH63A" name="Expressions_Object" method="_0nS1pYKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1qoKGEeSFEt9m3bH63A" type="_0nS1UIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1q4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1rIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1roKGEeSFEt9m3bH63A" name="destroy" method="_0nS1rYKGEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_0nS1VIKGEeSFEt9m3bH63A" name="Member" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1VYKGEeSFEt9m3bH63A" name="isActive" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1VoKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1V4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1WIKGEeSFEt9m3bH63A" name="name" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1WYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1WoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1W4KGEeSFEt9m3bH63A" name="address" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1XIKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1XYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1XoKGEeSFEt9m3bH63A" name="Member$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1X4KGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1YIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1YYKGEeSFEt9m3bH63A" name="Member$initialization$1" visibility="protected" specification="_0nS1YoKGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1tYKGEeSFEt9m3bH63A" annotatedElement="_0nS1YYKGEeSFEt9m3bH63A">

-            <body>activity 'Member$initialization$1'(){

-  if (this.'Member$initializationFlag$1' == null) {

-    this.'Member$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1Y4KGEeSFEt9m3bH63A" name="Member$method$1" specification="_0nS1Z4KGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1tIKGEeSFEt9m3bH63A" annotatedElement="_0nS1Y4KGEeSFEt9m3bH63A">

-            <body>activity 'Member$method$1'(): Member {

-	this.'Member$initialization$1'();

-	return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1ZIKGEeSFEt9m3bH63A" type="_0nS1VIKGEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1ZYKGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1ZoKGEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1a4KGEeSFEt9m3bH63A" name="destroy$method$1" specification="_0nS1bIKGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1soKGEeSFEt9m3bH63A" annotatedElement="_0nS1a4KGEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1YoKGEeSFEt9m3bH63A" name="Member$initialization$1" visibility="protected" method="_0nS1YYKGEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1Z4KGEeSFEt9m3bH63A" name="Member" method="_0nS1Y4KGEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1aIKGEeSFEt9m3bH63A" type="_0nS1VIKGEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1aYKGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1aoKGEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1bIKGEeSFEt9m3bH63A" name="destroy" method="_0nS1a4KGEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:DataType" xmi:id="_0nS1doKGEeSFEt9m3bH63A" name="Customer" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1d4KGEeSFEt9m3bH63A" name="name" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1eIKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1eYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1eoKGEeSFEt9m3bH63A" name="email" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1e4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1fIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1fYKGEeSFEt9m3bH63A" name="address" visibility="public" isOrdered="true" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1foKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1f4KGEeSFEt9m3bH63A" value="*"/>

-        </ownedAttribute>

-      </nestedClassifier>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_0LrQUYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0LrQUoKGEeSFEt9m3bH63A" 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="__Di3N7eLEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <standard:Create xmi:id="_0nS1uYKGEeSFEt9m3bH63A" base_BehavioralFeature="_0nS1qYKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_0nS1uoKGEeSFEt9m3bH63A" base_Comment="_0nS1soKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_0nS1u4KGEeSFEt9m3bH63A" base_BehavioralFeature="_0nS1roKGEeSFEt9m3bH63A"/>

-  <standard:Destroy xmi:id="_0nS1vIKGEeSFEt9m3bH63A" base_BehavioralFeature="_0nS1bIKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_0nS1vYKGEeSFEt9m3bH63A" base_Comment="_0nS1t4KGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_0nS1voKGEeSFEt9m3bH63A" base_Comment="_0nS1tYKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_0nS1v4KGEeSFEt9m3bH63A" base_Comment="_0nS1sYKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_0nS1wIKGEeSFEt9m3bH63A" base_Comment="_0nS1s4KGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_0nS1wYKGEeSFEt9m3bH63A" base_Comment="_0nS1uIKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_0nS1woKGEeSFEt9m3bH63A" base_Comment="_0nS1tIKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_0nS1w4KGEeSFEt9m3bH63A" base_BehavioralFeature="_0nS1Z4KGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_0nS1xIKGEeSFEt9m3bH63A" base_Comment="_0nS1toKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_0LrQUIKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_0nS1UIKGEeSFEt9m3bH63A" name="Expressions_Object" classifierBehavior="_0nS1r4KGEeSFEt9m3bH63A" isActive="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1sIKGEeSFEt9m3bH63A" annotatedElement="_0nS1UIKGEeSFEt9m3bH63A">
+        <body>&#xD;
+ * Test object structure expressions.&#xD;
+ *</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1UYKGEeSFEt9m3bH63A" name="members" visibility="package" type="_0nS1VIKGEeSFEt9m3bH63A" isOrdered="true" isUnique="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1UoKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1U4KGEeSFEt9m3bH63A" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1bYKGEeSFEt9m3bH63A" name="principal" visibility="package">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1boKGEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1b4KGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1cIKGEeSFEt9m3bH63A" name="rate" visibility="package">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1cYKGEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1coKGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1c4KGEeSFEt9m3bH63A" name="interest" visibility="package">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1dIKGEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1dYKGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1oIKGEeSFEt9m3bH63A" name="Expressions_Object$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1oYKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1ooKGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1kIKGEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_0nS1gIKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1s4KGEeSFEt9m3bH63A" annotatedElement="_0nS1kIKGEeSFEt9m3bH63A">
+          <body>activity 'test$method$1'(out member: Member, out customer0: Customer, out customer1: Customer, out names: String[0..*], out self: Expressions_Object) { this.members[1] = new Member();
+this.members[2] = new Member();
+this.members[1].name = &quot;A&quot;;
+this.members[2].name = &quot;B&quot;;
+member = this.members[1];
+member.isActive = true;
+member.address = &quot;Easy Street&quot;;
+customer0 = new Customer(name=>&quot;Fred&quot;, email=>&quot;fred@blah.com&quot;,
+address=>&quot;Unknown&quot;);
+customer1 = customer0;
+customer1.address = member.address;
+this.principal = 1000;
+this.rate = 5;
+this.interest = this.principal * this.rate / 100 * 10;
+names = this.members.name;
+self = this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1kYKGEeSFEt9m3bH63A" name="member" type="_0nS1VIKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1koKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1k4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1lIKGEeSFEt9m3bH63A" name="customer0" type="_0nS1doKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1lYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1loKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1l4KGEeSFEt9m3bH63A" name="customer1" type="_0nS1doKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1mIKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1mYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1moKGEeSFEt9m3bH63A" name="names" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1m4KGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1nIKGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1nYKGEeSFEt9m3bH63A" name="self" type="_0nS1UIKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1noKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1n4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1o4KGEeSFEt9m3bH63A" name="Expressions_Object$initialization$1" visibility="protected" specification="_0nS1pIKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1t4KGEeSFEt9m3bH63A" annotatedElement="_0nS1o4KGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Object$initialization$1'(){
+  if (this.'Expressions_Object$initializationFlag$1' == null) {
+    this.'Expressions_Object$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1pYKGEeSFEt9m3bH63A" name="Expressions_Object$method$1" specification="_0nS1qYKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1sYKGEeSFEt9m3bH63A" annotatedElement="_0nS1pYKGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Object$method$1'(): Expressions_Object {
+	this.'Expressions_Object$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1poKGEeSFEt9m3bH63A" type="_0nS1UIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1p4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1qIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1rYKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_0nS1roKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1toKGEeSFEt9m3bH63A" annotatedElement="_0nS1rYKGEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1r4KGEeSFEt9m3bH63A" name="Expressions_Object$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1uIKGEeSFEt9m3bH63A" annotatedElement="_0nS1r4KGEeSFEt9m3bH63A">
+          <body>activity 'Expressions_Object$behavior$1'() { this.test(member, customer0, customer1, names, self);
+AssertEqual(&quot;member.name&quot;, member.name, &quot;A&quot;);
+AssertTrue(&quot;member.isActive&quot;, member.isActive);
+AssertEqual(&quot;member.address&quot;, member.address, &quot;Easy Street&quot;);
+AssertEqual(&quot;customer0.name&quot;, customer0.name, &quot;Fred&quot;);
+AssertEqual(&quot;customer0.email&quot;, customer0.email, &quot;fred@blah.com&quot;);
+AssertList(&quot;customer0.address&quot;, customer0.address, &quot;Unknown&quot;);
+AssertEqual(&quot;customer1.name&quot;, customer1.name, &quot;Fred&quot;);
+AssertEqual(&quot;customer1.email&quot;, customer1.email, &quot;fred@blah.com&quot;);
+AssertList(&quot;customer1.address&quot;, customer1.address, &quot;Easy Street&quot;);
+AssertEqual(&quot;self.principal&quot;, self.principal, 1000);
+AssertEqual(&quot;self.rate&quot;, self.rate, 5);
+AssertEqual(&quot;self.interest&quot;, self.interest, 500);
+AssertList(&quot;names&quot;, names, new String [] { &quot;A&quot;, &quot;B&quot; });
+WriteLine(&quot;Done&quot;);
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1gIKGEeSFEt9m3bH63A" name="test" visibility="package" method="_0nS1kIKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1gYKGEeSFEt9m3bH63A" name="member" type="_0nS1VIKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1goKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1g4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1hIKGEeSFEt9m3bH63A" name="customer0" type="_0nS1doKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1hYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1hoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1h4KGEeSFEt9m3bH63A" name="customer1" type="_0nS1doKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1iIKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1iYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1ioKGEeSFEt9m3bH63A" name="names" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1i4KGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1jIKGEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1jYKGEeSFEt9m3bH63A" name="self" type="_0nS1UIKGEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1joKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1j4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1pIKGEeSFEt9m3bH63A" name="Expressions_Object$initialization$1" visibility="protected" method="_0nS1o4KGEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1qYKGEeSFEt9m3bH63A" name="Expressions_Object" method="_0nS1pYKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1qoKGEeSFEt9m3bH63A" type="_0nS1UIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1q4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1rIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1roKGEeSFEt9m3bH63A" name="destroy" method="_0nS1rYKGEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_0nS1VIKGEeSFEt9m3bH63A" name="Member" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1VYKGEeSFEt9m3bH63A" name="isActive" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1VoKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1V4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1WIKGEeSFEt9m3bH63A" name="name" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1WYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1WoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1W4KGEeSFEt9m3bH63A" name="address" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1XIKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1XYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1XoKGEeSFEt9m3bH63A" name="Member$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1X4KGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1YIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1YYKGEeSFEt9m3bH63A" name="Member$initialization$1" visibility="protected" specification="_0nS1YoKGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1tYKGEeSFEt9m3bH63A" annotatedElement="_0nS1YYKGEeSFEt9m3bH63A">
+            <body>activity 'Member$initialization$1'(){
+  if (this.'Member$initializationFlag$1' == null) {
+    this.'Member$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1Y4KGEeSFEt9m3bH63A" name="Member$method$1" specification="_0nS1Z4KGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1tIKGEeSFEt9m3bH63A" annotatedElement="_0nS1Y4KGEeSFEt9m3bH63A">
+            <body>activity 'Member$method$1'(): Member {
+	this.'Member$initialization$1'();
+	return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1ZIKGEeSFEt9m3bH63A" type="_0nS1VIKGEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1ZYKGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1ZoKGEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_0nS1a4KGEeSFEt9m3bH63A" name="destroy$method$1" specification="_0nS1bIKGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_0nS1soKGEeSFEt9m3bH63A" annotatedElement="_0nS1a4KGEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1YoKGEeSFEt9m3bH63A" name="Member$initialization$1" visibility="protected" method="_0nS1YYKGEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1Z4KGEeSFEt9m3bH63A" name="Member" method="_0nS1Y4KGEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_0nS1aIKGEeSFEt9m3bH63A" type="_0nS1VIKGEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1aYKGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1aoKGEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_0nS1bIKGEeSFEt9m3bH63A" name="destroy" method="_0nS1a4KGEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:DataType" xmi:id="_0nS1doKGEeSFEt9m3bH63A" name="Customer" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1d4KGEeSFEt9m3bH63A" name="name" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1eIKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1eYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1eoKGEeSFEt9m3bH63A" name="email" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1e4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1fIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_0nS1fYKGEeSFEt9m3bH63A" name="address" visibility="public" isOrdered="true" isUnique="false">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0nS1foKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0nS1f4KGEeSFEt9m3bH63A" value="*"/>
+        </ownedAttribute>
+      </nestedClassifier>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_0LrQUYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0LrQUoKGEeSFEt9m3bH63A" 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="__Di3N7eLEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__DjeQLeLEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <standard:Create xmi:id="_0nS1uYKGEeSFEt9m3bH63A" base_BehavioralFeature="_0nS1qYKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_0nS1uoKGEeSFEt9m3bH63A" base_Comment="_0nS1soKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_0nS1u4KGEeSFEt9m3bH63A" base_BehavioralFeature="_0nS1roKGEeSFEt9m3bH63A"/>
+  <standard:Destroy xmi:id="_0nS1vIKGEeSFEt9m3bH63A" base_BehavioralFeature="_0nS1bIKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_0nS1vYKGEeSFEt9m3bH63A" base_Comment="_0nS1t4KGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_0nS1voKGEeSFEt9m3bH63A" base_Comment="_0nS1tYKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_0nS1v4KGEeSFEt9m3bH63A" base_Comment="_0nS1sYKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_0nS1wIKGEeSFEt9m3bH63A" base_Comment="_0nS1s4KGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_0nS1wYKGEeSFEt9m3bH63A" base_Comment="_0nS1uIKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_0nS1woKGEeSFEt9m3bH63A" base_Comment="_0nS1tIKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_0nS1w4KGEeSFEt9m3bH63A" base_BehavioralFeature="_0nS1Z4KGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_0nS1xIKGEeSFEt9m3bH63A" base_Comment="_0nS1toKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_HelloWorld.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_HelloWorld.uml
index b0a73ff3943..a59d75e3056 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_HelloWorld.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_HelloWorld.uml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_7-sgsIKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Activity" xmi:id="_8CIPMIKGEeSFEt9m3bH63A" name="Interactive_HelloWorld" visibility="protected">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_8CIPMYKGEeSFEt9m3bH63A" annotatedElement="_8CIPMIKGEeSFEt9m3bH63A">

-        <body>activity Interactive_HelloWorld() { WriteLine(&quot;Hello World!&quot;);

-}</body>

-      </ownedComment>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_7-sgsYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7-sgsoKGEeSFEt9m3bH63A" 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="_fayEQLeMEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_8CIPMoKGEeSFEt9m3bH63A" base_Comment="_8CIPMYKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_7-sgsIKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Activity" xmi:id="_8CIPMIKGEeSFEt9m3bH63A" name="Interactive_HelloWorld" visibility="protected">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_8CIPMYKGEeSFEt9m3bH63A" annotatedElement="_8CIPMIKGEeSFEt9m3bH63A">
+        <body>activity Interactive_HelloWorld() { WriteLine(&quot;Hello World!&quot;);
+}</body>
+      </ownedComment>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_7-sgsYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7-sgsoKGEeSFEt9m3bH63A" 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="_fayEQLeMEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fazSYLeMEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_8CIPMoKGEeSFEt9m3bH63A" base_Comment="_8CIPMYKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_InputOutput.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_InputOutput.uml
index 0d2dd856a45..68269220dde 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_InputOutput.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_InputOutput.uml
@@ -1,140 +1,140 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_8CxvcIKGEeSFEt9m3bH63A" name="Model">

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_1Sjo0LeMEeS_zZpc9I-Bsg">

-      <importedPackage xmi:type="uml:Model" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf"/>

-    </packageImport>

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_A6bMYLekEeSkqaPlhCzRxg">

-      <importedPackage xmi:type="uml:Model" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#_0"/>

-    </packageImport>

-    <packagedElement xmi:type="uml:Class" xmi:id="_8WWLsIKGEeSFEt9m3bH63A" name="Interactive_InputOutput" classifierBehavior="_8WWL1YKGEeSFEt9m3bH63A" isActive="true">

-      <elementImport xmi:type="uml:ElementImport" xmi:id="_8WWL1oKGEeSFEt9m3bH63A" alias="" visibility="private">

-        <importedElement xmi:type="uml:Package" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#BasicInputOutput"/>

-      </elementImport>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_8WWLxoKGEeSFEt9m3bH63A" name="Interactive_InputOutput$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLx4KGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLyIKGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8WWLyYKGEeSFEt9m3bH63A" name="Interactive_InputOutput$initialization$1" visibility="protected" specification="_8WWLyoKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL2oKGEeSFEt9m3bH63A" annotatedElement="_8WWLyYKGEeSFEt9m3bH63A">

-          <body>activity 'Interactive_InputOutput$initialization$1'(){

-  if (this.'Interactive_InputOutput$initializationFlag$1' == null) {

-    this.'Interactive_InputOutput$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8WWLy4KGEeSFEt9m3bH63A" name="Interactive_InputOutput$method$1" specification="_8WWLz4KGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL2YKGEeSFEt9m3bH63A" annotatedElement="_8WWLy4KGEeSFEt9m3bH63A">

-          <body>activity 'Interactive_InputOutput$method$1'(): Interactive_InputOutput {

-	this.'Interactive_InputOutput$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLzIKGEeSFEt9m3bH63A" type="_8WWLsIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLzYKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLzoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8WWL04KGEeSFEt9m3bH63A" name="destroy$method$1" specification="_8WWL1IKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL3IKGEeSFEt9m3bH63A" annotatedElement="_8WWL04KGEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8WWL1YKGEeSFEt9m3bH63A" name="Interactive_InputOutput$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL24KGEeSFEt9m3bH63A" annotatedElement="_8WWL1YKGEeSFEt9m3bH63A">

-          <body>activity 'Interactive_InputOutput$behavior$1'() { WriteLine(&quot;Enter two characters.&quot;);

-A(char1, char2, s1, s2);

-Output().write(&quot;char1=&quot;);

-Output().write(char1);

-Output().write(&quot; status1=&quot; + s1.description);

-Output().writeNewLine();

-Output().write(&quot;char2=&quot;);

-Output().write(char2);

-Output().write(&quot; status2=&quot; + s2.description);

-Output().writeNewLine();

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8WWLyoKGEeSFEt9m3bH63A" name="Interactive_InputOutput$initialization$1" visibility="protected" method="_8WWLyYKGEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8WWLz4KGEeSFEt9m3bH63A" name="Interactive_InputOutput" method="_8WWLy4KGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWL0IKGEeSFEt9m3bH63A" type="_8WWLsIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWL0YKGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWL0oKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8WWL1IKGEeSFEt9m3bH63A" name="destroy" method="_8WWL04KGEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:Activity" xmi:id="_8WWLsYKGEeSFEt9m3bH63A" name="Input" visibility="package">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL3YKGEeSFEt9m3bH63A" annotatedElement="_8WWLsYKGEeSFEt9m3bH63A">

-          <body>activity Input(): StandardInputChannel { return StandardInputChannel.allInstances ()[1];

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLsoKGEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:Class" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#BasicInputOutput-StandardInputChannel"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLs4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLtIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Activity" xmi:id="_8WWLtYKGEeSFEt9m3bH63A" name="Output" visibility="package">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL2IKGEeSFEt9m3bH63A" annotatedElement="_8WWLtYKGEeSFEt9m3bH63A">

-          <body>activity Output(): StandardOutputChannel { return StandardOutputChannel.allInstances ()[1];

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLtoKGEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:Class" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#BasicInputOutput-StandardOutputChannel"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLt4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLuIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Activity" xmi:id="_8WWLuYKGEeSFEt9m3bH63A" name="A" visibility="package">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL14KGEeSFEt9m3bH63A" annotatedElement="_8WWLuYKGEeSFEt9m3bH63A">

-          <body>activity A(out x: any[0..1], out y: any[0..1], out status1: Status[0..1], out status2: Status[0..1]) { Input().read(x, status1);

-Input().read(y, status2);

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLuoKGEeSFEt9m3bH63A" name="x" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLu4KGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLvIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLvYKGEeSFEt9m3bH63A" name="y" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLvoKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLv4KGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLwIKGEeSFEt9m3bH63A" name="status1" direction="out">

-          <type xmi:type="uml:DataType" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#Common-Status"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLwYKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLwoKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLw4KGEeSFEt9m3bH63A" name="status2" direction="out">

-          <type xmi:type="uml:DataType" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#Common-Status"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLxIKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLxYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </nestedClassifier>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_8CxvcYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8CxvcoKGEeSFEt9m3bH63A" 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="_jvsPBbeMEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_8WWL3oKGEeSFEt9m3bH63A" base_Comment="_8WWL24KGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8WWL34KGEeSFEt9m3bH63A" base_Comment="_8WWL2YKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_8WWL4IKGEeSFEt9m3bH63A" base_BehavioralFeature="_8WWL1IKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8WWL4YKGEeSFEt9m3bH63A" base_Comment="_8WWL2IKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8WWL4oKGEeSFEt9m3bH63A" base_Comment="_8WWL14KGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8WWL44KGEeSFEt9m3bH63A" base_Comment="_8WWL2oKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_8WWL5IKGEeSFEt9m3bH63A" base_BehavioralFeature="_8WWLz4KGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8WWL5YKGEeSFEt9m3bH63A" base_Comment="_8WWL3YKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8WWL5oKGEeSFEt9m3bH63A" base_Comment="_8WWL3IKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_8CxvcIKGEeSFEt9m3bH63A" name="Model">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_1Sjo0LeMEeS_zZpc9I-Bsg">
+      <importedPackage xmi:type="uml:Model" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf"/>
+    </packageImport>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_A6bMYLekEeSkqaPlhCzRxg">
+      <importedPackage xmi:type="uml:Model" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Class" xmi:id="_8WWLsIKGEeSFEt9m3bH63A" name="Interactive_InputOutput" classifierBehavior="_8WWL1YKGEeSFEt9m3bH63A" isActive="true">
+      <elementImport xmi:type="uml:ElementImport" xmi:id="_8WWL1oKGEeSFEt9m3bH63A" alias="" visibility="private">
+        <importedElement xmi:type="uml:Package" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#BasicInputOutput"/>
+      </elementImport>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_8WWLxoKGEeSFEt9m3bH63A" name="Interactive_InputOutput$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLx4KGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLyIKGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8WWLyYKGEeSFEt9m3bH63A" name="Interactive_InputOutput$initialization$1" visibility="protected" specification="_8WWLyoKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL2oKGEeSFEt9m3bH63A" annotatedElement="_8WWLyYKGEeSFEt9m3bH63A">
+          <body>activity 'Interactive_InputOutput$initialization$1'(){
+  if (this.'Interactive_InputOutput$initializationFlag$1' == null) {
+    this.'Interactive_InputOutput$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8WWLy4KGEeSFEt9m3bH63A" name="Interactive_InputOutput$method$1" specification="_8WWLz4KGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL2YKGEeSFEt9m3bH63A" annotatedElement="_8WWLy4KGEeSFEt9m3bH63A">
+          <body>activity 'Interactive_InputOutput$method$1'(): Interactive_InputOutput {
+	this.'Interactive_InputOutput$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLzIKGEeSFEt9m3bH63A" type="_8WWLsIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLzYKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLzoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8WWL04KGEeSFEt9m3bH63A" name="destroy$method$1" specification="_8WWL1IKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL3IKGEeSFEt9m3bH63A" annotatedElement="_8WWL04KGEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8WWL1YKGEeSFEt9m3bH63A" name="Interactive_InputOutput$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL24KGEeSFEt9m3bH63A" annotatedElement="_8WWL1YKGEeSFEt9m3bH63A">
+          <body>activity 'Interactive_InputOutput$behavior$1'() { WriteLine(&quot;Enter two characters.&quot;);
+A(char1, char2, s1, s2);
+Output().write(&quot;char1=&quot;);
+Output().write(char1);
+Output().write(&quot; status1=&quot; + s1.description);
+Output().writeNewLine();
+Output().write(&quot;char2=&quot;);
+Output().write(char2);
+Output().write(&quot; status2=&quot; + s2.description);
+Output().writeNewLine();
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_8WWLyoKGEeSFEt9m3bH63A" name="Interactive_InputOutput$initialization$1" visibility="protected" method="_8WWLyYKGEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_8WWLz4KGEeSFEt9m3bH63A" name="Interactive_InputOutput" method="_8WWLy4KGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWL0IKGEeSFEt9m3bH63A" type="_8WWLsIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWL0YKGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWL0oKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_8WWL1IKGEeSFEt9m3bH63A" name="destroy" method="_8WWL04KGEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:Activity" xmi:id="_8WWLsYKGEeSFEt9m3bH63A" name="Input" visibility="package">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL3YKGEeSFEt9m3bH63A" annotatedElement="_8WWLsYKGEeSFEt9m3bH63A">
+          <body>activity Input(): StandardInputChannel { return StandardInputChannel.allInstances ()[1];
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLsoKGEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:Class" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#BasicInputOutput-StandardInputChannel"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLs4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLtIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Activity" xmi:id="_8WWLtYKGEeSFEt9m3bH63A" name="Output" visibility="package">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL2IKGEeSFEt9m3bH63A" annotatedElement="_8WWLtYKGEeSFEt9m3bH63A">
+          <body>activity Output(): StandardOutputChannel { return StandardOutputChannel.allInstances ()[1];
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLtoKGEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:Class" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#BasicInputOutput-StandardOutputChannel"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLt4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLuIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Activity" xmi:id="_8WWLuYKGEeSFEt9m3bH63A" name="A" visibility="package">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8WWL14KGEeSFEt9m3bH63A" annotatedElement="_8WWLuYKGEeSFEt9m3bH63A">
+          <body>activity A(out x: any[0..1], out y: any[0..1], out status1: Status[0..1], out status2: Status[0..1]) { Input().read(x, status1);
+Input().read(y, status2);
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLuoKGEeSFEt9m3bH63A" name="x" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLu4KGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLvIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLvYKGEeSFEt9m3bH63A" name="y" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLvoKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLv4KGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLwIKGEeSFEt9m3bH63A" name="status1" direction="out">
+          <type xmi:type="uml:DataType" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#Common-Status"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLwYKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLwoKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8WWLw4KGEeSFEt9m3bH63A" name="status2" direction="out">
+          <type xmi:type="uml:DataType" href="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml#Common-Status"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WWLxIKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8WWLxYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </nestedClassifier>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_8CxvcYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8CxvcoKGEeSFEt9m3bH63A" 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="_jvsPBbeMEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jvs2ELeMEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_8WWL3oKGEeSFEt9m3bH63A" base_Comment="_8WWL24KGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8WWL34KGEeSFEt9m3bH63A" base_Comment="_8WWL2YKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_8WWL4IKGEeSFEt9m3bH63A" base_BehavioralFeature="_8WWL1IKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8WWL4YKGEeSFEt9m3bH63A" base_Comment="_8WWL2IKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8WWL4oKGEeSFEt9m3bH63A" base_Comment="_8WWL14KGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8WWL44KGEeSFEt9m3bH63A" base_Comment="_8WWL2oKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_8WWL5IKGEeSFEt9m3bH63A" base_BehavioralFeature="_8WWLz4KGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8WWL5YKGEeSFEt9m3bH63A" base_Comment="_8WWL3YKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8WWL5oKGEeSFEt9m3bH63A" base_Comment="_8WWL3IKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_PingPong.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_PingPong.uml
index 678d77a0b85..81989bc8d48 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_PingPong.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_PingPong.uml
@@ -1,215 +1,215 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_8XXfYIKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_8oAjcIKGEeSFEt9m3bH63A" name="Interactive_PingPong" classifierBehavior="_8oAjs4KGEeSFEt9m3bH63A" isActive="true">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjpIKGEeSFEt9m3bH63A" name="Interactive_PingPong$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjpYKGEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjpoKGEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjp4KGEeSFEt9m3bH63A" name="Interactive_PingPong$initialization$1" visibility="protected" specification="_8oAjqIKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjv4KGEeSFEt9m3bH63A" annotatedElement="_8oAjp4KGEeSFEt9m3bH63A">

-          <body>activity 'Interactive_PingPong$initialization$1'(){

-  if (this.'Interactive_PingPong$initializationFlag$1' == null) {

-    this.'Interactive_PingPong$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjqYKGEeSFEt9m3bH63A" name="Interactive_PingPong$method$1" specification="_8oAjrYKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8oAju4KGEeSFEt9m3bH63A" annotatedElement="_8oAjqYKGEeSFEt9m3bH63A">

-          <body>activity 'Interactive_PingPong$method$1'(): Interactive_PingPong {

-	this.'Interactive_PingPong$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjqoKGEeSFEt9m3bH63A" type="_8oAjcIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjq4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjrIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjsYKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_8oAjsoKGEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjuYKGEeSFEt9m3bH63A" annotatedElement="_8oAjsYKGEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjs4KGEeSFEt9m3bH63A" name="Interactive_PingPong$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjuoKGEeSFEt9m3bH63A" annotatedElement="_8oAjs4KGEeSFEt9m3bH63A">

-          <body>activity 'Interactive_PingPong$behavior$1'() { a = new A();

-b = new B();

-Write(&quot;Enter n: &quot;);

-n = IntegerFunctions::ToInteger(ReadLine(error));

-if (n->notEmpty()) { a.Start(b);

-b.Start(a, n);

-} }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjqIKGEeSFEt9m3bH63A" name="Interactive_PingPong$initialization$1" visibility="protected" method="_8oAjp4KGEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjrYKGEeSFEt9m3bH63A" name="Interactive_PingPong" method="_8oAjqYKGEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjroKGEeSFEt9m3bH63A" type="_8oAjcIKGEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjr4KGEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjsIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjsoKGEeSFEt9m3bH63A" name="destroy" method="_8oAjsYKGEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_8oAjcYKGEeSFEt9m3bH63A" name="A" visibility="package" classifierBehavior="_8oAjo4KGEeSFEt9m3bH63A" isActive="true">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjkoKGEeSFEt9m3bH63A" name="A$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjk4KGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjlIKGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjlYKGEeSFEt9m3bH63A" name="A$initialization$1" visibility="protected" specification="_8oAjloKGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjt4KGEeSFEt9m3bH63A" annotatedElement="_8oAjlYKGEeSFEt9m3bH63A">

-            <body>activity 'A$initialization$1'(){

-  if (this.'A$initializationFlag$1' == null) {

-    this.'A$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjl4KGEeSFEt9m3bH63A" name="A$method$1" specification="_8oAjm4KGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjvYKGEeSFEt9m3bH63A" annotatedElement="_8oAjl4KGEeSFEt9m3bH63A">

-            <body>activity 'A$method$1'(): A {

-	this.'A$initialization$1'();

-	return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjmIKGEeSFEt9m3bH63A" type="_8oAjcYKGEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjmYKGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjmoKGEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjn4KGEeSFEt9m3bH63A" name="destroy$method$1" specification="_8oAjoIKGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjvoKGEeSFEt9m3bH63A" annotatedElement="_8oAjn4KGEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjo4KGEeSFEt9m3bH63A" name="A$behavior$1" visibility="private">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjuIKGEeSFEt9m3bH63A" annotatedElement="_8oAjo4KGEeSFEt9m3bH63A">

-            <body>activity 'A$behavior$1'() { accept (start: Start);

-WriteLine(&quot;Starting A&quot;);

-b = start.b;

-while (true) { accept (Ping);

-WriteLine(&quot;Ping!&quot;);

-b.Pong();

-} }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjloKGEeSFEt9m3bH63A" name="A$initialization$1" visibility="protected" method="_8oAjlYKGEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjm4KGEeSFEt9m3bH63A" name="A" method="_8oAjl4KGEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjnIKGEeSFEt9m3bH63A" type="_8oAjcYKGEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjnYKGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjnoKGEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjoIKGEeSFEt9m3bH63A" name="destroy" method="_8oAjn4KGEeSFEt9m3bH63A"/>

-        <nestedClassifier xmi:type="uml:Signal" xmi:id="_8oAjcoKGEeSFEt9m3bH63A" name="Start" visibility="package">

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjc4KGEeSFEt9m3bH63A" name="b" visibility="public" type="_8oAjdoKGEeSFEt9m3bH63A">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjdIKGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjdYKGEeSFEt9m3bH63A" value="1"/>

-          </ownedAttribute>

-        </nestedClassifier>

-        <nestedClassifier xmi:type="uml:Signal" xmi:id="_8oAjkYKGEeSFEt9m3bH63A" name="Ping" visibility="package"/>

-        <ownedReception xmi:type="uml:Reception" xmi:id="_8oAjoYKGEeSFEt9m3bH63A" name="Start" visibility="package" signal="_8oAjcoKGEeSFEt9m3bH63A"/>

-        <ownedReception xmi:type="uml:Reception" xmi:id="_8oAjooKGEeSFEt9m3bH63A" name="Ping" visibility="package" signal="_8oAjkYKGEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_8oAjdoKGEeSFEt9m3bH63A" name="B" visibility="package" classifierBehavior="_8oAjkIKGEeSFEt9m3bH63A" isActive="true">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjf4KGEeSFEt9m3bH63A" name="B$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjgIKGEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjgYKGEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjgoKGEeSFEt9m3bH63A" name="B$initialization$1" visibility="protected" specification="_8oAjg4KGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjtYKGEeSFEt9m3bH63A" annotatedElement="_8oAjgoKGEeSFEt9m3bH63A">

-            <body>activity 'B$initialization$1'(){

-  if (this.'B$initializationFlag$1' == null) {

-    this.'B$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjhIKGEeSFEt9m3bH63A" name="B$method$1" specification="_8oAjiIKGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjtoKGEeSFEt9m3bH63A" annotatedElement="_8oAjhIKGEeSFEt9m3bH63A">

-            <body>activity 'B$method$1'(): B {

-	this.'B$initialization$1'();

-	return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjhYKGEeSFEt9m3bH63A" type="_8oAjdoKGEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjhoKGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjh4KGEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjjIKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_8oAjjYKGEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjvIKGEeSFEt9m3bH63A" annotatedElement="_8oAjjIKGEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjkIKGEeSFEt9m3bH63A" name="B$behavior$1" visibility="private">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjtIKGEeSFEt9m3bH63A" annotatedElement="_8oAjkIKGEeSFEt9m3bH63A">

-            <body>activity 'B$behavior$1'() { accept (start: Start);

-WriteLine(&quot;Starting B&quot;);

-a = start.a;

-for (i in 1..start.n) { WriteLine(&quot;i = &quot; + IntegerFunctions::ToString(i));

-a.Ping();

-accept (Pong);

-WriteLine(&quot;Pong!&quot;);

-} }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjg4KGEeSFEt9m3bH63A" name="B$initialization$1" visibility="protected" method="_8oAjgoKGEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjiIKGEeSFEt9m3bH63A" name="B" method="_8oAjhIKGEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjiYKGEeSFEt9m3bH63A" type="_8oAjdoKGEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjioKGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAji4KGEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjjYKGEeSFEt9m3bH63A" name="destroy" method="_8oAjjIKGEeSFEt9m3bH63A"/>

-        <nestedClassifier xmi:type="uml:Signal" xmi:id="_8oAjd4KGEeSFEt9m3bH63A" name="Start" visibility="package">

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjeIKGEeSFEt9m3bH63A" name="a" visibility="public" type="_8oAjcYKGEeSFEt9m3bH63A">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjeYKGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjeoKGEeSFEt9m3bH63A" value="1"/>

-          </ownedAttribute>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAje4KGEeSFEt9m3bH63A" name="n" visibility="public">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjfIKGEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjfYKGEeSFEt9m3bH63A" value="1"/>

-          </ownedAttribute>

-        </nestedClassifier>

-        <nestedClassifier xmi:type="uml:Signal" xmi:id="_8oAjfoKGEeSFEt9m3bH63A" name="Pong" visibility="package"/>

-        <ownedReception xmi:type="uml:Reception" xmi:id="_8oAjjoKGEeSFEt9m3bH63A" name="Start" visibility="package" signal="_8oAjd4KGEeSFEt9m3bH63A"/>

-        <ownedReception xmi:type="uml:Reception" xmi:id="_8oAjj4KGEeSFEt9m3bH63A" name="Pong" visibility="package" signal="_8oAjfoKGEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_8XXfYYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8XXfYoKGEeSFEt9m3bH63A" 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="_FGSASbeNEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjwIKGEeSFEt9m3bH63A" base_Comment="_8oAjv4KGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_8oAjwYKGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjm4KGEeSFEt9m3bH63A"/>

-  <standard:Create xmi:id="_8oAjwoKGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjrYKGEeSFEt9m3bH63A"/>

-  <standard:Destroy xmi:id="_8oAjw4KGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjjYKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjxIKGEeSFEt9m3bH63A" base_Comment="_8oAju4KGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjxYKGEeSFEt9m3bH63A" base_Comment="_8oAjuIKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjxoKGEeSFEt9m3bH63A" base_Comment="_8oAjtoKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjx4KGEeSFEt9m3bH63A" base_Comment="_8oAjuYKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_8oAjyIKGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjiIKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjyYKGEeSFEt9m3bH63A" base_Comment="_8oAjtIKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjyoKGEeSFEt9m3bH63A" base_Comment="_8oAjt4KGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_8oAjy4KGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjoIKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjzIKGEeSFEt9m3bH63A" base_Comment="_8oAjvIKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjzYKGEeSFEt9m3bH63A" base_Comment="_8oAjvoKGEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_8oAjzoKGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjsoKGEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAjz4KGEeSFEt9m3bH63A" base_Comment="_8oAjvYKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAj0IKGEeSFEt9m3bH63A" base_Comment="_8oAjtYKGEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8oAj0YKGEeSFEt9m3bH63A" base_Comment="_8oAjuoKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_8XXfYIKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_8oAjcIKGEeSFEt9m3bH63A" name="Interactive_PingPong" classifierBehavior="_8oAjs4KGEeSFEt9m3bH63A" isActive="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjpIKGEeSFEt9m3bH63A" name="Interactive_PingPong$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjpYKGEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjpoKGEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjp4KGEeSFEt9m3bH63A" name="Interactive_PingPong$initialization$1" visibility="protected" specification="_8oAjqIKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjv4KGEeSFEt9m3bH63A" annotatedElement="_8oAjp4KGEeSFEt9m3bH63A">
+          <body>activity 'Interactive_PingPong$initialization$1'(){
+  if (this.'Interactive_PingPong$initializationFlag$1' == null) {
+    this.'Interactive_PingPong$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjqYKGEeSFEt9m3bH63A" name="Interactive_PingPong$method$1" specification="_8oAjrYKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8oAju4KGEeSFEt9m3bH63A" annotatedElement="_8oAjqYKGEeSFEt9m3bH63A">
+          <body>activity 'Interactive_PingPong$method$1'(): Interactive_PingPong {
+	this.'Interactive_PingPong$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjqoKGEeSFEt9m3bH63A" type="_8oAjcIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjq4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjrIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjsYKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_8oAjsoKGEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjuYKGEeSFEt9m3bH63A" annotatedElement="_8oAjsYKGEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjs4KGEeSFEt9m3bH63A" name="Interactive_PingPong$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjuoKGEeSFEt9m3bH63A" annotatedElement="_8oAjs4KGEeSFEt9m3bH63A">
+          <body>activity 'Interactive_PingPong$behavior$1'() { a = new A();
+b = new B();
+Write(&quot;Enter n: &quot;);
+n = IntegerFunctions::ToInteger(ReadLine(error));
+if (n->notEmpty()) { a.Start(b);
+b.Start(a, n);
+} }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjqIKGEeSFEt9m3bH63A" name="Interactive_PingPong$initialization$1" visibility="protected" method="_8oAjp4KGEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjrYKGEeSFEt9m3bH63A" name="Interactive_PingPong" method="_8oAjqYKGEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjroKGEeSFEt9m3bH63A" type="_8oAjcIKGEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjr4KGEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjsIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjsoKGEeSFEt9m3bH63A" name="destroy" method="_8oAjsYKGEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_8oAjcYKGEeSFEt9m3bH63A" name="A" visibility="package" classifierBehavior="_8oAjo4KGEeSFEt9m3bH63A" isActive="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjkoKGEeSFEt9m3bH63A" name="A$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjk4KGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjlIKGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjlYKGEeSFEt9m3bH63A" name="A$initialization$1" visibility="protected" specification="_8oAjloKGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjt4KGEeSFEt9m3bH63A" annotatedElement="_8oAjlYKGEeSFEt9m3bH63A">
+            <body>activity 'A$initialization$1'(){
+  if (this.'A$initializationFlag$1' == null) {
+    this.'A$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjl4KGEeSFEt9m3bH63A" name="A$method$1" specification="_8oAjm4KGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjvYKGEeSFEt9m3bH63A" annotatedElement="_8oAjl4KGEeSFEt9m3bH63A">
+            <body>activity 'A$method$1'(): A {
+	this.'A$initialization$1'();
+	return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjmIKGEeSFEt9m3bH63A" type="_8oAjcYKGEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjmYKGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjmoKGEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjn4KGEeSFEt9m3bH63A" name="destroy$method$1" specification="_8oAjoIKGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjvoKGEeSFEt9m3bH63A" annotatedElement="_8oAjn4KGEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjo4KGEeSFEt9m3bH63A" name="A$behavior$1" visibility="private">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjuIKGEeSFEt9m3bH63A" annotatedElement="_8oAjo4KGEeSFEt9m3bH63A">
+            <body>activity 'A$behavior$1'() { accept (start: Start);
+WriteLine(&quot;Starting A&quot;);
+b = start.b;
+while (true) { accept (Ping);
+WriteLine(&quot;Ping!&quot;);
+b.Pong();
+} }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjloKGEeSFEt9m3bH63A" name="A$initialization$1" visibility="protected" method="_8oAjlYKGEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjm4KGEeSFEt9m3bH63A" name="A" method="_8oAjl4KGEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjnIKGEeSFEt9m3bH63A" type="_8oAjcYKGEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjnYKGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjnoKGEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjoIKGEeSFEt9m3bH63A" name="destroy" method="_8oAjn4KGEeSFEt9m3bH63A"/>
+        <nestedClassifier xmi:type="uml:Signal" xmi:id="_8oAjcoKGEeSFEt9m3bH63A" name="Start" visibility="package">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjc4KGEeSFEt9m3bH63A" name="b" visibility="public" type="_8oAjdoKGEeSFEt9m3bH63A">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjdIKGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjdYKGEeSFEt9m3bH63A" value="1"/>
+          </ownedAttribute>
+        </nestedClassifier>
+        <nestedClassifier xmi:type="uml:Signal" xmi:id="_8oAjkYKGEeSFEt9m3bH63A" name="Ping" visibility="package"/>
+        <ownedReception xmi:type="uml:Reception" xmi:id="_8oAjoYKGEeSFEt9m3bH63A" name="Start" visibility="package" signal="_8oAjcoKGEeSFEt9m3bH63A"/>
+        <ownedReception xmi:type="uml:Reception" xmi:id="_8oAjooKGEeSFEt9m3bH63A" name="Ping" visibility="package" signal="_8oAjkYKGEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_8oAjdoKGEeSFEt9m3bH63A" name="B" visibility="package" classifierBehavior="_8oAjkIKGEeSFEt9m3bH63A" isActive="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjf4KGEeSFEt9m3bH63A" name="B$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjgIKGEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjgYKGEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjgoKGEeSFEt9m3bH63A" name="B$initialization$1" visibility="protected" specification="_8oAjg4KGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjtYKGEeSFEt9m3bH63A" annotatedElement="_8oAjgoKGEeSFEt9m3bH63A">
+            <body>activity 'B$initialization$1'(){
+  if (this.'B$initializationFlag$1' == null) {
+    this.'B$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjhIKGEeSFEt9m3bH63A" name="B$method$1" specification="_8oAjiIKGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjtoKGEeSFEt9m3bH63A" annotatedElement="_8oAjhIKGEeSFEt9m3bH63A">
+            <body>activity 'B$method$1'(): B {
+	this.'B$initialization$1'();
+	return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjhYKGEeSFEt9m3bH63A" type="_8oAjdoKGEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjhoKGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjh4KGEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjjIKGEeSFEt9m3bH63A" name="destroy$method$1" specification="_8oAjjYKGEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjvIKGEeSFEt9m3bH63A" annotatedElement="_8oAjjIKGEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_8oAjkIKGEeSFEt9m3bH63A" name="B$behavior$1" visibility="private">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_8oAjtIKGEeSFEt9m3bH63A" annotatedElement="_8oAjkIKGEeSFEt9m3bH63A">
+            <body>activity 'B$behavior$1'() { accept (start: Start);
+WriteLine(&quot;Starting B&quot;);
+a = start.a;
+for (i in 1..start.n) { WriteLine(&quot;i = &quot; + IntegerFunctions::ToString(i));
+a.Ping();
+accept (Pong);
+WriteLine(&quot;Pong!&quot;);
+} }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjg4KGEeSFEt9m3bH63A" name="B$initialization$1" visibility="protected" method="_8oAjgoKGEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjiIKGEeSFEt9m3bH63A" name="B" method="_8oAjhIKGEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_8oAjiYKGEeSFEt9m3bH63A" type="_8oAjdoKGEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjioKGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAji4KGEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_8oAjjYKGEeSFEt9m3bH63A" name="destroy" method="_8oAjjIKGEeSFEt9m3bH63A"/>
+        <nestedClassifier xmi:type="uml:Signal" xmi:id="_8oAjd4KGEeSFEt9m3bH63A" name="Start" visibility="package">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAjeIKGEeSFEt9m3bH63A" name="a" visibility="public" type="_8oAjcYKGEeSFEt9m3bH63A">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjeYKGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjeoKGEeSFEt9m3bH63A" value="1"/>
+          </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8oAje4KGEeSFEt9m3bH63A" name="n" visibility="public">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8oAjfIKGEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8oAjfYKGEeSFEt9m3bH63A" value="1"/>
+          </ownedAttribute>
+        </nestedClassifier>
+        <nestedClassifier xmi:type="uml:Signal" xmi:id="_8oAjfoKGEeSFEt9m3bH63A" name="Pong" visibility="package"/>
+        <ownedReception xmi:type="uml:Reception" xmi:id="_8oAjjoKGEeSFEt9m3bH63A" name="Start" visibility="package" signal="_8oAjd4KGEeSFEt9m3bH63A"/>
+        <ownedReception xmi:type="uml:Reception" xmi:id="_8oAjj4KGEeSFEt9m3bH63A" name="Pong" visibility="package" signal="_8oAjfoKGEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_8XXfYYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8XXfYoKGEeSFEt9m3bH63A" 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="_FGSASbeNEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FGSnULeNEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjwIKGEeSFEt9m3bH63A" base_Comment="_8oAjv4KGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_8oAjwYKGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjm4KGEeSFEt9m3bH63A"/>
+  <standard:Create xmi:id="_8oAjwoKGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjrYKGEeSFEt9m3bH63A"/>
+  <standard:Destroy xmi:id="_8oAjw4KGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjjYKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjxIKGEeSFEt9m3bH63A" base_Comment="_8oAju4KGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjxYKGEeSFEt9m3bH63A" base_Comment="_8oAjuIKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjxoKGEeSFEt9m3bH63A" base_Comment="_8oAjtoKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjx4KGEeSFEt9m3bH63A" base_Comment="_8oAjuYKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_8oAjyIKGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjiIKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjyYKGEeSFEt9m3bH63A" base_Comment="_8oAjtIKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjyoKGEeSFEt9m3bH63A" base_Comment="_8oAjt4KGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_8oAjy4KGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjoIKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjzIKGEeSFEt9m3bH63A" base_Comment="_8oAjvIKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjzYKGEeSFEt9m3bH63A" base_Comment="_8oAjvoKGEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_8oAjzoKGEeSFEt9m3bH63A" base_BehavioralFeature="_8oAjsoKGEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAjz4KGEeSFEt9m3bH63A" base_Comment="_8oAjvYKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAj0IKGEeSFEt9m3bH63A" base_Comment="_8oAjtYKGEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_8oAj0YKGEeSFEt9m3bH63A" base_Comment="_8oAjuoKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_Read.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_Read.uml
index 040ffd05ce9..5ab611d1773 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_Read.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Interactive_Read.uml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_8oN-0IKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Activity" xmi:id="_8uNSEIKGEeSFEt9m3bH63A" name="Interactive_Read" visibility="protected">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_8uNSEYKGEeSFEt9m3bH63A" annotatedElement="_8uNSEIKGEeSFEt9m3bH63A">

-        <body>activity Interactive_Read() { WriteLine(&quot;Read Line:&quot;);

-WriteLine(ReadLine(status));

-WriteLine(&quot;Status:&quot;);

-WriteLine(status.description);

-WriteLine(StandardInputChannel.allInstances ().getStatus().description);

-WriteLine(&quot;read Integer, Boolean, UnlimitedNatural:&quot;);

-WriteLine(IntegerFunctions::ToString(StandardInputChannel.allInstances

-().readInteger(status)));

-WriteLine(status.description);

-WriteLine(BooleanFunctions::ToString(StandardInputChannel.allInstances

-().readBoolean(status)));

-WriteLine(status.description);

-WriteLine(UnlimitedNaturalFunctions::ToString(StandardInputChannel.allInstances

-().readUnlimitedNatural(status)));

-WriteLine(status.description);

-}</body>

-      </ownedComment>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_8oN-0YKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8oN-0oKGEeSFEt9m3bH63A" 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="_KB93ILeNEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_8uNSEoKGEeSFEt9m3bH63A" base_Comment="_8uNSEYKGEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_8oN-0IKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Activity" xmi:id="_8uNSEIKGEeSFEt9m3bH63A" name="Interactive_Read" visibility="protected">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_8uNSEYKGEeSFEt9m3bH63A" annotatedElement="_8uNSEIKGEeSFEt9m3bH63A">
+        <body>activity Interactive_Read() { WriteLine(&quot;Read Line:&quot;);
+WriteLine(ReadLine(status));
+WriteLine(&quot;Status:&quot;);
+WriteLine(status.description);
+WriteLine(StandardInputChannel.allInstances ().getStatus().description);
+WriteLine(&quot;read Integer, Boolean, UnlimitedNatural:&quot;);
+WriteLine(IntegerFunctions::ToString(StandardInputChannel.allInstances
+().readInteger(status)));
+WriteLine(status.description);
+WriteLine(BooleanFunctions::ToString(StandardInputChannel.allInstances
+().readBoolean(status)));
+WriteLine(status.description);
+WriteLine(UnlimitedNaturalFunctions::ToString(StandardInputChannel.allInstances
+().readUnlimitedNatural(status)));
+WriteLine(status.description);
+}</body>
+      </ownedComment>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_8oN-0YKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8oN-0oKGEeSFEt9m3bH63A" 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="_KB93ILeNEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KB93IbeNEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_8uNSEoKGEeSFEt9m3bH63A" base_Comment="_8uNSEYKGEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_Return.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_Return.uml
index b5fdb1e33db..75e91c9e9b7 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_Return.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_Return.uml
@@ -1,237 +1,237 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="__ZDuwIKGEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_ABoKoIKHEeSFEt9m3bH63A" name="Statements_Return" classifierBehavior="_ABoK8oKHEeSFEt9m3bH63A" isActive="true">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK84KHEeSFEt9m3bH63A" annotatedElement="_ABoKoIKHEeSFEt9m3bH63A">

-        <body>&#xD;

- * Test return statements.&#xD;

- *</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ABoK44KHEeSFEt9m3bH63A" name="Statements_Return$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK5IKHEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK5YKHEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoKzYKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_ABoKt4KHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK-4KHEeSFEt9m3bH63A" annotatedElement="_ABoKzYKHEeSFEt9m3bH63A">

-          <body>activity 'test$method$1'(out a: Integer, out b: Integer, out c: String, out x: Integer, out y: Integer, out z: Integer, out n: Integer) { a = test1();

-b = test2();

-c = test3();

-x = 0;

-z = test4(x, y);

-n = 1;

-return;

-n = 2;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKzoKHEeSFEt9m3bH63A" name="a" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKz4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK0IKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK0YKHEeSFEt9m3bH63A" name="b" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK0oKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK04KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK1IKHEeSFEt9m3bH63A" name="c" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK1YKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK1oKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK14KHEeSFEt9m3bH63A" name="x" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK2IKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK2YKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK2oKHEeSFEt9m3bH63A" name="y" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK24KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK3IKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK3YKHEeSFEt9m3bH63A" name="z" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK3oKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK34KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK4IKHEeSFEt9m3bH63A" name="n" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK4YKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK4oKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoK5oKHEeSFEt9m3bH63A" name="Statements_Return$initialization$1" visibility="protected" specification="_ABoK54KHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK-oKHEeSFEt9m3bH63A" annotatedElement="_ABoK5oKHEeSFEt9m3bH63A">

-          <body>activity 'Statements_Return$initialization$1'(){

-  if (this.'Statements_Return$initializationFlag$1' == null) {

-    this.'Statements_Return$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoK6IKHEeSFEt9m3bH63A" name="Statements_Return$method$1" specification="_ABoK7IKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK94KHEeSFEt9m3bH63A" annotatedElement="_ABoK6IKHEeSFEt9m3bH63A">

-          <body>activity 'Statements_Return$method$1'(): Statements_Return {

-	this.'Statements_Return$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK6YKHEeSFEt9m3bH63A" type="_ABoKoIKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK6oKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK64KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoK8IKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_ABoK8YKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK9oKHEeSFEt9m3bH63A" annotatedElement="_ABoK8IKHEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoK8oKHEeSFEt9m3bH63A" name="Statements_Return$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK-YKHEeSFEt9m3bH63A" annotatedElement="_ABoK8oKHEeSFEt9m3bH63A">

-          <body>activity 'Statements_Return$behavior$1'() { this.test(a, b, c, x, y, z, n);

-AssertEqual(&quot;a&quot;, a, 4);

-AssertEqual(&quot;b&quot;, b, 2);

-AssertEqual(&quot;c&quot;, c, &quot;xx&quot;);

-AssertEqual(&quot;x&quot;, x, 1);

-AssertEqual(&quot;y&quot;, y, 2);

-AssertEqual(&quot;z&quot;, z, 3);

-AssertEqual(&quot;n&quot;, n, 1);

-WriteLine(&quot;Done&quot;);

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_ABoKt4KHEeSFEt9m3bH63A" name="test" visibility="public" method="_ABoKzYKHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKuIKHEeSFEt9m3bH63A" name="a" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKuYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKuoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKu4KHEeSFEt9m3bH63A" name="b" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKvIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKvYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKvoKHEeSFEt9m3bH63A" name="c" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKv4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKwIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKwYKHEeSFEt9m3bH63A" name="x" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKwoKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKw4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKxIKHEeSFEt9m3bH63A" name="y" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKxYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKxoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKx4KHEeSFEt9m3bH63A" name="z" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKyIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKyYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKyoKHEeSFEt9m3bH63A" name="n" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKy4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKzIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_ABoK54KHEeSFEt9m3bH63A" name="Statements_Return$initialization$1" visibility="protected" method="_ABoK5oKHEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_ABoK7IKHEeSFEt9m3bH63A" name="Statements_Return" method="_ABoK6IKHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK7YKHEeSFEt9m3bH63A" type="_ABoKoIKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK7oKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK74KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_ABoK8YKHEeSFEt9m3bH63A" name="destroy" method="_ABoK8IKHEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:Activity" xmi:id="_ABoKoYKHEeSFEt9m3bH63A" name="test1">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK_IKHEeSFEt9m3bH63A" annotatedElement="_ABoKoYKHEeSFEt9m3bH63A">

-          <body>activity test1(): Integer { item = 4;

-return item;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKooKHEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKo4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKpIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Activity" xmi:id="_ABoKpYKHEeSFEt9m3bH63A" name="test2">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK-IKHEeSFEt9m3bH63A" annotatedElement="_ABoKpYKHEeSFEt9m3bH63A">

-          <body>activity test2(): Integer { index = 2;

-list = new Integer [] { 1, 2, 3 };

-return list[index];

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKpoKHEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKp4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKqIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Activity" xmi:id="_ABoKqYKHEeSFEt9m3bH63A" name="test3">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK9YKHEeSFEt9m3bH63A" annotatedElement="_ABoKqYKHEeSFEt9m3bH63A">

-          <body>activity test3(): String { s = &quot;x&quot;;

-return s + s;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKqoKHEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKq4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKrIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Activity" xmi:id="_ABoKrYKHEeSFEt9m3bH63A" name="test4">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK9IKHEeSFEt9m3bH63A" annotatedElement="_ABoKrYKHEeSFEt9m3bH63A">

-          <body>activity test4(inout x: Integer, out y: Integer): Integer { y = 2;

-if (x == 0) { x = x + 1;

-return 3;

-} }</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKroKHEeSFEt9m3bH63A" name="x" direction="inout">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKr4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKsIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKsYKHEeSFEt9m3bH63A" name="y" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKsoKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKs4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKtIKHEeSFEt9m3bH63A" direction="return">

-          <name xsi:nil="true"/>

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKtYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKtoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </nestedClassifier>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__ZDuwYKGEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__ZDuwoKGEeSFEt9m3bH63A" 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="_2I5lhLeNEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_ABoK_YKHEeSFEt9m3bH63A" base_Comment="_ABoK9oKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_ABoK_oKHEeSFEt9m3bH63A" base_Comment="_ABoK-oKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_ABoK_4KHEeSFEt9m3bH63A" base_Comment="_ABoK-4KHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_ABoLAIKHEeSFEt9m3bH63A" base_BehavioralFeature="_ABoK7IKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_ABoLAYKHEeSFEt9m3bH63A" base_Comment="_ABoK9IKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_ABoLAoKHEeSFEt9m3bH63A" base_BehavioralFeature="_ABoK8YKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_ABoLA4KHEeSFEt9m3bH63A" base_Comment="_ABoK-YKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_ABoLBIKHEeSFEt9m3bH63A" base_Comment="_ABoK9YKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_ABoLBYKHEeSFEt9m3bH63A" base_Comment="_ABoK94KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_ABoLBoKHEeSFEt9m3bH63A" base_Comment="_ABoK_IKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_ABoLB4KHEeSFEt9m3bH63A" base_Comment="_ABoK-IKHEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="__ZDuwIKGEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_ABoKoIKHEeSFEt9m3bH63A" name="Statements_Return" classifierBehavior="_ABoK8oKHEeSFEt9m3bH63A" isActive="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK84KHEeSFEt9m3bH63A" annotatedElement="_ABoKoIKHEeSFEt9m3bH63A">
+        <body>&#xD;
+ * Test return statements.&#xD;
+ *</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_ABoK44KHEeSFEt9m3bH63A" name="Statements_Return$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK5IKHEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK5YKHEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoKzYKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_ABoKt4KHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK-4KHEeSFEt9m3bH63A" annotatedElement="_ABoKzYKHEeSFEt9m3bH63A">
+          <body>activity 'test$method$1'(out a: Integer, out b: Integer, out c: String, out x: Integer, out y: Integer, out z: Integer, out n: Integer) { a = test1();
+b = test2();
+c = test3();
+x = 0;
+z = test4(x, y);
+n = 1;
+return;
+n = 2;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKzoKHEeSFEt9m3bH63A" name="a" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKz4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK0IKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK0YKHEeSFEt9m3bH63A" name="b" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK0oKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK04KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK1IKHEeSFEt9m3bH63A" name="c" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK1YKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK1oKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK14KHEeSFEt9m3bH63A" name="x" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK2IKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK2YKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK2oKHEeSFEt9m3bH63A" name="y" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK24KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK3IKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK3YKHEeSFEt9m3bH63A" name="z" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK3oKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK34KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK4IKHEeSFEt9m3bH63A" name="n" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK4YKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK4oKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoK5oKHEeSFEt9m3bH63A" name="Statements_Return$initialization$1" visibility="protected" specification="_ABoK54KHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK-oKHEeSFEt9m3bH63A" annotatedElement="_ABoK5oKHEeSFEt9m3bH63A">
+          <body>activity 'Statements_Return$initialization$1'(){
+  if (this.'Statements_Return$initializationFlag$1' == null) {
+    this.'Statements_Return$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoK6IKHEeSFEt9m3bH63A" name="Statements_Return$method$1" specification="_ABoK7IKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK94KHEeSFEt9m3bH63A" annotatedElement="_ABoK6IKHEeSFEt9m3bH63A">
+          <body>activity 'Statements_Return$method$1'(): Statements_Return {
+	this.'Statements_Return$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK6YKHEeSFEt9m3bH63A" type="_ABoKoIKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK6oKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK64KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoK8IKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_ABoK8YKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK9oKHEeSFEt9m3bH63A" annotatedElement="_ABoK8IKHEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_ABoK8oKHEeSFEt9m3bH63A" name="Statements_Return$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK-YKHEeSFEt9m3bH63A" annotatedElement="_ABoK8oKHEeSFEt9m3bH63A">
+          <body>activity 'Statements_Return$behavior$1'() { this.test(a, b, c, x, y, z, n);
+AssertEqual(&quot;a&quot;, a, 4);
+AssertEqual(&quot;b&quot;, b, 2);
+AssertEqual(&quot;c&quot;, c, &quot;xx&quot;);
+AssertEqual(&quot;x&quot;, x, 1);
+AssertEqual(&quot;y&quot;, y, 2);
+AssertEqual(&quot;z&quot;, z, 3);
+AssertEqual(&quot;n&quot;, n, 1);
+WriteLine(&quot;Done&quot;);
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_ABoKt4KHEeSFEt9m3bH63A" name="test" visibility="public" method="_ABoKzYKHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKuIKHEeSFEt9m3bH63A" name="a" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKuYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKuoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKu4KHEeSFEt9m3bH63A" name="b" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKvIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKvYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKvoKHEeSFEt9m3bH63A" name="c" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKv4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKwIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKwYKHEeSFEt9m3bH63A" name="x" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKwoKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKw4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKxIKHEeSFEt9m3bH63A" name="y" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKxYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKxoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKx4KHEeSFEt9m3bH63A" name="z" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKyIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKyYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKyoKHEeSFEt9m3bH63A" name="n" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKy4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKzIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_ABoK54KHEeSFEt9m3bH63A" name="Statements_Return$initialization$1" visibility="protected" method="_ABoK5oKHEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_ABoK7IKHEeSFEt9m3bH63A" name="Statements_Return" method="_ABoK6IKHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoK7YKHEeSFEt9m3bH63A" type="_ABoKoIKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoK7oKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoK74KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_ABoK8YKHEeSFEt9m3bH63A" name="destroy" method="_ABoK8IKHEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:Activity" xmi:id="_ABoKoYKHEeSFEt9m3bH63A" name="test1">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK_IKHEeSFEt9m3bH63A" annotatedElement="_ABoKoYKHEeSFEt9m3bH63A">
+          <body>activity test1(): Integer { item = 4;
+return item;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKooKHEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKo4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKpIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Activity" xmi:id="_ABoKpYKHEeSFEt9m3bH63A" name="test2">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK-IKHEeSFEt9m3bH63A" annotatedElement="_ABoKpYKHEeSFEt9m3bH63A">
+          <body>activity test2(): Integer { index = 2;
+list = new Integer [] { 1, 2, 3 };
+return list[index];
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKpoKHEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKp4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKqIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Activity" xmi:id="_ABoKqYKHEeSFEt9m3bH63A" name="test3">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK9YKHEeSFEt9m3bH63A" annotatedElement="_ABoKqYKHEeSFEt9m3bH63A">
+          <body>activity test3(): String { s = &quot;x&quot;;
+return s + s;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKqoKHEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKq4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKrIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Activity" xmi:id="_ABoKrYKHEeSFEt9m3bH63A" name="test4">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ABoK9IKHEeSFEt9m3bH63A" annotatedElement="_ABoKrYKHEeSFEt9m3bH63A">
+          <body>activity test4(inout x: Integer, out y: Integer): Integer { y = 2;
+if (x == 0) { x = x + 1;
+return 3;
+} }</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKroKHEeSFEt9m3bH63A" name="x" direction="inout">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKr4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKsIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKsYKHEeSFEt9m3bH63A" name="y" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKsoKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKs4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ABoKtIKHEeSFEt9m3bH63A" direction="return">
+          <name xsi:nil="true"/>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ABoKtYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ABoKtoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </nestedClassifier>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__ZDuwYKGEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__ZDuwoKGEeSFEt9m3bH63A" 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="_2I5lhLeNEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2I6MkLeNEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_ABoK_YKHEeSFEt9m3bH63A" base_Comment="_ABoK9oKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_ABoK_oKHEeSFEt9m3bH63A" base_Comment="_ABoK-oKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_ABoK_4KHEeSFEt9m3bH63A" base_Comment="_ABoK-4KHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_ABoLAIKHEeSFEt9m3bH63A" base_BehavioralFeature="_ABoK7IKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_ABoLAYKHEeSFEt9m3bH63A" base_Comment="_ABoK9IKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_ABoLAoKHEeSFEt9m3bH63A" base_BehavioralFeature="_ABoK8YKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_ABoLA4KHEeSFEt9m3bH63A" base_Comment="_ABoK-YKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_ABoLBIKHEeSFEt9m3bH63A" base_Comment="_ABoK9YKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_ABoLBYKHEeSFEt9m3bH63A" base_Comment="_ABoK94KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_ABoLBoKHEeSFEt9m3bH63A" base_Comment="_ABoK_IKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_ABoLB4KHEeSFEt9m3bH63A" base_Comment="_ABoK-IKHEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_Simple.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_Simple.uml
index 707ca2e4499..e938e770d2c 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_Simple.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_Simple.uml
@@ -1,464 +1,464 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_ACnpIIKHEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_A-bKEIKHEeSFEt9m3bH63A" name="Statements_Simple" classifierBehavior="_A-bx1IKHEeSFEt9m3bH63A" isActive="true">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx1YKHEeSFEt9m3bH63A" annotatedElement="_A-bKEIKHEeSFEt9m3bH63A">

-        <body> &#xD;

- * Test block, empty and local name declaration statements.&#xD;

- *</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bKEYKHEeSFEt9m3bH63A" name="offers" visibility="package" type="_A-bxIoKHEeSFEt9m3bH63A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxIIKHEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxIYKHEeSFEt9m3bH63A" value="*"/>

-        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_A-bxMoKHEeSFEt9m3bH63A" behavior="_A-bxM4KHEeSFEt9m3bH63A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxN4KHEeSFEt9m3bH63A" name="principal" visibility="package">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxOIKHEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxOYKHEeSFEt9m3bH63A" value="1"/>

-        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_A-bxOoKHEeSFEt9m3bH63A" behavior="_A-bxO4KHEeSFEt9m3bH63A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxP4KHEeSFEt9m3bH63A" name="rate" visibility="package">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxQIKHEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxQYKHEeSFEt9m3bH63A" value="1"/>

-        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_A-bxQoKHEeSFEt9m3bH63A" behavior="_A-bxQ4KHEeSFEt9m3bH63A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxxYKHEeSFEt9m3bH63A" name="Statements_Simple$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxxoKHEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxx4KHEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxqYKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_A-bxjYKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx2YKHEeSFEt9m3bH63A" annotatedElement="_A-bxqYKHEeSFEt9m3bH63A">

-          <body>activity 'test$method$1'(out i: Integer, out last: Integer, out collection: Integer[0..*] sequence, out offer: Offer, out money: Money, out members: Member[0..*] sequence, out properties: RealProperty[0..*] sequence, out assets: RealProperty[0..*] sequence, out point: Point) { e1 = 1;

-e2 = 2;

-period = 10;

-members = new Member [] { new Member(false, &quot;A&quot;), new Member(true, &quot;B&quot;), new

-Member(false, &quot;C&quot;) };

-land = new RealProperty(&quot;land&quot;);

-home = new RealProperty(&quot;home&quot;);

-condominium = new RealProperty(&quot;condominium&quot;);

-things = any [] { land, home, condominium, &quot;something&quot; }; // *****&#xD;

-//@parallel &#xD;

-{ i = e1;

-last = e2;

-collection = new Integer [] { i, last };

-};

-let currentOffer: Offer = this.offers[1];

-let interest: Money = new(this.principal * this.rate * period / 100);

-let inactiveMembers: Member [] = members->select member (! member.isActive);

-let realProperties: RealProperty [] = (RealProperty) things;

-let fixedAssets: RealProperty [] = { land, home, condominium };

-let origin: Point = new(0, 0);

-offer = currentOffer;

-money = interest;

-members = inactiveMembers;

-properties = realProperties;

-assets = fixedAssets;

-point = origin;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxqoKHEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxq4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxrIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxrYKHEeSFEt9m3bH63A" name="last" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxroKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxr4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxsIKHEeSFEt9m3bH63A" name="collection" isOrdered="true" isUnique="false" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxsYKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxsoKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxs4KHEeSFEt9m3bH63A" name="offer" type="_A-bxIoKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxtIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxtYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxtoKHEeSFEt9m3bH63A" name="money" type="_A-bxiYKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxt4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxuIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxuYKHEeSFEt9m3bH63A" name="members" type="_A-bxR4KHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxuoKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxu4KHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxvIKHEeSFEt9m3bH63A" name="properties" type="_A-bxaYKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxvYKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxvoKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxv4KHEeSFEt9m3bH63A" name="assets" type="_A-bxaYKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxwIKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxwYKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxwoKHEeSFEt9m3bH63A" name="point" type="_A-bxgoKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxw4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxxIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxM4KHEeSFEt9m3bH63A" name="offers$defaultValue$1">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx4oKHEeSFEt9m3bH63A" annotatedElement="_A-bxM4KHEeSFEt9m3bH63A">

-          <body>activity 'offers$defaultValue$1'(): Offer[0..*] {

-	return  new Offer();

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxNIKHEeSFEt9m3bH63A" type="_A-bxIoKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxNYKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxNoKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxO4KHEeSFEt9m3bH63A" name="principal$defaultValue$1">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx5IKHEeSFEt9m3bH63A" annotatedElement="_A-bxO4KHEeSFEt9m3bH63A">

-          <body>activity 'principal$defaultValue$1'(): Integer {

-	return  100;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxPIKHEeSFEt9m3bH63A" direction="return">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxPYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxPoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxQ4KHEeSFEt9m3bH63A" name="rate$defaultValue$1">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx14KHEeSFEt9m3bH63A" annotatedElement="_A-bxQ4KHEeSFEt9m3bH63A">

-          <body>activity 'rate$defaultValue$1'(): Integer {

-	return  5;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxRIKHEeSFEt9m3bH63A" direction="return">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxRYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxRoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxyIKHEeSFEt9m3bH63A" name="Statements_Simple$initialization$1" visibility="protected" specification="_A-bxyYKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx2IKHEeSFEt9m3bH63A" annotatedElement="_A-bxyIKHEeSFEt9m3bH63A">

-          <body>activity 'Statements_Simple$initialization$1'(){

-  if (this.'Statements_Simple$initializationFlag$1' == null) {

-    this.offers = 'offers$defaultValue$1'();

-    this.principal = 'principal$defaultValue$1'();

-    this.rate = 'rate$defaultValue$1'();

-    this.'Statements_Simple$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxyoKHEeSFEt9m3bH63A" name="Statements_Simple$method$1" specification="_A-bxzoKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx5oKHEeSFEt9m3bH63A" annotatedElement="_A-bxyoKHEeSFEt9m3bH63A">

-          <body>activity 'Statements_Simple$method$1'(): Statements_Simple {

-	this.'Statements_Simple$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxy4KHEeSFEt9m3bH63A" type="_A-bKEIKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxzIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxzYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bx0oKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_A-bx04KHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx1oKHEeSFEt9m3bH63A" annotatedElement="_A-bx0oKHEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bx1IKHEeSFEt9m3bH63A" name="Statements_Simple$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx5YKHEeSFEt9m3bH63A" annotatedElement="_A-bx1IKHEeSFEt9m3bH63A">

-          <body>activity 'Statements_Simple$behavior$1'() { this.test(i, last, collection, offer, money, members, properties, assets,

-point);

-AssertEqual(&quot;i&quot;, i, 1);

-AssertEqual(&quot;last&quot;, last, 2);

-AssertList(&quot;collection&quot;, collection, new Integer [] { 1, 2 });

-AssertEqual(&quot;offer->size()&quot;, offer->size(), 1);

-AssertEqual(&quot;money.amount&quot;, money.amount, 50);

-AssertList(&quot;members.name&quot;, members.name, new String [] { &quot;A&quot;, &quot;C&quot; });

-AssertList(&quot;properties.name&quot;, properties.name, assets.name);

-AssertEqual(&quot;point.x&quot;, point.x, 0);

-AssertEqual(&quot;point.y&quot;, point.y, 0);

-WriteLine(&quot;Done&quot;);

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxjYKHEeSFEt9m3bH63A" name="test" visibility="package" method="_A-bxqYKHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxjoKHEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxj4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxkIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxkYKHEeSFEt9m3bH63A" name="last" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxkoKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxk4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxlIKHEeSFEt9m3bH63A" name="collection" isOrdered="true" isUnique="false" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxlYKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxloKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxl4KHEeSFEt9m3bH63A" name="offer" type="_A-bxIoKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxmIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxmYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxmoKHEeSFEt9m3bH63A" name="money" type="_A-bxiYKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxm4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxnIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxnYKHEeSFEt9m3bH63A" name="members" type="_A-bxR4KHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxnoKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxn4KHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxoIKHEeSFEt9m3bH63A" name="properties" type="_A-bxaYKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxoYKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxooKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxo4KHEeSFEt9m3bH63A" name="assets" type="_A-bxaYKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxpIKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxpYKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxpoKHEeSFEt9m3bH63A" name="point" type="_A-bxgoKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxp4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxqIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxyYKHEeSFEt9m3bH63A" name="Statements_Simple$initialization$1" visibility="protected" method="_A-bxyIKHEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxzoKHEeSFEt9m3bH63A" name="Statements_Simple" method="_A-bxyoKHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxz4KHEeSFEt9m3bH63A" type="_A-bKEIKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bx0IKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bx0YKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bx04KHEeSFEt9m3bH63A" name="destroy" method="_A-bx0oKHEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_A-bxIoKHEeSFEt9m3bH63A" name="Offer" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxI4KHEeSFEt9m3bH63A" name="Offer$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxJIKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxJYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxJoKHEeSFEt9m3bH63A" name="Offer$initialization$1" visibility="protected" specification="_A-bxJ4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx34KHEeSFEt9m3bH63A" annotatedElement="_A-bxJoKHEeSFEt9m3bH63A">

-            <body>activity 'Offer$initialization$1'(){

-  if (this.'Offer$initializationFlag$1' == null) {

-    this.'Offer$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxKIKHEeSFEt9m3bH63A" name="Offer$method$1" specification="_A-bxLIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx44KHEeSFEt9m3bH63A" annotatedElement="_A-bxKIKHEeSFEt9m3bH63A">

-            <body>activity 'Offer$method$1'(): Offer {

-	this.'Offer$initialization$1'();

-	return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxKYKHEeSFEt9m3bH63A" type="_A-bxIoKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxKoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxK4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxMIKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_A-bxMYKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx4YKHEeSFEt9m3bH63A" annotatedElement="_A-bxMIKHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxJ4KHEeSFEt9m3bH63A" name="Offer$initialization$1" visibility="protected" method="_A-bxJoKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxLIKHEeSFEt9m3bH63A" name="Offer" method="_A-bxKIKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxLYKHEeSFEt9m3bH63A" type="_A-bxIoKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxLoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxL4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxMYKHEeSFEt9m3bH63A" name="destroy" method="_A-bxMIKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_A-bxR4KHEeSFEt9m3bH63A" name="Member" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxSIKHEeSFEt9m3bH63A" name="isActive" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxSYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxSoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxS4KHEeSFEt9m3bH63A" name="name" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxTIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxTYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxYoKHEeSFEt9m3bH63A" name="Member$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxY4KHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxZIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxWIKHEeSFEt9m3bH63A" name="Member$method$1" visibility="protected" specification="_A-bxToKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx3IKHEeSFEt9m3bH63A" annotatedElement="_A-bxWIKHEeSFEt9m3bH63A">

-            <body>activity 'Member$method$1'(in isActive: Boolean, in name: String): Member {

-if (this.'Member$initializationFlag$1' == null) {

-this.'Member$initialization$1'();

-this.isActive = isActive; this.name = name; 

-}

-return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxWYKHEeSFEt9m3bH63A" name="isActive">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxWoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxW4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxXIKHEeSFEt9m3bH63A" name="name">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxXYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxXoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxX4KHEeSFEt9m3bH63A" name="" type="_A-bxR4KHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxYIKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxYYKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxZYKHEeSFEt9m3bH63A" name="Member$initialization$1" visibility="protected" specification="_A-bxZoKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx24KHEeSFEt9m3bH63A" annotatedElement="_A-bxZYKHEeSFEt9m3bH63A">

-            <body>activity 'Member$initialization$1'(){

-  if (this.'Member$initializationFlag$1' == null) {

-    this.'Member$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxZ4KHEeSFEt9m3bH63A" name="destroy$method$1" specification="_A-bxaIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx2oKHEeSFEt9m3bH63A" annotatedElement="_A-bxZ4KHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxToKHEeSFEt9m3bH63A" name="Member" visibility="public" method="_A-bxWIKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxT4KHEeSFEt9m3bH63A" name="isActive">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxUIKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxUYKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxUoKHEeSFEt9m3bH63A" name="name">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxU4KHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxVIKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxVYKHEeSFEt9m3bH63A" name="" type="_A-bxR4KHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxVoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxV4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxZoKHEeSFEt9m3bH63A" name="Member$initialization$1" visibility="protected" method="_A-bxZYKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxaIKHEeSFEt9m3bH63A" name="destroy" method="_A-bxZ4KHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_A-bxaYKHEeSFEt9m3bH63A" name="RealProperty" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxaoKHEeSFEt9m3bH63A" name="name" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxa4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxbIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxe4KHEeSFEt9m3bH63A" name="RealProperty$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxfIKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxfYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxdIKHEeSFEt9m3bH63A" name="RealProperty$method$1" visibility="protected" specification="_A-bxbYKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx3YKHEeSFEt9m3bH63A" annotatedElement="_A-bxdIKHEeSFEt9m3bH63A">

-            <body>activity 'RealProperty$method$1'(in name: String): RealProperty {

-if (this.'RealProperty$initializationFlag$1' == null) {

-this.'RealProperty$initialization$1'();

-this.name = name; 

-}

-return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxdYKHEeSFEt9m3bH63A" name="name">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxdoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxd4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxeIKHEeSFEt9m3bH63A" name="" type="_A-bxaYKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxeYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxeoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxfoKHEeSFEt9m3bH63A" name="RealProperty$initialization$1" visibility="protected" specification="_A-bxf4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx4IKHEeSFEt9m3bH63A" annotatedElement="_A-bxfoKHEeSFEt9m3bH63A">

-            <body>activity 'RealProperty$initialization$1'(){

-  if (this.'RealProperty$initializationFlag$1' == null) {

-    this.'RealProperty$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxgIKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_A-bxgYKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx3oKHEeSFEt9m3bH63A" annotatedElement="_A-bxgIKHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxbYKHEeSFEt9m3bH63A" name="RealProperty" visibility="public" method="_A-bxdIKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxboKHEeSFEt9m3bH63A" name="name">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxb4KHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxcIKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxcYKHEeSFEt9m3bH63A" name="" type="_A-bxaYKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxcoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxc4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxf4KHEeSFEt9m3bH63A" name="RealProperty$initialization$1" visibility="protected" method="_A-bxfoKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxgYKHEeSFEt9m3bH63A" name="destroy" method="_A-bxgIKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:DataType" xmi:id="_A-bxgoKHEeSFEt9m3bH63A" name="Point" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxg4KHEeSFEt9m3bH63A" name="x" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxhIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxhYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxhoKHEeSFEt9m3bH63A" name="y" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxh4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxiIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:DataType" xmi:id="_A-bxiYKHEeSFEt9m3bH63A" name="Money" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxioKHEeSFEt9m3bH63A" name="amount" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxi4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxjIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-      </nestedClassifier>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ACnpIYKHEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ACnpIoKHEeSFEt9m3bH63A" 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="_52Ea2beNEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx54KHEeSFEt9m3bH63A" base_Comment="_A-bx3IKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx6IKHEeSFEt9m3bH63A" base_Comment="_A-bx3oKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_A-bx6YKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxMYKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx6oKHEeSFEt9m3bH63A" base_Comment="_A-bx2YKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx64KHEeSFEt9m3bH63A" base_Comment="_A-bx5YKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx7IKHEeSFEt9m3bH63A" base_Comment="_A-bx44KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx7YKHEeSFEt9m3bH63A" base_Comment="_A-bx2IKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_A-bx7oKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxaIKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx74KHEeSFEt9m3bH63A" base_Comment="_A-bx34KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx8IKHEeSFEt9m3bH63A" base_Comment="_A-bx4YKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx8YKHEeSFEt9m3bH63A" base_Comment="_A-bx3YKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx8oKHEeSFEt9m3bH63A" base_Comment="_A-bx2oKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx84KHEeSFEt9m3bH63A" base_Comment="_A-bx5oKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx9IKHEeSFEt9m3bH63A" base_Comment="_A-bx24KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx9YKHEeSFEt9m3bH63A" base_Comment="_A-bx4oKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx9oKHEeSFEt9m3bH63A" base_Comment="_A-bx14KHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_A-bx94KHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxbYKHEeSFEt9m3bH63A"/>

-  <standard:Destroy xmi:id="_A-bx-IKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxgYKHEeSFEt9m3bH63A"/>

-  <standard:Create xmi:id="_A-bx-YKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxzoKHEeSFEt9m3bH63A"/>

-  <standard:Create xmi:id="_A-bx-oKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxLIKHEeSFEt9m3bH63A"/>

-  <standard:Create xmi:id="_A-bx-4KHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxToKHEeSFEt9m3bH63A"/>

-  <standard:Destroy xmi:id="_A-bx_IKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bx04KHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx_YKHEeSFEt9m3bH63A" base_Comment="_A-bx4IKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx_oKHEeSFEt9m3bH63A" base_Comment="_A-bx5IKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_A-bx_4KHEeSFEt9m3bH63A" base_Comment="_A-bx1oKHEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_ACnpIIKHEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_A-bKEIKHEeSFEt9m3bH63A" name="Statements_Simple" classifierBehavior="_A-bx1IKHEeSFEt9m3bH63A" isActive="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx1YKHEeSFEt9m3bH63A" annotatedElement="_A-bKEIKHEeSFEt9m3bH63A">
+        <body> &#xD;
+ * Test block, empty and local name declaration statements.&#xD;
+ *</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bKEYKHEeSFEt9m3bH63A" name="offers" visibility="package" type="_A-bxIoKHEeSFEt9m3bH63A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxIIKHEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxIYKHEeSFEt9m3bH63A" value="*"/>
+        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_A-bxMoKHEeSFEt9m3bH63A" behavior="_A-bxM4KHEeSFEt9m3bH63A"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxN4KHEeSFEt9m3bH63A" name="principal" visibility="package">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxOIKHEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxOYKHEeSFEt9m3bH63A" value="1"/>
+        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_A-bxOoKHEeSFEt9m3bH63A" behavior="_A-bxO4KHEeSFEt9m3bH63A"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxP4KHEeSFEt9m3bH63A" name="rate" visibility="package">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxQIKHEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxQYKHEeSFEt9m3bH63A" value="1"/>
+        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_A-bxQoKHEeSFEt9m3bH63A" behavior="_A-bxQ4KHEeSFEt9m3bH63A"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxxYKHEeSFEt9m3bH63A" name="Statements_Simple$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxxoKHEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxx4KHEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxqYKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_A-bxjYKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx2YKHEeSFEt9m3bH63A" annotatedElement="_A-bxqYKHEeSFEt9m3bH63A">
+          <body>activity 'test$method$1'(out i: Integer, out last: Integer, out collection: Integer[0..*] sequence, out offer: Offer, out money: Money, out members: Member[0..*] sequence, out properties: RealProperty[0..*] sequence, out assets: RealProperty[0..*] sequence, out point: Point) { e1 = 1;
+e2 = 2;
+period = 10;
+members = new Member [] { new Member(false, &quot;A&quot;), new Member(true, &quot;B&quot;), new
+Member(false, &quot;C&quot;) };
+land = new RealProperty(&quot;land&quot;);
+home = new RealProperty(&quot;home&quot;);
+condominium = new RealProperty(&quot;condominium&quot;);
+things = any [] { land, home, condominium, &quot;something&quot; }; // *****&#xD;
+//@parallel &#xD;
+{ i = e1;
+last = e2;
+collection = new Integer [] { i, last };
+};
+let currentOffer: Offer = this.offers[1];
+let interest: Money = new(this.principal * this.rate * period / 100);
+let inactiveMembers: Member [] = members->select member (! member.isActive);
+let realProperties: RealProperty [] = (RealProperty) things;
+let fixedAssets: RealProperty [] = { land, home, condominium };
+let origin: Point = new(0, 0);
+offer = currentOffer;
+money = interest;
+members = inactiveMembers;
+properties = realProperties;
+assets = fixedAssets;
+point = origin;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxqoKHEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxq4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxrIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxrYKHEeSFEt9m3bH63A" name="last" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxroKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxr4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxsIKHEeSFEt9m3bH63A" name="collection" isOrdered="true" isUnique="false" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxsYKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxsoKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxs4KHEeSFEt9m3bH63A" name="offer" type="_A-bxIoKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxtIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxtYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxtoKHEeSFEt9m3bH63A" name="money" type="_A-bxiYKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxt4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxuIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxuYKHEeSFEt9m3bH63A" name="members" type="_A-bxR4KHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxuoKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxu4KHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxvIKHEeSFEt9m3bH63A" name="properties" type="_A-bxaYKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxvYKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxvoKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxv4KHEeSFEt9m3bH63A" name="assets" type="_A-bxaYKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxwIKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxwYKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxwoKHEeSFEt9m3bH63A" name="point" type="_A-bxgoKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxw4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxxIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxM4KHEeSFEt9m3bH63A" name="offers$defaultValue$1">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx4oKHEeSFEt9m3bH63A" annotatedElement="_A-bxM4KHEeSFEt9m3bH63A">
+          <body>activity 'offers$defaultValue$1'(): Offer[0..*] {
+	return  new Offer();
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxNIKHEeSFEt9m3bH63A" type="_A-bxIoKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxNYKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxNoKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxO4KHEeSFEt9m3bH63A" name="principal$defaultValue$1">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx5IKHEeSFEt9m3bH63A" annotatedElement="_A-bxO4KHEeSFEt9m3bH63A">
+          <body>activity 'principal$defaultValue$1'(): Integer {
+	return  100;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxPIKHEeSFEt9m3bH63A" direction="return">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxPYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxPoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxQ4KHEeSFEt9m3bH63A" name="rate$defaultValue$1">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx14KHEeSFEt9m3bH63A" annotatedElement="_A-bxQ4KHEeSFEt9m3bH63A">
+          <body>activity 'rate$defaultValue$1'(): Integer {
+	return  5;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxRIKHEeSFEt9m3bH63A" direction="return">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxRYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxRoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxyIKHEeSFEt9m3bH63A" name="Statements_Simple$initialization$1" visibility="protected" specification="_A-bxyYKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx2IKHEeSFEt9m3bH63A" annotatedElement="_A-bxyIKHEeSFEt9m3bH63A">
+          <body>activity 'Statements_Simple$initialization$1'(){
+  if (this.'Statements_Simple$initializationFlag$1' == null) {
+    this.offers = 'offers$defaultValue$1'();
+    this.principal = 'principal$defaultValue$1'();
+    this.rate = 'rate$defaultValue$1'();
+    this.'Statements_Simple$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxyoKHEeSFEt9m3bH63A" name="Statements_Simple$method$1" specification="_A-bxzoKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx5oKHEeSFEt9m3bH63A" annotatedElement="_A-bxyoKHEeSFEt9m3bH63A">
+          <body>activity 'Statements_Simple$method$1'(): Statements_Simple {
+	this.'Statements_Simple$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxy4KHEeSFEt9m3bH63A" type="_A-bKEIKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxzIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxzYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bx0oKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_A-bx04KHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx1oKHEeSFEt9m3bH63A" annotatedElement="_A-bx0oKHEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bx1IKHEeSFEt9m3bH63A" name="Statements_Simple$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx5YKHEeSFEt9m3bH63A" annotatedElement="_A-bx1IKHEeSFEt9m3bH63A">
+          <body>activity 'Statements_Simple$behavior$1'() { this.test(i, last, collection, offer, money, members, properties, assets,
+point);
+AssertEqual(&quot;i&quot;, i, 1);
+AssertEqual(&quot;last&quot;, last, 2);
+AssertList(&quot;collection&quot;, collection, new Integer [] { 1, 2 });
+AssertEqual(&quot;offer->size()&quot;, offer->size(), 1);
+AssertEqual(&quot;money.amount&quot;, money.amount, 50);
+AssertList(&quot;members.name&quot;, members.name, new String [] { &quot;A&quot;, &quot;C&quot; });
+AssertList(&quot;properties.name&quot;, properties.name, assets.name);
+AssertEqual(&quot;point.x&quot;, point.x, 0);
+AssertEqual(&quot;point.y&quot;, point.y, 0);
+WriteLine(&quot;Done&quot;);
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxjYKHEeSFEt9m3bH63A" name="test" visibility="package" method="_A-bxqYKHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxjoKHEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxj4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxkIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxkYKHEeSFEt9m3bH63A" name="last" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxkoKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxk4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxlIKHEeSFEt9m3bH63A" name="collection" isOrdered="true" isUnique="false" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxlYKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxloKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxl4KHEeSFEt9m3bH63A" name="offer" type="_A-bxIoKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxmIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxmYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxmoKHEeSFEt9m3bH63A" name="money" type="_A-bxiYKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxm4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxnIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxnYKHEeSFEt9m3bH63A" name="members" type="_A-bxR4KHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxnoKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxn4KHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxoIKHEeSFEt9m3bH63A" name="properties" type="_A-bxaYKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxoYKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxooKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxo4KHEeSFEt9m3bH63A" name="assets" type="_A-bxaYKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxpIKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxpYKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxpoKHEeSFEt9m3bH63A" name="point" type="_A-bxgoKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxp4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxqIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxyYKHEeSFEt9m3bH63A" name="Statements_Simple$initialization$1" visibility="protected" method="_A-bxyIKHEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxzoKHEeSFEt9m3bH63A" name="Statements_Simple" method="_A-bxyoKHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxz4KHEeSFEt9m3bH63A" type="_A-bKEIKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bx0IKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bx0YKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bx04KHEeSFEt9m3bH63A" name="destroy" method="_A-bx0oKHEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_A-bxIoKHEeSFEt9m3bH63A" name="Offer" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxI4KHEeSFEt9m3bH63A" name="Offer$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxJIKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxJYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxJoKHEeSFEt9m3bH63A" name="Offer$initialization$1" visibility="protected" specification="_A-bxJ4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx34KHEeSFEt9m3bH63A" annotatedElement="_A-bxJoKHEeSFEt9m3bH63A">
+            <body>activity 'Offer$initialization$1'(){
+  if (this.'Offer$initializationFlag$1' == null) {
+    this.'Offer$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxKIKHEeSFEt9m3bH63A" name="Offer$method$1" specification="_A-bxLIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx44KHEeSFEt9m3bH63A" annotatedElement="_A-bxKIKHEeSFEt9m3bH63A">
+            <body>activity 'Offer$method$1'(): Offer {
+	this.'Offer$initialization$1'();
+	return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxKYKHEeSFEt9m3bH63A" type="_A-bxIoKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxKoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxK4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxMIKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_A-bxMYKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx4YKHEeSFEt9m3bH63A" annotatedElement="_A-bxMIKHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxJ4KHEeSFEt9m3bH63A" name="Offer$initialization$1" visibility="protected" method="_A-bxJoKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxLIKHEeSFEt9m3bH63A" name="Offer" method="_A-bxKIKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxLYKHEeSFEt9m3bH63A" type="_A-bxIoKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxLoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxL4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxMYKHEeSFEt9m3bH63A" name="destroy" method="_A-bxMIKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_A-bxR4KHEeSFEt9m3bH63A" name="Member" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxSIKHEeSFEt9m3bH63A" name="isActive" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxSYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxSoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxS4KHEeSFEt9m3bH63A" name="name" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxTIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxTYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxYoKHEeSFEt9m3bH63A" name="Member$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxY4KHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxZIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxWIKHEeSFEt9m3bH63A" name="Member$method$1" visibility="protected" specification="_A-bxToKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx3IKHEeSFEt9m3bH63A" annotatedElement="_A-bxWIKHEeSFEt9m3bH63A">
+            <body>activity 'Member$method$1'(in isActive: Boolean, in name: String): Member {
+if (this.'Member$initializationFlag$1' == null) {
+this.'Member$initialization$1'();
+this.isActive = isActive; this.name = name; 
+}
+return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxWYKHEeSFEt9m3bH63A" name="isActive">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxWoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxW4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxXIKHEeSFEt9m3bH63A" name="name">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxXYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxXoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxX4KHEeSFEt9m3bH63A" name="" type="_A-bxR4KHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxYIKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxYYKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxZYKHEeSFEt9m3bH63A" name="Member$initialization$1" visibility="protected" specification="_A-bxZoKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx24KHEeSFEt9m3bH63A" annotatedElement="_A-bxZYKHEeSFEt9m3bH63A">
+            <body>activity 'Member$initialization$1'(){
+  if (this.'Member$initializationFlag$1' == null) {
+    this.'Member$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxZ4KHEeSFEt9m3bH63A" name="destroy$method$1" specification="_A-bxaIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx2oKHEeSFEt9m3bH63A" annotatedElement="_A-bxZ4KHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxToKHEeSFEt9m3bH63A" name="Member" visibility="public" method="_A-bxWIKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxT4KHEeSFEt9m3bH63A" name="isActive">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxUIKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxUYKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxUoKHEeSFEt9m3bH63A" name="name">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxU4KHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxVIKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxVYKHEeSFEt9m3bH63A" name="" type="_A-bxR4KHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxVoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxV4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxZoKHEeSFEt9m3bH63A" name="Member$initialization$1" visibility="protected" method="_A-bxZYKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxaIKHEeSFEt9m3bH63A" name="destroy" method="_A-bxZ4KHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_A-bxaYKHEeSFEt9m3bH63A" name="RealProperty" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxaoKHEeSFEt9m3bH63A" name="name" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxa4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxbIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxe4KHEeSFEt9m3bH63A" name="RealProperty$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxfIKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxfYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxdIKHEeSFEt9m3bH63A" name="RealProperty$method$1" visibility="protected" specification="_A-bxbYKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx3YKHEeSFEt9m3bH63A" annotatedElement="_A-bxdIKHEeSFEt9m3bH63A">
+            <body>activity 'RealProperty$method$1'(in name: String): RealProperty {
+if (this.'RealProperty$initializationFlag$1' == null) {
+this.'RealProperty$initialization$1'();
+this.name = name; 
+}
+return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxdYKHEeSFEt9m3bH63A" name="name">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxdoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxd4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxeIKHEeSFEt9m3bH63A" name="" type="_A-bxaYKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxeYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxeoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxfoKHEeSFEt9m3bH63A" name="RealProperty$initialization$1" visibility="protected" specification="_A-bxf4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx4IKHEeSFEt9m3bH63A" annotatedElement="_A-bxfoKHEeSFEt9m3bH63A">
+            <body>activity 'RealProperty$initialization$1'(){
+  if (this.'RealProperty$initializationFlag$1' == null) {
+    this.'RealProperty$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_A-bxgIKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_A-bxgYKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_A-bx3oKHEeSFEt9m3bH63A" annotatedElement="_A-bxgIKHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxbYKHEeSFEt9m3bH63A" name="RealProperty" visibility="public" method="_A-bxdIKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxboKHEeSFEt9m3bH63A" name="name">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxb4KHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxcIKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_A-bxcYKHEeSFEt9m3bH63A" name="" type="_A-bxaYKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxcoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxc4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxf4KHEeSFEt9m3bH63A" name="RealProperty$initialization$1" visibility="protected" method="_A-bxfoKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_A-bxgYKHEeSFEt9m3bH63A" name="destroy" method="_A-bxgIKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:DataType" xmi:id="_A-bxgoKHEeSFEt9m3bH63A" name="Point" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxg4KHEeSFEt9m3bH63A" name="x" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxhIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxhYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxhoKHEeSFEt9m3bH63A" name="y" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxh4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxiIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:DataType" xmi:id="_A-bxiYKHEeSFEt9m3bH63A" name="Money" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_A-bxioKHEeSFEt9m3bH63A" name="amount" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A-bxi4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A-bxjIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+      </nestedClassifier>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ACnpIYKHEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ACnpIoKHEeSFEt9m3bH63A" 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="_52Ea2beNEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52FB4LeNEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx54KHEeSFEt9m3bH63A" base_Comment="_A-bx3IKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx6IKHEeSFEt9m3bH63A" base_Comment="_A-bx3oKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_A-bx6YKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxMYKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx6oKHEeSFEt9m3bH63A" base_Comment="_A-bx2YKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx64KHEeSFEt9m3bH63A" base_Comment="_A-bx5YKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx7IKHEeSFEt9m3bH63A" base_Comment="_A-bx44KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx7YKHEeSFEt9m3bH63A" base_Comment="_A-bx2IKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_A-bx7oKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxaIKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx74KHEeSFEt9m3bH63A" base_Comment="_A-bx34KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx8IKHEeSFEt9m3bH63A" base_Comment="_A-bx4YKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx8YKHEeSFEt9m3bH63A" base_Comment="_A-bx3YKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx8oKHEeSFEt9m3bH63A" base_Comment="_A-bx2oKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx84KHEeSFEt9m3bH63A" base_Comment="_A-bx5oKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx9IKHEeSFEt9m3bH63A" base_Comment="_A-bx24KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx9YKHEeSFEt9m3bH63A" base_Comment="_A-bx4oKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx9oKHEeSFEt9m3bH63A" base_Comment="_A-bx14KHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_A-bx94KHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxbYKHEeSFEt9m3bH63A"/>
+  <standard:Destroy xmi:id="_A-bx-IKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxgYKHEeSFEt9m3bH63A"/>
+  <standard:Create xmi:id="_A-bx-YKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxzoKHEeSFEt9m3bH63A"/>
+  <standard:Create xmi:id="_A-bx-oKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxLIKHEeSFEt9m3bH63A"/>
+  <standard:Create xmi:id="_A-bx-4KHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bxToKHEeSFEt9m3bH63A"/>
+  <standard:Destroy xmi:id="_A-bx_IKHEeSFEt9m3bH63A" base_BehavioralFeature="_A-bx04KHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx_YKHEeSFEt9m3bH63A" base_Comment="_A-bx4IKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx_oKHEeSFEt9m3bH63A" base_Comment="_A-bx5IKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_A-bx_4KHEeSFEt9m3bH63A" base_Comment="_A-bx1oKHEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_While_Do_Looping.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_While_Do_Looping.uml
index 66fb1499730..38a4171e6b3 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_While_Do_Looping.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Statements_While_Do_Looping.uml
@@ -1,657 +1,657 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_A_m10IKHEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_Ce0l0IKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping" classifierBehavior="_Ce0mxYKHEeSFEt9m3bH63A" isActive="true">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mxoKHEeSFEt9m3bH63A" annotatedElement="_Ce0l0IKHEeSFEt9m3bH63A">

-        <body>&#xD;

- * Test while and do statements.&#xD;

- *</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l0YKHEeSFEt9m3bH63A" name="list" visibility="package" type="_Ce0l1IKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l0oKHEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l04KHEeSFEt9m3bH63A" value="*"/>

-        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_Ce0l5oKHEeSFEt9m3bH63A" behavior="_Ce0l54KHEeSFEt9m3bH63A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mtoKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mt4KHEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0muIKHEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mmoKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_Ce0mfoKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mzoKHEeSFEt9m3bH63A" annotatedElement="_Ce0mmoKHEeSFEt9m3bH63A">

-          <body>activity 'test$method$1'(out count: Integer, out checksum: Integer, out nextRecord: FileRecord[0..1], out file: File, out lines: String[0..*] sequence, out readings: Reading[0..*] sequence, out i: Integer, out j: Integer, out self: Statements_While_Do_Looping) { count = 0;

-checksum = 0;

-file = new File();

-endMarker = file.endMarker;

-sensor = new Sensor(2);

-lines = null;

-readings = null;

-i = 4;

-j = 0;

-while ((last = this.list->size()) > 0) { this.list[last].cleanUp();

-this.list->removeAt(last);

-++ count;

-} continue = true;

-while (continue) { nextRecord = file.readNext();

-if (! nextRecord->isEmpty()) { checksum = checksum + 1;

-} continue = file.hasMore();

-} file.reset();

-do { line = file.readNext();

-lines->add(line.toString());

-} while (line != endMarker);

-do { nextReading = sensor.getNextReading();

-readings->add(nextReading.getValue());

-} while (! nextReading.isFinal());

-do { if (i &lt;= 2) { break;

-} -- i;

-} while (true);

-do { ++ j;

-if (j > 2) { break;

-} } while (true);

-self = this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mm4KHEeSFEt9m3bH63A" name="count" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mnIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mnYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mnoKHEeSFEt9m3bH63A" name="checksum" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mn4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0moIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0moYKHEeSFEt9m3bH63A" name="nextRecord" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mooKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mo4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mpIKHEeSFEt9m3bH63A" name="file" type="_Ce0l64KHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mpYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mpoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mp4KHEeSFEt9m3bH63A" name="lines" isOrdered="true" isUnique="false" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mqIKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mqYKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mqoKHEeSFEt9m3bH63A" name="readings" type="_Ce0mSoKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mq4KHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mrIKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mrYKHEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mroKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mr4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0msIKHEeSFEt9m3bH63A" name="j" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0msYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0msoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0ms4KHEeSFEt9m3bH63A" name="self" type="_Ce0l0IKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mtIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mtYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l54KHEeSFEt9m3bH63A" name="list$defaultValue$1">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m14KHEeSFEt9m3bH63A" annotatedElement="_Ce0l54KHEeSFEt9m3bH63A">

-          <body>activity 'list$defaultValue$1'(): Monitor[0..*] sequence {

-	return  { new Monitor(), new Monitor() };

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l6IKHEeSFEt9m3bH63A" type="_Ce0l1IKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l6YKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l6oKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0muYKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$initialization$1" visibility="protected" specification="_Ce0muoKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0myIKHEeSFEt9m3bH63A" annotatedElement="_Ce0muYKHEeSFEt9m3bH63A">

-          <body>activity 'Statements_While_Do_Looping$initialization$1'(){

-  if (this.'Statements_While_Do_Looping$initializationFlag$1' == null) {

-    this.list = 'list$defaultValue$1'();

-    this.'Statements_While_Do_Looping$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mu4KHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$method$1" specification="_Ce0mv4KHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m0IKHEeSFEt9m3bH63A" annotatedElement="_Ce0mu4KHEeSFEt9m3bH63A">

-          <body>activity 'Statements_While_Do_Looping$method$1'(): Statements_While_Do_Looping {

-	this.'Statements_While_Do_Looping$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mvIKHEeSFEt9m3bH63A" type="_Ce0l0IKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mvYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mvoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mw4KHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mxIKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m0oKHEeSFEt9m3bH63A" annotatedElement="_Ce0mw4KHEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mxYKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m04KHEeSFEt9m3bH63A" annotatedElement="_Ce0mxYKHEeSFEt9m3bH63A">

-          <body>activity 'Statements_While_Do_Looping$behavior$1'() { this.test(count, checksum, nextRecord, file, lines, readings, i, j, self);

-AssertEqual(&quot;count&quot;, count, 2);

-AssertEqual(&quot;checksum&quot;, checksum, 1);

-AssertEqual(&quot;nextRecord.label&quot;, nextRecord.label, &quot;Record&quot;);

-AssertList(&quot;lines&quot;, lines, new String [] { &quot;Record&quot;, &quot;End&quot; });

-AssertList(&quot;readings&quot;, readings, new Integer [] { 2, 1, 0 });

-AssertEqual(&quot;i&quot;, i, 2);

-AssertEqual(&quot;j&quot;, j, 3);

-AssertTrue(&quot;self.list->isEmpty()&quot;, self.list->isEmpty());

-WriteLine(&quot;Done&quot;);

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mfoKHEeSFEt9m3bH63A" name="test" visibility="package" method="_Ce0mmoKHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mf4KHEeSFEt9m3bH63A" name="count" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mgIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mgYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mgoKHEeSFEt9m3bH63A" name="checksum" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mg4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mhIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mhYKHEeSFEt9m3bH63A" name="nextRecord" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mhoKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mh4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0miIKHEeSFEt9m3bH63A" name="file" type="_Ce0l64KHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0miYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mioKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mi4KHEeSFEt9m3bH63A" name="lines" isOrdered="true" isUnique="false" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mjIKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mjYKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mjoKHEeSFEt9m3bH63A" name="readings" type="_Ce0mSoKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mj4KHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mkIKHEeSFEt9m3bH63A" value="*"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mkYKHEeSFEt9m3bH63A" name="i" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mkoKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mk4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mlIKHEeSFEt9m3bH63A" name="j" direction="out">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mlYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mloKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0ml4KHEeSFEt9m3bH63A" name="self" type="_Ce0l0IKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mmIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mmYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0muoKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$initialization$1" visibility="protected" method="_Ce0muYKHEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mv4KHEeSFEt9m3bH63A" name="Statements_While_Do_Looping" method="_Ce0mu4KHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mwIKHEeSFEt9m3bH63A" type="_Ce0l0IKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mwYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mwoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mxIKHEeSFEt9m3bH63A" name="destroy" method="_Ce0mw4KHEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0l1IKHEeSFEt9m3bH63A" name="Monitor" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l14KHEeSFEt9m3bH63A" name="Monitor$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l2IKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l2YKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l1oKHEeSFEt9m3bH63A" name="cleanUp$method$1" visibility="protected" specification="_Ce0l1YKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m2IKHEeSFEt9m3bH63A" annotatedElement="_Ce0l1oKHEeSFEt9m3bH63A">

-            <body>activity 'cleanUp$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l2oKHEeSFEt9m3bH63A" name="Monitor$initialization$1" visibility="protected" specification="_Ce0l24KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m1oKHEeSFEt9m3bH63A" annotatedElement="_Ce0l2oKHEeSFEt9m3bH63A">

-            <body>activity 'Monitor$initialization$1'(){

-  if (this.'Monitor$initializationFlag$1' == null) {

-    this.'Monitor$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l3IKHEeSFEt9m3bH63A" name="Monitor$method$1" specification="_Ce0l4IKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eUoKHEeSFEt9m3bH63A" annotatedElement="_Ce0l3IKHEeSFEt9m3bH63A">

-            <body>activity 'Monitor$method$1'(): Monitor {

-	this.'Monitor$initialization$1'();

-	return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l3YKHEeSFEt9m3bH63A" type="_Ce0l1IKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l3oKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l34KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l5IKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0l5YKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eU4KHEeSFEt9m3bH63A" annotatedElement="_Ce0l5IKHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l1YKHEeSFEt9m3bH63A" name="cleanUp" visibility="public" method="_Ce0l1oKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l24KHEeSFEt9m3bH63A" name="Monitor$initialization$1" visibility="protected" method="_Ce0l2oKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l4IKHEeSFEt9m3bH63A" name="Monitor" method="_Ce0l3IKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l4YKHEeSFEt9m3bH63A" type="_Ce0l1IKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l4oKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l44KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l5YKHEeSFEt9m3bH63A" name="destroy" method="_Ce0l5IKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0l64KHEeSFEt9m3bH63A" name="File" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l7IKHEeSFEt9m3bH63A" name="more" visibility="private">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l7YKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l7oKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l74KHEeSFEt9m3bH63A" name="endMarker" visibility="public" type="_Ce0l8oKHEeSFEt9m3bH63A">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l8IKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l8YKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mLYKHEeSFEt9m3bH63A" name="File$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mLoKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mL4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mF4KHEeSFEt9m3bH63A" name="File$method$1" visibility="protected" specification="_Ce0mE4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mzYKHEeSFEt9m3bH63A" annotatedElement="_Ce0mF4KHEeSFEt9m3bH63A">

-            <body>activity 'File$method$1'(): File {

-if (this.'File$initializationFlag$1' == null) {

-this.'File$initialization$1'();

-this.more = true; this.endMarker = new FileRecord(&quot;End&quot;); 

-}

-return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mGIKHEeSFEt9m3bH63A" name="" type="_Ce0l64KHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mGYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mGoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mH4KHEeSFEt9m3bH63A" name="hasMore$method$1" visibility="protected" specification="_Ce0mG4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eUIKHEeSFEt9m3bH63A" annotatedElement="_Ce0mH4KHEeSFEt9m3bH63A">

-            <body>activity 'hasMore$method$1'(): Boolean { return this.more;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mIIKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mIYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mIoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mJ4KHEeSFEt9m3bH63A" name="readNext$method$1" visibility="protected" specification="_Ce0mI4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eVYKHEeSFEt9m3bH63A" annotatedElement="_Ce0mJ4KHEeSFEt9m3bH63A">

-            <body>activity 'readNext$method$1'(): FileRecord[0..1] { if (this.more) { this.more = false;

-return new FileRecord(&quot;Record&quot;);

-} else { return this.endMarker;

-} }</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mKIKHEeSFEt9m3bH63A" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mKYKHEeSFEt9m3bH63A"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mKoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mLIKHEeSFEt9m3bH63A" name="reset$method$1" visibility="protected" specification="_Ce0mK4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m0YKHEeSFEt9m3bH63A" annotatedElement="_Ce0mLIKHEeSFEt9m3bH63A">

-            <body>activity 'reset$method$1'() { this.more = true;

-}</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mMIKHEeSFEt9m3bH63A" name="File$initialization$1" visibility="protected" specification="_Ce0mMYKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0my4KHEeSFEt9m3bH63A" annotatedElement="_Ce0mMIKHEeSFEt9m3bH63A">

-            <body>activity 'File$initialization$1'(){

-  if (this.'File$initializationFlag$1' == null) {

-    this.'File$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mMoKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mM4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m1YKHEeSFEt9m3bH63A" annotatedElement="_Ce0mMoKHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mE4KHEeSFEt9m3bH63A" name="File" visibility="public" method="_Ce0mF4KHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mFIKHEeSFEt9m3bH63A" name="" type="_Ce0l64KHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mFYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mFoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mG4KHEeSFEt9m3bH63A" name="hasMore" visibility="public" method="_Ce0mH4KHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mHIKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mHYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mHoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mI4KHEeSFEt9m3bH63A" name="readNext" visibility="public" method="_Ce0mJ4KHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mJIKHEeSFEt9m3bH63A" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mJYKHEeSFEt9m3bH63A"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mJoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mK4KHEeSFEt9m3bH63A" name="reset" visibility="public" method="_Ce0mLIKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mMYKHEeSFEt9m3bH63A" name="File$initialization$1" visibility="protected" method="_Ce0mMIKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mM4KHEeSFEt9m3bH63A" name="destroy" method="_Ce0mMoKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0l8oKHEeSFEt9m3bH63A" name="FileRecord" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l84KHEeSFEt9m3bH63A" name="label" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l9IKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l9YKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mDIKHEeSFEt9m3bH63A" name="FileRecord$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mDYKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mDoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l_YKHEeSFEt9m3bH63A" name="FileRecord$method$1" visibility="protected" specification="_Ce0l9oKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m24KHEeSFEt9m3bH63A" annotatedElement="_Ce0l_YKHEeSFEt9m3bH63A">

-            <body>activity 'FileRecord$method$1'(in label: String): FileRecord {

-if (this.'FileRecord$initializationFlag$1' == null) {

-this.'FileRecord$initialization$1'();

-this.label = label; 

-}

-return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l_oKHEeSFEt9m3bH63A" name="label">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l_4KHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mAIKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mAYKHEeSFEt9m3bH63A" name="" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mAoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mA4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mCIKHEeSFEt9m3bH63A" name="toString$method$1" visibility="protected" specification="_Ce0mBIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m2oKHEeSFEt9m3bH63A" annotatedElement="_Ce0mCIKHEeSFEt9m3bH63A">

-            <body>activity 'toString$method$1'(): String { return this.label;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mCYKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mCoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mC4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mD4KHEeSFEt9m3bH63A" name="FileRecord$initialization$1" visibility="protected" specification="_Ce0mEIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mz4KHEeSFEt9m3bH63A" annotatedElement="_Ce0mD4KHEeSFEt9m3bH63A">

-            <body>activity 'FileRecord$initialization$1'(){

-  if (this.'FileRecord$initializationFlag$1' == null) {

-    this.'FileRecord$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mEYKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mEoKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eUYKHEeSFEt9m3bH63A" annotatedElement="_Ce0mEYKHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l9oKHEeSFEt9m3bH63A" name="FileRecord" visibility="public" method="_Ce0l_YKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l94KHEeSFEt9m3bH63A" name="label">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l-IKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l-YKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l-oKHEeSFEt9m3bH63A" name="" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l-4KHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l_IKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mBIKHEeSFEt9m3bH63A" name="toString" visibility="public" method="_Ce0mCIKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mBYKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mBoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mB4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mEIKHEeSFEt9m3bH63A" name="FileRecord$initialization$1" visibility="protected" method="_Ce0mD4KHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mEoKHEeSFEt9m3bH63A" name="destroy" method="_Ce0mEYKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0mNIKHEeSFEt9m3bH63A" name="Sensor" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mNYKHEeSFEt9m3bH63A" name="count" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mNoKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mN4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0md4KHEeSFEt9m3bH63A" name="Sensor$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0meIKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0meYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mP4KHEeSFEt9m3bH63A" name="Sensor$method$1" visibility="protected" specification="_Ce0mOIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0myYKHEeSFEt9m3bH63A" annotatedElement="_Ce0mP4KHEeSFEt9m3bH63A">

-            <body>activity 'Sensor$method$1'(in count: Integer): Sensor {

-if (this.'Sensor$initializationFlag$1' == null) {

-this.'Sensor$initialization$1'();

-this.count = count; 

-}

-return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mQIKHEeSFEt9m3bH63A" name="count">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mQYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mQoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mQ4KHEeSFEt9m3bH63A" name="" type="_Ce0mNIKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mRIKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mRYKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mc4KHEeSFEt9m3bH63A" name="getNextReading$method$1" visibility="protected" specification="_Ce0mRoKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eVoKHEeSFEt9m3bH63A" annotatedElement="_Ce0mc4KHEeSFEt9m3bH63A">

-            <body>activity 'getNextReading$method$1'(): Reading[0..1] { return new Reading(-- this.count);

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mdIKHEeSFEt9m3bH63A" type="_Ce0mSoKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mdYKHEeSFEt9m3bH63A"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mdoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0meoKHEeSFEt9m3bH63A" name="Sensor$initialization$1" visibility="protected" specification="_Ce0me4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m2YKHEeSFEt9m3bH63A" annotatedElement="_Ce0meoKHEeSFEt9m3bH63A">

-            <body>activity 'Sensor$initialization$1'(){

-  if (this.'Sensor$initializationFlag$1' == null) {

-    this.'Sensor$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mfIKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mfYKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mx4KHEeSFEt9m3bH63A" annotatedElement="_Ce0mfIKHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mOIKHEeSFEt9m3bH63A" name="Sensor" visibility="public" method="_Ce0mP4KHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mOYKHEeSFEt9m3bH63A" name="count">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mOoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mO4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mPIKHEeSFEt9m3bH63A" name="" type="_Ce0mNIKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mPYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mPoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mRoKHEeSFEt9m3bH63A" name="getNextReading" visibility="public" method="_Ce0mc4KHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mR4KHEeSFEt9m3bH63A" type="_Ce0mSoKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mSIKHEeSFEt9m3bH63A"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mSYKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0me4KHEeSFEt9m3bH63A" name="Sensor$initialization$1" visibility="protected" method="_Ce0meoKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mfYKHEeSFEt9m3bH63A" name="destroy" method="_Ce0mfIKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0mSoKHEeSFEt9m3bH63A" name="Reading" visibility="package">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mS4KHEeSFEt9m3bH63A" name="value" visibility="private">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mTIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mTYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mbIKHEeSFEt9m3bH63A" name="Reading$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mbYKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mboKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mVYKHEeSFEt9m3bH63A" name="Reading$method$1" visibility="protected" specification="_Ce0mToKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0myoKHEeSFEt9m3bH63A" annotatedElement="_Ce0mVYKHEeSFEt9m3bH63A">

-            <body>activity 'Reading$method$1'(in value: Integer): Reading {

-if (this.'Reading$initializationFlag$1' == null) {

-this.'Reading$initialization$1'();

-this.value = value; 

-}

-return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mVoKHEeSFEt9m3bH63A" name="value">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mV4KHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mWIKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mWYKHEeSFEt9m3bH63A" name="" type="_Ce0mSoKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mWoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mW4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mYIKHEeSFEt9m3bH63A" name="isFinal$method$1" visibility="protected" specification="_Ce0mXIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m3IKHEeSFEt9m3bH63A" annotatedElement="_Ce0mYIKHEeSFEt9m3bH63A">

-            <body>activity 'isFinal$method$1'(): Boolean { return this.value &lt;= 0;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mYYKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mYoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mY4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0maIKHEeSFEt9m3bH63A" name="getValue$method$1" visibility="protected" specification="_Ce0mZIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mzIKHEeSFEt9m3bH63A" annotatedElement="_Ce0maIKHEeSFEt9m3bH63A">

-            <body>activity 'getValue$method$1'(): Integer { return this.value;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0maYKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0maoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0ma4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mb4KHEeSFEt9m3bH63A" name="Reading$initialization$1" visibility="protected" specification="_Ce0mcIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eVIKHEeSFEt9m3bH63A" annotatedElement="_Ce0mb4KHEeSFEt9m3bH63A">

-            <body>activity 'Reading$initialization$1'(){

-  if (this.'Reading$initializationFlag$1' == null) {

-    this.'Reading$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mcYKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mcoKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m1IKHEeSFEt9m3bH63A" annotatedElement="_Ce0mcYKHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mToKHEeSFEt9m3bH63A" name="Reading" visibility="public" method="_Ce0mVYKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mT4KHEeSFEt9m3bH63A" name="value">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mUIKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mUYKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mUoKHEeSFEt9m3bH63A" name="" type="_Ce0mSoKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mU4KHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mVIKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mXIKHEeSFEt9m3bH63A" name="isFinal" visibility="public" method="_Ce0mYIKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mXYKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mXoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mX4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mZIKHEeSFEt9m3bH63A" name="getValue" visibility="public" method="_Ce0maIKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mZYKHEeSFEt9m3bH63A" direction="return">

-            <name xsi:nil="true"/>

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mZoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mZ4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mcIKHEeSFEt9m3bH63A" name="Reading$initialization$1" visibility="protected" method="_Ce0mb4KHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mcoKHEeSFEt9m3bH63A" name="destroy" method="_Ce0mcYKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A_m10YKHEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A_m10oKHEeSFEt9m3bH63A" 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="_DmMRELeOEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eV4KHEeSFEt9m3bH63A" base_Comment="_Ce0myIKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eWIKHEeSFEt9m3bH63A" base_Comment="_Ce0m1oKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_Ce5eWYKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mToKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eWoKHEeSFEt9m3bH63A" base_Comment="_Ce0mzIKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_Ce5eW4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mE4KHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eXIKHEeSFEt9m3bH63A" base_Comment="_Ce0myYKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eXYKHEeSFEt9m3bH63A" base_Comment="_Ce0mz4KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eXoKHEeSFEt9m3bH63A" base_Comment="_Ce5eUoKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_Ce5eX4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0l4IKHEeSFEt9m3bH63A"/>

-  <standard:Destroy xmi:id="_Ce5eYIKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0l5YKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eYYKHEeSFEt9m3bH63A" base_Comment="_Ce0m2oKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eYoKHEeSFEt9m3bH63A" base_Comment="_Ce0m24KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eY4KHEeSFEt9m3bH63A" base_Comment="_Ce5eVoKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eZIKHEeSFEt9m3bH63A" base_Comment="_Ce0m04KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eZYKHEeSFEt9m3bH63A" base_Comment="_Ce0mx4KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eZoKHEeSFEt9m3bH63A" base_Comment="_Ce0m1YKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_Ce5eZ4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mxIKHEeSFEt9m3bH63A"/>

-  <standard:Destroy xmi:id="_Ce5eaIKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mcoKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eaYKHEeSFEt9m3bH63A" base_Comment="_Ce5eUYKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eaoKHEeSFEt9m3bH63A" base_Comment="_Ce0m0YKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_Ce5ea4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mfYKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ebIKHEeSFEt9m3bH63A" base_Comment="_Ce0m3IKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ebYKHEeSFEt9m3bH63A" base_Comment="_Ce0m0oKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_Ce5eboKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mv4KHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eb4KHEeSFEt9m3bH63A" base_Comment="_Ce0m14KHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_Ce5ecIKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mOIKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ecYKHEeSFEt9m3bH63A" base_Comment="_Ce0m0IKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_Ce5ecoKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mM4KHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ec4KHEeSFEt9m3bH63A" base_Comment="_Ce0m2YKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_Ce5edIKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mEoKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5edYKHEeSFEt9m3bH63A" base_Comment="_Ce5eU4KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5edoKHEeSFEt9m3bH63A" base_Comment="_Ce5eUIKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_Ce5ed4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0l9oKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eeIKHEeSFEt9m3bH63A" base_Comment="_Ce0mzYKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eeYKHEeSFEt9m3bH63A" base_Comment="_Ce0m2IKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eeoKHEeSFEt9m3bH63A" base_Comment="_Ce5eVYKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ee4KHEeSFEt9m3bH63A" base_Comment="_Ce0myoKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5efIKHEeSFEt9m3bH63A" base_Comment="_Ce5eVIKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5efYKHEeSFEt9m3bH63A" base_Comment="_Ce0mzoKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5efoKHEeSFEt9m3bH63A" base_Comment="_Ce0m1IKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ef4KHEeSFEt9m3bH63A" base_Comment="_Ce0my4KHEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_A_m10IKHEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Ce0l0IKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping" classifierBehavior="_Ce0mxYKHEeSFEt9m3bH63A" isActive="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mxoKHEeSFEt9m3bH63A" annotatedElement="_Ce0l0IKHEeSFEt9m3bH63A">
+        <body>&#xD;
+ * Test while and do statements.&#xD;
+ *</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l0YKHEeSFEt9m3bH63A" name="list" visibility="package" type="_Ce0l1IKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l0oKHEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l04KHEeSFEt9m3bH63A" value="*"/>
+        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_Ce0l5oKHEeSFEt9m3bH63A" behavior="_Ce0l54KHEeSFEt9m3bH63A"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mtoKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mt4KHEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0muIKHEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mmoKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_Ce0mfoKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mzoKHEeSFEt9m3bH63A" annotatedElement="_Ce0mmoKHEeSFEt9m3bH63A">
+          <body>activity 'test$method$1'(out count: Integer, out checksum: Integer, out nextRecord: FileRecord[0..1], out file: File, out lines: String[0..*] sequence, out readings: Reading[0..*] sequence, out i: Integer, out j: Integer, out self: Statements_While_Do_Looping) { count = 0;
+checksum = 0;
+file = new File();
+endMarker = file.endMarker;
+sensor = new Sensor(2);
+lines = null;
+readings = null;
+i = 4;
+j = 0;
+while ((last = this.list->size()) > 0) { this.list[last].cleanUp();
+this.list->removeAt(last);
+++ count;
+} continue = true;
+while (continue) { nextRecord = file.readNext();
+if (! nextRecord->isEmpty()) { checksum = checksum + 1;
+} continue = file.hasMore();
+} file.reset();
+do { line = file.readNext();
+lines->add(line.toString());
+} while (line != endMarker);
+do { nextReading = sensor.getNextReading();
+readings->add(nextReading.getValue());
+} while (! nextReading.isFinal());
+do { if (i &lt;= 2) { break;
+} -- i;
+} while (true);
+do { ++ j;
+if (j > 2) { break;
+} } while (true);
+self = this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mm4KHEeSFEt9m3bH63A" name="count" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mnIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mnYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mnoKHEeSFEt9m3bH63A" name="checksum" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mn4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0moIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0moYKHEeSFEt9m3bH63A" name="nextRecord" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mooKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mo4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mpIKHEeSFEt9m3bH63A" name="file" type="_Ce0l64KHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mpYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mpoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mp4KHEeSFEt9m3bH63A" name="lines" isOrdered="true" isUnique="false" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mqIKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mqYKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mqoKHEeSFEt9m3bH63A" name="readings" type="_Ce0mSoKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mq4KHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mrIKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mrYKHEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mroKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mr4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0msIKHEeSFEt9m3bH63A" name="j" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0msYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0msoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0ms4KHEeSFEt9m3bH63A" name="self" type="_Ce0l0IKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mtIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mtYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l54KHEeSFEt9m3bH63A" name="list$defaultValue$1">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m14KHEeSFEt9m3bH63A" annotatedElement="_Ce0l54KHEeSFEt9m3bH63A">
+          <body>activity 'list$defaultValue$1'(): Monitor[0..*] sequence {
+	return  { new Monitor(), new Monitor() };
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l6IKHEeSFEt9m3bH63A" type="_Ce0l1IKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l6YKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l6oKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0muYKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$initialization$1" visibility="protected" specification="_Ce0muoKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0myIKHEeSFEt9m3bH63A" annotatedElement="_Ce0muYKHEeSFEt9m3bH63A">
+          <body>activity 'Statements_While_Do_Looping$initialization$1'(){
+  if (this.'Statements_While_Do_Looping$initializationFlag$1' == null) {
+    this.list = 'list$defaultValue$1'();
+    this.'Statements_While_Do_Looping$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mu4KHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$method$1" specification="_Ce0mv4KHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m0IKHEeSFEt9m3bH63A" annotatedElement="_Ce0mu4KHEeSFEt9m3bH63A">
+          <body>activity 'Statements_While_Do_Looping$method$1'(): Statements_While_Do_Looping {
+	this.'Statements_While_Do_Looping$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mvIKHEeSFEt9m3bH63A" type="_Ce0l0IKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mvYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mvoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mw4KHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mxIKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m0oKHEeSFEt9m3bH63A" annotatedElement="_Ce0mw4KHEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mxYKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m04KHEeSFEt9m3bH63A" annotatedElement="_Ce0mxYKHEeSFEt9m3bH63A">
+          <body>activity 'Statements_While_Do_Looping$behavior$1'() { this.test(count, checksum, nextRecord, file, lines, readings, i, j, self);
+AssertEqual(&quot;count&quot;, count, 2);
+AssertEqual(&quot;checksum&quot;, checksum, 1);
+AssertEqual(&quot;nextRecord.label&quot;, nextRecord.label, &quot;Record&quot;);
+AssertList(&quot;lines&quot;, lines, new String [] { &quot;Record&quot;, &quot;End&quot; });
+AssertList(&quot;readings&quot;, readings, new Integer [] { 2, 1, 0 });
+AssertEqual(&quot;i&quot;, i, 2);
+AssertEqual(&quot;j&quot;, j, 3);
+AssertTrue(&quot;self.list->isEmpty()&quot;, self.list->isEmpty());
+WriteLine(&quot;Done&quot;);
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mfoKHEeSFEt9m3bH63A" name="test" visibility="package" method="_Ce0mmoKHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mf4KHEeSFEt9m3bH63A" name="count" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mgIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mgYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mgoKHEeSFEt9m3bH63A" name="checksum" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mg4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mhIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mhYKHEeSFEt9m3bH63A" name="nextRecord" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mhoKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mh4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0miIKHEeSFEt9m3bH63A" name="file" type="_Ce0l64KHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0miYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mioKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mi4KHEeSFEt9m3bH63A" name="lines" isOrdered="true" isUnique="false" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mjIKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mjYKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mjoKHEeSFEt9m3bH63A" name="readings" type="_Ce0mSoKHEeSFEt9m3bH63A" isOrdered="true" isUnique="false" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mj4KHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mkIKHEeSFEt9m3bH63A" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mkYKHEeSFEt9m3bH63A" name="i" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mkoKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mk4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mlIKHEeSFEt9m3bH63A" name="j" direction="out">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mlYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mloKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0ml4KHEeSFEt9m3bH63A" name="self" type="_Ce0l0IKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mmIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mmYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0muoKHEeSFEt9m3bH63A" name="Statements_While_Do_Looping$initialization$1" visibility="protected" method="_Ce0muYKHEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mv4KHEeSFEt9m3bH63A" name="Statements_While_Do_Looping" method="_Ce0mu4KHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mwIKHEeSFEt9m3bH63A" type="_Ce0l0IKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mwYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mwoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mxIKHEeSFEt9m3bH63A" name="destroy" method="_Ce0mw4KHEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0l1IKHEeSFEt9m3bH63A" name="Monitor" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l14KHEeSFEt9m3bH63A" name="Monitor$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l2IKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l2YKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l1oKHEeSFEt9m3bH63A" name="cleanUp$method$1" visibility="protected" specification="_Ce0l1YKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m2IKHEeSFEt9m3bH63A" annotatedElement="_Ce0l1oKHEeSFEt9m3bH63A">
+            <body>activity 'cleanUp$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l2oKHEeSFEt9m3bH63A" name="Monitor$initialization$1" visibility="protected" specification="_Ce0l24KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m1oKHEeSFEt9m3bH63A" annotatedElement="_Ce0l2oKHEeSFEt9m3bH63A">
+            <body>activity 'Monitor$initialization$1'(){
+  if (this.'Monitor$initializationFlag$1' == null) {
+    this.'Monitor$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l3IKHEeSFEt9m3bH63A" name="Monitor$method$1" specification="_Ce0l4IKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eUoKHEeSFEt9m3bH63A" annotatedElement="_Ce0l3IKHEeSFEt9m3bH63A">
+            <body>activity 'Monitor$method$1'(): Monitor {
+	this.'Monitor$initialization$1'();
+	return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l3YKHEeSFEt9m3bH63A" type="_Ce0l1IKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l3oKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l34KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l5IKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0l5YKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eU4KHEeSFEt9m3bH63A" annotatedElement="_Ce0l5IKHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l1YKHEeSFEt9m3bH63A" name="cleanUp" visibility="public" method="_Ce0l1oKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l24KHEeSFEt9m3bH63A" name="Monitor$initialization$1" visibility="protected" method="_Ce0l2oKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l4IKHEeSFEt9m3bH63A" name="Monitor" method="_Ce0l3IKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l4YKHEeSFEt9m3bH63A" type="_Ce0l1IKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l4oKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l44KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l5YKHEeSFEt9m3bH63A" name="destroy" method="_Ce0l5IKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0l64KHEeSFEt9m3bH63A" name="File" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l7IKHEeSFEt9m3bH63A" name="more" visibility="private">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l7YKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l7oKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l74KHEeSFEt9m3bH63A" name="endMarker" visibility="public" type="_Ce0l8oKHEeSFEt9m3bH63A">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l8IKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l8YKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mLYKHEeSFEt9m3bH63A" name="File$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mLoKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mL4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mF4KHEeSFEt9m3bH63A" name="File$method$1" visibility="protected" specification="_Ce0mE4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mzYKHEeSFEt9m3bH63A" annotatedElement="_Ce0mF4KHEeSFEt9m3bH63A">
+            <body>activity 'File$method$1'(): File {
+if (this.'File$initializationFlag$1' == null) {
+this.'File$initialization$1'();
+this.more = true; this.endMarker = new FileRecord(&quot;End&quot;); 
+}
+return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mGIKHEeSFEt9m3bH63A" name="" type="_Ce0l64KHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mGYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mGoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mH4KHEeSFEt9m3bH63A" name="hasMore$method$1" visibility="protected" specification="_Ce0mG4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eUIKHEeSFEt9m3bH63A" annotatedElement="_Ce0mH4KHEeSFEt9m3bH63A">
+            <body>activity 'hasMore$method$1'(): Boolean { return this.more;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mIIKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mIYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mIoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mJ4KHEeSFEt9m3bH63A" name="readNext$method$1" visibility="protected" specification="_Ce0mI4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eVYKHEeSFEt9m3bH63A" annotatedElement="_Ce0mJ4KHEeSFEt9m3bH63A">
+            <body>activity 'readNext$method$1'(): FileRecord[0..1] { if (this.more) { this.more = false;
+return new FileRecord(&quot;Record&quot;);
+} else { return this.endMarker;
+} }</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mKIKHEeSFEt9m3bH63A" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mKYKHEeSFEt9m3bH63A"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mKoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mLIKHEeSFEt9m3bH63A" name="reset$method$1" visibility="protected" specification="_Ce0mK4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m0YKHEeSFEt9m3bH63A" annotatedElement="_Ce0mLIKHEeSFEt9m3bH63A">
+            <body>activity 'reset$method$1'() { this.more = true;
+}</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mMIKHEeSFEt9m3bH63A" name="File$initialization$1" visibility="protected" specification="_Ce0mMYKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0my4KHEeSFEt9m3bH63A" annotatedElement="_Ce0mMIKHEeSFEt9m3bH63A">
+            <body>activity 'File$initialization$1'(){
+  if (this.'File$initializationFlag$1' == null) {
+    this.'File$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mMoKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mM4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m1YKHEeSFEt9m3bH63A" annotatedElement="_Ce0mMoKHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mE4KHEeSFEt9m3bH63A" name="File" visibility="public" method="_Ce0mF4KHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mFIKHEeSFEt9m3bH63A" name="" type="_Ce0l64KHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mFYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mFoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mG4KHEeSFEt9m3bH63A" name="hasMore" visibility="public" method="_Ce0mH4KHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mHIKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mHYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mHoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mI4KHEeSFEt9m3bH63A" name="readNext" visibility="public" method="_Ce0mJ4KHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mJIKHEeSFEt9m3bH63A" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mJYKHEeSFEt9m3bH63A"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mJoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mK4KHEeSFEt9m3bH63A" name="reset" visibility="public" method="_Ce0mLIKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mMYKHEeSFEt9m3bH63A" name="File$initialization$1" visibility="protected" method="_Ce0mMIKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mM4KHEeSFEt9m3bH63A" name="destroy" method="_Ce0mMoKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0l8oKHEeSFEt9m3bH63A" name="FileRecord" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0l84KHEeSFEt9m3bH63A" name="label" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l9IKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l9YKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mDIKHEeSFEt9m3bH63A" name="FileRecord$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mDYKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mDoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0l_YKHEeSFEt9m3bH63A" name="FileRecord$method$1" visibility="protected" specification="_Ce0l9oKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m24KHEeSFEt9m3bH63A" annotatedElement="_Ce0l_YKHEeSFEt9m3bH63A">
+            <body>activity 'FileRecord$method$1'(in label: String): FileRecord {
+if (this.'FileRecord$initializationFlag$1' == null) {
+this.'FileRecord$initialization$1'();
+this.label = label; 
+}
+return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l_oKHEeSFEt9m3bH63A" name="label">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l_4KHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mAIKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mAYKHEeSFEt9m3bH63A" name="" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mAoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mA4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mCIKHEeSFEt9m3bH63A" name="toString$method$1" visibility="protected" specification="_Ce0mBIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m2oKHEeSFEt9m3bH63A" annotatedElement="_Ce0mCIKHEeSFEt9m3bH63A">
+            <body>activity 'toString$method$1'(): String { return this.label;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mCYKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mCoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mC4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mD4KHEeSFEt9m3bH63A" name="FileRecord$initialization$1" visibility="protected" specification="_Ce0mEIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mz4KHEeSFEt9m3bH63A" annotatedElement="_Ce0mD4KHEeSFEt9m3bH63A">
+            <body>activity 'FileRecord$initialization$1'(){
+  if (this.'FileRecord$initializationFlag$1' == null) {
+    this.'FileRecord$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mEYKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mEoKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eUYKHEeSFEt9m3bH63A" annotatedElement="_Ce0mEYKHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0l9oKHEeSFEt9m3bH63A" name="FileRecord" visibility="public" method="_Ce0l_YKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l94KHEeSFEt9m3bH63A" name="label">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l-IKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l-YKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0l-oKHEeSFEt9m3bH63A" name="" type="_Ce0l8oKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0l-4KHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0l_IKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mBIKHEeSFEt9m3bH63A" name="toString" visibility="public" method="_Ce0mCIKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mBYKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mBoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mB4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mEIKHEeSFEt9m3bH63A" name="FileRecord$initialization$1" visibility="protected" method="_Ce0mD4KHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mEoKHEeSFEt9m3bH63A" name="destroy" method="_Ce0mEYKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0mNIKHEeSFEt9m3bH63A" name="Sensor" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mNYKHEeSFEt9m3bH63A" name="count" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mNoKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mN4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0md4KHEeSFEt9m3bH63A" name="Sensor$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0meIKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0meYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mP4KHEeSFEt9m3bH63A" name="Sensor$method$1" visibility="protected" specification="_Ce0mOIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0myYKHEeSFEt9m3bH63A" annotatedElement="_Ce0mP4KHEeSFEt9m3bH63A">
+            <body>activity 'Sensor$method$1'(in count: Integer): Sensor {
+if (this.'Sensor$initializationFlag$1' == null) {
+this.'Sensor$initialization$1'();
+this.count = count; 
+}
+return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mQIKHEeSFEt9m3bH63A" name="count">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mQYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mQoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mQ4KHEeSFEt9m3bH63A" name="" type="_Ce0mNIKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mRIKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mRYKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mc4KHEeSFEt9m3bH63A" name="getNextReading$method$1" visibility="protected" specification="_Ce0mRoKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eVoKHEeSFEt9m3bH63A" annotatedElement="_Ce0mc4KHEeSFEt9m3bH63A">
+            <body>activity 'getNextReading$method$1'(): Reading[0..1] { return new Reading(-- this.count);
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mdIKHEeSFEt9m3bH63A" type="_Ce0mSoKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mdYKHEeSFEt9m3bH63A"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mdoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0meoKHEeSFEt9m3bH63A" name="Sensor$initialization$1" visibility="protected" specification="_Ce0me4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m2YKHEeSFEt9m3bH63A" annotatedElement="_Ce0meoKHEeSFEt9m3bH63A">
+            <body>activity 'Sensor$initialization$1'(){
+  if (this.'Sensor$initializationFlag$1' == null) {
+    this.'Sensor$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mfIKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mfYKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mx4KHEeSFEt9m3bH63A" annotatedElement="_Ce0mfIKHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mOIKHEeSFEt9m3bH63A" name="Sensor" visibility="public" method="_Ce0mP4KHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mOYKHEeSFEt9m3bH63A" name="count">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mOoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mO4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mPIKHEeSFEt9m3bH63A" name="" type="_Ce0mNIKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mPYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mPoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mRoKHEeSFEt9m3bH63A" name="getNextReading" visibility="public" method="_Ce0mc4KHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mR4KHEeSFEt9m3bH63A" type="_Ce0mSoKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mSIKHEeSFEt9m3bH63A"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mSYKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0me4KHEeSFEt9m3bH63A" name="Sensor$initialization$1" visibility="protected" method="_Ce0meoKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mfYKHEeSFEt9m3bH63A" name="destroy" method="_Ce0mfIKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_Ce0mSoKHEeSFEt9m3bH63A" name="Reading" visibility="package">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mS4KHEeSFEt9m3bH63A" name="value" visibility="private">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mTIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mTYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ce0mbIKHEeSFEt9m3bH63A" name="Reading$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mbYKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mboKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mVYKHEeSFEt9m3bH63A" name="Reading$method$1" visibility="protected" specification="_Ce0mToKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0myoKHEeSFEt9m3bH63A" annotatedElement="_Ce0mVYKHEeSFEt9m3bH63A">
+            <body>activity 'Reading$method$1'(in value: Integer): Reading {
+if (this.'Reading$initializationFlag$1' == null) {
+this.'Reading$initialization$1'();
+this.value = value; 
+}
+return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mVoKHEeSFEt9m3bH63A" name="value">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mV4KHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mWIKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mWYKHEeSFEt9m3bH63A" name="" type="_Ce0mSoKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mWoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mW4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mYIKHEeSFEt9m3bH63A" name="isFinal$method$1" visibility="protected" specification="_Ce0mXIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m3IKHEeSFEt9m3bH63A" annotatedElement="_Ce0mYIKHEeSFEt9m3bH63A">
+            <body>activity 'isFinal$method$1'(): Boolean { return this.value &lt;= 0;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mYYKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mYoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mY4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0maIKHEeSFEt9m3bH63A" name="getValue$method$1" visibility="protected" specification="_Ce0mZIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0mzIKHEeSFEt9m3bH63A" annotatedElement="_Ce0maIKHEeSFEt9m3bH63A">
+            <body>activity 'getValue$method$1'(): Integer { return this.value;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0maYKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0maoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0ma4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mb4KHEeSFEt9m3bH63A" name="Reading$initialization$1" visibility="protected" specification="_Ce0mcIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5eVIKHEeSFEt9m3bH63A" annotatedElement="_Ce0mb4KHEeSFEt9m3bH63A">
+            <body>activity 'Reading$initialization$1'(){
+  if (this.'Reading$initializationFlag$1' == null) {
+    this.'Reading$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_Ce0mcYKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_Ce0mcoKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Ce0m1IKHEeSFEt9m3bH63A" annotatedElement="_Ce0mcYKHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mToKHEeSFEt9m3bH63A" name="Reading" visibility="public" method="_Ce0mVYKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mT4KHEeSFEt9m3bH63A" name="value">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mUIKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mUYKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mUoKHEeSFEt9m3bH63A" name="" type="_Ce0mSoKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mU4KHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mVIKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mXIKHEeSFEt9m3bH63A" name="isFinal" visibility="public" method="_Ce0mYIKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mXYKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mXoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mX4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mZIKHEeSFEt9m3bH63A" name="getValue" visibility="public" method="_Ce0maIKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ce0mZYKHEeSFEt9m3bH63A" direction="return">
+            <name xsi:nil="true"/>
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ce0mZoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ce0mZ4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mcIKHEeSFEt9m3bH63A" name="Reading$initialization$1" visibility="protected" method="_Ce0mb4KHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Ce0mcoKHEeSFEt9m3bH63A" name="destroy" method="_Ce0mcYKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A_m10YKHEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A_m10oKHEeSFEt9m3bH63A" 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="_DmMRELeOEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DmM4ILeOEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eV4KHEeSFEt9m3bH63A" base_Comment="_Ce0myIKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eWIKHEeSFEt9m3bH63A" base_Comment="_Ce0m1oKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_Ce5eWYKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mToKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eWoKHEeSFEt9m3bH63A" base_Comment="_Ce0mzIKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_Ce5eW4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mE4KHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eXIKHEeSFEt9m3bH63A" base_Comment="_Ce0myYKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eXYKHEeSFEt9m3bH63A" base_Comment="_Ce0mz4KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eXoKHEeSFEt9m3bH63A" base_Comment="_Ce5eUoKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_Ce5eX4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0l4IKHEeSFEt9m3bH63A"/>
+  <standard:Destroy xmi:id="_Ce5eYIKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0l5YKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eYYKHEeSFEt9m3bH63A" base_Comment="_Ce0m2oKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eYoKHEeSFEt9m3bH63A" base_Comment="_Ce0m24KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eY4KHEeSFEt9m3bH63A" base_Comment="_Ce5eVoKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eZIKHEeSFEt9m3bH63A" base_Comment="_Ce0m04KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eZYKHEeSFEt9m3bH63A" base_Comment="_Ce0mx4KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eZoKHEeSFEt9m3bH63A" base_Comment="_Ce0m1YKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_Ce5eZ4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mxIKHEeSFEt9m3bH63A"/>
+  <standard:Destroy xmi:id="_Ce5eaIKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mcoKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eaYKHEeSFEt9m3bH63A" base_Comment="_Ce5eUYKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eaoKHEeSFEt9m3bH63A" base_Comment="_Ce0m0YKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_Ce5ea4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mfYKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ebIKHEeSFEt9m3bH63A" base_Comment="_Ce0m3IKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ebYKHEeSFEt9m3bH63A" base_Comment="_Ce0m0oKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_Ce5eboKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mv4KHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eb4KHEeSFEt9m3bH63A" base_Comment="_Ce0m14KHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_Ce5ecIKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mOIKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ecYKHEeSFEt9m3bH63A" base_Comment="_Ce0m0IKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_Ce5ecoKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mM4KHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ec4KHEeSFEt9m3bH63A" base_Comment="_Ce0m2YKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_Ce5edIKHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0mEoKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5edYKHEeSFEt9m3bH63A" base_Comment="_Ce5eU4KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5edoKHEeSFEt9m3bH63A" base_Comment="_Ce5eUIKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_Ce5ed4KHEeSFEt9m3bH63A" base_BehavioralFeature="_Ce0l9oKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eeIKHEeSFEt9m3bH63A" base_Comment="_Ce0mzYKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eeYKHEeSFEt9m3bH63A" base_Comment="_Ce0m2IKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5eeoKHEeSFEt9m3bH63A" base_Comment="_Ce5eVYKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ee4KHEeSFEt9m3bH63A" base_Comment="_Ce0myoKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5efIKHEeSFEt9m3bH63A" base_Comment="_Ce5eVIKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5efYKHEeSFEt9m3bH63A" base_Comment="_Ce0mzoKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5efoKHEeSFEt9m3bH63A" base_Comment="_Ce0m1IKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_Ce5ef4KHEeSFEt9m3bH63A" base_Comment="_Ce0my4KHEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Test_EmptyAssociationName.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Test_EmptyAssociationName.uml
index 6e1204ecb7a..35629ad1cca 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Test_EmptyAssociationName.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Test_EmptyAssociationName.uml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_U-RRoKiwEeSnxYSoNvE-fw" name="Model">

-  <packagedElement xmi:type="uml:Package" xmi:id="_V-Nu4Ki0EeSNMu29jvDdkA" name="Test_EmptyAssociationName">

-    <packagedElement xmi:type="uml:Association" xmi:id="_ewXhAKi0EeSNMu29jvDdkA" memberEnd="_f_m7UKi0EeSNMu29jvDdkA _mSHbMKi0EeSNMu29jvDdkA">

-      <ownedEnd xmi:type="uml:Property" xmi:id="_f_m7UKi0EeSNMu29jvDdkA" name="First" type="_UFf1kKi7EeSNMu29jvDdkA" association="_ewXhAKi0EeSNMu29jvDdkA"/>

-      <ownedEnd xmi:type="uml:Property" xmi:id="_mSHbMKi0EeSNMu29jvDdkA" name="Second" type="_Ws9AAKi7EeSNMu29jvDdkA" association="_ewXhAKi0EeSNMu29jvDdkA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_UFf1kKi7EeSNMu29jvDdkA" name="A"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_Ws9AAKi7EeSNMu29jvDdkA" name="B"/>

-  </packagedElement>

-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_U-RRoaiwEeSnxYSoNvE-fw">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rSykEoKGEeSFEt9m3bH63A" 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="_U-RRo6iwEeSnxYSoNvE-fw">

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

-      <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-    </eAnnotations>

-    <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-  </profileApplication>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_U-RRoKiwEeSnxYSoNvE-fw" name="Model">
+  <packagedElement xmi:type="uml:Package" xmi:id="_V-Nu4Ki0EeSNMu29jvDdkA" name="Test_EmptyAssociationName">
+    <packagedElement xmi:type="uml:Association" xmi:id="_ewXhAKi0EeSNMu29jvDdkA" memberEnd="_f_m7UKi0EeSNMu29jvDdkA _mSHbMKi0EeSNMu29jvDdkA">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_f_m7UKi0EeSNMu29jvDdkA" name="First" type="_UFf1kKi7EeSNMu29jvDdkA" association="_ewXhAKi0EeSNMu29jvDdkA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_mSHbMKi0EeSNMu29jvDdkA" name="Second" type="_Ws9AAKi7EeSNMu29jvDdkA" association="_ewXhAKi0EeSNMu29jvDdkA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_UFf1kKi7EeSNMu29jvDdkA" name="A"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Ws9AAKi7EeSNMu29jvDdkA" name="B"/>
+  </packagedElement>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_U-RRoaiwEeSnxYSoNvE-fw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rSykEoKGEeSFEt9m3bH63A" 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="_U-RRo6iwEeSnxYSoNvE-fw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eu1Q8LeKEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+  </profileApplication>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Units_ActiveClass.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Units_ActiveClass.uml
index c0a50d93776..98a8094b2fb 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Units_ActiveClass.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Units_ActiveClass.uml
@@ -1,242 +1,242 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_CfwZ8IKHEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_C6rbYIKHEeSFEt9m3bH63A" name="Units_ActiveClass" classifierBehavior="_C6rbs4KHEeSFEt9m3bH63A" isActive="true">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbtIKHEeSFEt9m3bH63A" annotatedElement="_C6rbYIKHEeSFEt9m3bH63A">

-        <body>

- * Test active class instantiation

- </body>

-      </ownedComment>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbpIKHEeSFEt9m3bH63A" name="Units_ActiveClass$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbpYKHEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbpoKHEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbp4KHEeSFEt9m3bH63A" name="Units_ActiveClass$initialization$1" visibility="protected" specification="_C6rbqIKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbuoKHEeSFEt9m3bH63A" annotatedElement="_C6rbp4KHEeSFEt9m3bH63A">

-          <body>activity 'Units_ActiveClass$initialization$1'(){

-  if (this.'Units_ActiveClass$initializationFlag$1' == null) {

-    this.'Units_ActiveClass$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbqYKHEeSFEt9m3bH63A" name="Units_ActiveClass$method$1" specification="_C6rbrYKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbvYKHEeSFEt9m3bH63A" annotatedElement="_C6rbqYKHEeSFEt9m3bH63A">

-          <body>activity 'Units_ActiveClass$method$1'(): Units_ActiveClass {

-	this.'Units_ActiveClass$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbqoKHEeSFEt9m3bH63A" type="_C6rbYIKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbq4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbrIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbsYKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_C6rbsoKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbvIKHEeSFEt9m3bH63A" annotatedElement="_C6rbsYKHEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbs4KHEeSFEt9m3bH63A" name="Units_ActiveClass$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbu4KHEeSFEt9m3bH63A" annotatedElement="_C6rbs4KHEeSFEt9m3bH63A">

-          <body>activity 'Units_ActiveClass$behavior$1'() { new TestRunner().Start();

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbqIKHEeSFEt9m3bH63A" name="Units_ActiveClass$initialization$1" visibility="protected" method="_C6rbp4KHEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbrYKHEeSFEt9m3bH63A" name="Units_ActiveClass" method="_C6rbqYKHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbroKHEeSFEt9m3bH63A" type="_C6rbYIKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbr4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbsIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbsoKHEeSFEt9m3bH63A" name="destroy" method="_C6rbsYKHEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_C6rbYYKHEeSFEt9m3bH63A" name="C" classifierBehavior="_C6rbo4KHEeSFEt9m3bH63A" isActive="true">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbYoKHEeSFEt9m3bH63A" name="i" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbY4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbZIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbZYKHEeSFEt9m3bH63A" name="j" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbZoKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbZ4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbaIKHEeSFEt9m3bH63A" name="t" visibility="public" type="_C6rba4KHEeSFEt9m3bH63A">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbaYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbaoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbnIKHEeSFEt9m3bH63A" name="C$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbnYKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbnoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbkoKHEeSFEt9m3bH63A" name="C$method$1" visibility="protected" specification="_C6rbiIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbuYKHEeSFEt9m3bH63A" annotatedElement="_C6rbkoKHEeSFEt9m3bH63A">

-            <body>activity 'C$method$1'(in i: Integer, in t: TestRunner): C {

-if (this.'C$initializationFlag$1' == null) {

-this.'C$initialization$1'();

-this.i = i; this.t = t; 

-}

-return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbk4KHEeSFEt9m3bH63A" name="i">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rblIKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rblYKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbloKHEeSFEt9m3bH63A" name="t" type="_C6rba4KHEeSFEt9m3bH63A">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbl4KHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbmIKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbmYKHEeSFEt9m3bH63A" name="" type="_C6rbYYKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbmoKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbm4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbn4KHEeSFEt9m3bH63A" name="C$initialization$1" visibility="protected" specification="_C6rboIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbtoKHEeSFEt9m3bH63A" annotatedElement="_C6rbn4KHEeSFEt9m3bH63A">

-            <body>activity 'C$initialization$1'(){

-  if (this.'C$initializationFlag$1' == null) {

-    this.'C$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rboYKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_C6rbooKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbuIKHEeSFEt9m3bH63A" annotatedElement="_C6rboYKHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbo4KHEeSFEt9m3bH63A" name="C$behavior$1" visibility="private">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbvoKHEeSFEt9m3bH63A" annotatedElement="_C6rbo4KHEeSFEt9m3bH63A">

-            <body>activity 'C$behavior$1'() { $ (this.j = this.i);

-this.t.Continue();

-}</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbiIKHEeSFEt9m3bH63A" name="C" visibility="public" method="_C6rbkoKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbiYKHEeSFEt9m3bH63A" name="i">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbioKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbi4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbjIKHEeSFEt9m3bH63A" name="t" type="_C6rba4KHEeSFEt9m3bH63A">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbjYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbjoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbj4KHEeSFEt9m3bH63A" name="" type="_C6rbYYKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbkIKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbkYKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rboIKHEeSFEt9m3bH63A" name="C$initialization$1" visibility="protected" method="_C6rbn4KHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbooKHEeSFEt9m3bH63A" name="destroy" method="_C6rboYKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_C6rba4KHEeSFEt9m3bH63A" name="TestRunner" classifierBehavior="_C6rbh4KHEeSFEt9m3bH63A" isActive="true">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbdoKHEeSFEt9m3bH63A" name="TestRunner$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbd4KHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbeIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbcoKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_C6rbboKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbwYKHEeSFEt9m3bH63A" annotatedElement="_C6rbcoKHEeSFEt9m3bH63A">

-            <body>activity 'test$method$1'(out c: C) { c = new C(1, this);

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbc4KHEeSFEt9m3bH63A" name="c" type="_C6rbYYKHEeSFEt9m3bH63A" direction="out">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbdIKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbdYKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbeYKHEeSFEt9m3bH63A" name="TestRunner$initialization$1" visibility="protected" specification="_C6rbeoKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbwIKHEeSFEt9m3bH63A" annotatedElement="_C6rbeYKHEeSFEt9m3bH63A">

-            <body>activity 'TestRunner$initialization$1'(){

-  if (this.'TestRunner$initializationFlag$1' == null) {

-    this.'TestRunner$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbe4KHEeSFEt9m3bH63A" name="TestRunner$method$1" specification="_C6rbf4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbv4KHEeSFEt9m3bH63A" annotatedElement="_C6rbe4KHEeSFEt9m3bH63A">

-            <body>activity 'TestRunner$method$1'(): TestRunner {

-	this.'TestRunner$initialization$1'();

-	return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbfIKHEeSFEt9m3bH63A" type="_C6rba4KHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbfYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbfoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbg4KHEeSFEt9m3bH63A" name="destroy$method$1" specification="_C6rbhIKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbt4KHEeSFEt9m3bH63A" annotatedElement="_C6rbg4KHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbh4KHEeSFEt9m3bH63A" name="TestRunner$behavior$1" visibility="private">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbtYKHEeSFEt9m3bH63A" annotatedElement="_C6rbh4KHEeSFEt9m3bH63A">

-            <body>activity 'TestRunner$behavior$1'() { accept (Start);

-this.test(c);

-accept (Continue);

-AssertEqual(&quot;c.j&quot;, c.j, 1);

-WriteLine(&quot;Done&quot;);

-}</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbboKHEeSFEt9m3bH63A" name="test" visibility="public" method="_C6rbcoKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbb4KHEeSFEt9m3bH63A" name="c" type="_C6rbYYKHEeSFEt9m3bH63A" direction="out">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbcIKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbcYKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbeoKHEeSFEt9m3bH63A" name="TestRunner$initialization$1" visibility="protected" method="_C6rbeYKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbf4KHEeSFEt9m3bH63A" name="TestRunner" method="_C6rbe4KHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbgIKHEeSFEt9m3bH63A" type="_C6rba4KHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbgYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbgoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbhIKHEeSFEt9m3bH63A" name="destroy" method="_C6rbg4KHEeSFEt9m3bH63A"/>

-        <nestedClassifier xmi:type="uml:Signal" xmi:id="_C6rbbIKHEeSFEt9m3bH63A" name="Start"/>

-        <nestedClassifier xmi:type="uml:Signal" xmi:id="_C6rbbYKHEeSFEt9m3bH63A" name="Continue"/>

-        <ownedReception xmi:type="uml:Reception" xmi:id="_C6rbhYKHEeSFEt9m3bH63A" name="Start" visibility="public" signal="_C6rbbIKHEeSFEt9m3bH63A"/>

-        <ownedReception xmi:type="uml:Reception" xmi:id="_C6rbhoKHEeSFEt9m3bH63A" name="Continue" visibility="public" signal="_C6rbbYKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_CfwZ8YKHEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CfwZ8oKHEeSFEt9m3bH63A" 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="_eTvm4LeQEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <standard:Destroy xmi:id="_C6sCcIKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbsoKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCcYKHEeSFEt9m3bH63A" base_Comment="_C6rbtoKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCcoKHEeSFEt9m3bH63A" base_Comment="_C6rbtYKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCc4KHEeSFEt9m3bH63A" base_Comment="_C6rbu4KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCdIKHEeSFEt9m3bH63A" base_Comment="_C6rbvIKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCdYKHEeSFEt9m3bH63A" base_Comment="_C6rbv4KHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_C6sCdoKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbrYKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCd4KHEeSFEt9m3bH63A" base_Comment="_C6rbuoKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCeIKHEeSFEt9m3bH63A" base_Comment="_C6rbuIKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCeYKHEeSFEt9m3bH63A" base_Comment="_C6rbt4KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCeoKHEeSFEt9m3bH63A" base_Comment="_C6rbwIKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCe4KHEeSFEt9m3bH63A" base_Comment="_C6rbwYKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCfIKHEeSFEt9m3bH63A" base_Comment="_C6rbvoKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_C6sCfYKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbooKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCfoKHEeSFEt9m3bH63A" base_Comment="_C6rbuYKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_C6sCf4KHEeSFEt9m3bH63A" base_Comment="_C6rbvYKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_C6sCgIKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbf4KHEeSFEt9m3bH63A"/>

-  <standard:Create xmi:id="_C6sCgYKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbiIKHEeSFEt9m3bH63A"/>

-  <standard:Destroy xmi:id="_C6sCgoKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbhIKHEeSFEt9m3bH63A"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_CfwZ8IKHEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_C6rbYIKHEeSFEt9m3bH63A" name="Units_ActiveClass" classifierBehavior="_C6rbs4KHEeSFEt9m3bH63A" isActive="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbtIKHEeSFEt9m3bH63A" annotatedElement="_C6rbYIKHEeSFEt9m3bH63A">
+        <body>
+ * Test active class instantiation
+ </body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbpIKHEeSFEt9m3bH63A" name="Units_ActiveClass$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbpYKHEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbpoKHEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbp4KHEeSFEt9m3bH63A" name="Units_ActiveClass$initialization$1" visibility="protected" specification="_C6rbqIKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbuoKHEeSFEt9m3bH63A" annotatedElement="_C6rbp4KHEeSFEt9m3bH63A">
+          <body>activity 'Units_ActiveClass$initialization$1'(){
+  if (this.'Units_ActiveClass$initializationFlag$1' == null) {
+    this.'Units_ActiveClass$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbqYKHEeSFEt9m3bH63A" name="Units_ActiveClass$method$1" specification="_C6rbrYKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbvYKHEeSFEt9m3bH63A" annotatedElement="_C6rbqYKHEeSFEt9m3bH63A">
+          <body>activity 'Units_ActiveClass$method$1'(): Units_ActiveClass {
+	this.'Units_ActiveClass$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbqoKHEeSFEt9m3bH63A" type="_C6rbYIKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbq4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbrIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbsYKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_C6rbsoKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbvIKHEeSFEt9m3bH63A" annotatedElement="_C6rbsYKHEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbs4KHEeSFEt9m3bH63A" name="Units_ActiveClass$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbu4KHEeSFEt9m3bH63A" annotatedElement="_C6rbs4KHEeSFEt9m3bH63A">
+          <body>activity 'Units_ActiveClass$behavior$1'() { new TestRunner().Start();
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbqIKHEeSFEt9m3bH63A" name="Units_ActiveClass$initialization$1" visibility="protected" method="_C6rbp4KHEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbrYKHEeSFEt9m3bH63A" name="Units_ActiveClass" method="_C6rbqYKHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbroKHEeSFEt9m3bH63A" type="_C6rbYIKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbr4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbsIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbsoKHEeSFEt9m3bH63A" name="destroy" method="_C6rbsYKHEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_C6rbYYKHEeSFEt9m3bH63A" name="C" classifierBehavior="_C6rbo4KHEeSFEt9m3bH63A" isActive="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbYoKHEeSFEt9m3bH63A" name="i" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbY4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbZIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbZYKHEeSFEt9m3bH63A" name="j" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbZoKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbZ4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbaIKHEeSFEt9m3bH63A" name="t" visibility="public" type="_C6rba4KHEeSFEt9m3bH63A">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbaYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbaoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbnIKHEeSFEt9m3bH63A" name="C$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbnYKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbnoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbkoKHEeSFEt9m3bH63A" name="C$method$1" visibility="protected" specification="_C6rbiIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbuYKHEeSFEt9m3bH63A" annotatedElement="_C6rbkoKHEeSFEt9m3bH63A">
+            <body>activity 'C$method$1'(in i: Integer, in t: TestRunner): C {
+if (this.'C$initializationFlag$1' == null) {
+this.'C$initialization$1'();
+this.i = i; this.t = t; 
+}
+return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbk4KHEeSFEt9m3bH63A" name="i">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rblIKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rblYKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbloKHEeSFEt9m3bH63A" name="t" type="_C6rba4KHEeSFEt9m3bH63A">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbl4KHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbmIKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbmYKHEeSFEt9m3bH63A" name="" type="_C6rbYYKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbmoKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbm4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbn4KHEeSFEt9m3bH63A" name="C$initialization$1" visibility="protected" specification="_C6rboIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbtoKHEeSFEt9m3bH63A" annotatedElement="_C6rbn4KHEeSFEt9m3bH63A">
+            <body>activity 'C$initialization$1'(){
+  if (this.'C$initializationFlag$1' == null) {
+    this.'C$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rboYKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_C6rbooKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbuIKHEeSFEt9m3bH63A" annotatedElement="_C6rboYKHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbo4KHEeSFEt9m3bH63A" name="C$behavior$1" visibility="private">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbvoKHEeSFEt9m3bH63A" annotatedElement="_C6rbo4KHEeSFEt9m3bH63A">
+            <body>activity 'C$behavior$1'() { $ (this.j = this.i);
+this.t.Continue();
+}</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbiIKHEeSFEt9m3bH63A" name="C" visibility="public" method="_C6rbkoKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbiYKHEeSFEt9m3bH63A" name="i">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbioKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbi4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbjIKHEeSFEt9m3bH63A" name="t" type="_C6rba4KHEeSFEt9m3bH63A">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbjYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbjoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbj4KHEeSFEt9m3bH63A" name="" type="_C6rbYYKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbkIKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbkYKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rboIKHEeSFEt9m3bH63A" name="C$initialization$1" visibility="protected" method="_C6rbn4KHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbooKHEeSFEt9m3bH63A" name="destroy" method="_C6rboYKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_C6rba4KHEeSFEt9m3bH63A" name="TestRunner" classifierBehavior="_C6rbh4KHEeSFEt9m3bH63A" isActive="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_C6rbdoKHEeSFEt9m3bH63A" name="TestRunner$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbd4KHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbeIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbcoKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_C6rbboKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbwYKHEeSFEt9m3bH63A" annotatedElement="_C6rbcoKHEeSFEt9m3bH63A">
+            <body>activity 'test$method$1'(out c: C) { c = new C(1, this);
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbc4KHEeSFEt9m3bH63A" name="c" type="_C6rbYYKHEeSFEt9m3bH63A" direction="out">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbdIKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbdYKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbeYKHEeSFEt9m3bH63A" name="TestRunner$initialization$1" visibility="protected" specification="_C6rbeoKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbwIKHEeSFEt9m3bH63A" annotatedElement="_C6rbeYKHEeSFEt9m3bH63A">
+            <body>activity 'TestRunner$initialization$1'(){
+  if (this.'TestRunner$initializationFlag$1' == null) {
+    this.'TestRunner$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbe4KHEeSFEt9m3bH63A" name="TestRunner$method$1" specification="_C6rbf4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbv4KHEeSFEt9m3bH63A" annotatedElement="_C6rbe4KHEeSFEt9m3bH63A">
+            <body>activity 'TestRunner$method$1'(): TestRunner {
+	this.'TestRunner$initialization$1'();
+	return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbfIKHEeSFEt9m3bH63A" type="_C6rba4KHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbfYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbfoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbg4KHEeSFEt9m3bH63A" name="destroy$method$1" specification="_C6rbhIKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbt4KHEeSFEt9m3bH63A" annotatedElement="_C6rbg4KHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_C6rbh4KHEeSFEt9m3bH63A" name="TestRunner$behavior$1" visibility="private">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C6rbtYKHEeSFEt9m3bH63A" annotatedElement="_C6rbh4KHEeSFEt9m3bH63A">
+            <body>activity 'TestRunner$behavior$1'() { accept (Start);
+this.test(c);
+accept (Continue);
+AssertEqual(&quot;c.j&quot;, c.j, 1);
+WriteLine(&quot;Done&quot;);
+}</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbboKHEeSFEt9m3bH63A" name="test" visibility="public" method="_C6rbcoKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbb4KHEeSFEt9m3bH63A" name="c" type="_C6rbYYKHEeSFEt9m3bH63A" direction="out">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbcIKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbcYKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbeoKHEeSFEt9m3bH63A" name="TestRunner$initialization$1" visibility="protected" method="_C6rbeYKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbf4KHEeSFEt9m3bH63A" name="TestRunner" method="_C6rbe4KHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_C6rbgIKHEeSFEt9m3bH63A" type="_C6rba4KHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C6rbgYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C6rbgoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_C6rbhIKHEeSFEt9m3bH63A" name="destroy" method="_C6rbg4KHEeSFEt9m3bH63A"/>
+        <nestedClassifier xmi:type="uml:Signal" xmi:id="_C6rbbIKHEeSFEt9m3bH63A" name="Start"/>
+        <nestedClassifier xmi:type="uml:Signal" xmi:id="_C6rbbYKHEeSFEt9m3bH63A" name="Continue"/>
+        <ownedReception xmi:type="uml:Reception" xmi:id="_C6rbhYKHEeSFEt9m3bH63A" name="Start" visibility="public" signal="_C6rbbIKHEeSFEt9m3bH63A"/>
+        <ownedReception xmi:type="uml:Reception" xmi:id="_C6rbhoKHEeSFEt9m3bH63A" name="Continue" visibility="public" signal="_C6rbbYKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_CfwZ8YKHEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CfwZ8oKHEeSFEt9m3bH63A" 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="_eTvm4LeQEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eTvm4beQEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <standard:Destroy xmi:id="_C6sCcIKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbsoKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCcYKHEeSFEt9m3bH63A" base_Comment="_C6rbtoKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCcoKHEeSFEt9m3bH63A" base_Comment="_C6rbtYKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCc4KHEeSFEt9m3bH63A" base_Comment="_C6rbu4KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCdIKHEeSFEt9m3bH63A" base_Comment="_C6rbvIKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCdYKHEeSFEt9m3bH63A" base_Comment="_C6rbv4KHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_C6sCdoKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbrYKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCd4KHEeSFEt9m3bH63A" base_Comment="_C6rbuoKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCeIKHEeSFEt9m3bH63A" base_Comment="_C6rbuIKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCeYKHEeSFEt9m3bH63A" base_Comment="_C6rbt4KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCeoKHEeSFEt9m3bH63A" base_Comment="_C6rbwIKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCe4KHEeSFEt9m3bH63A" base_Comment="_C6rbwYKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCfIKHEeSFEt9m3bH63A" base_Comment="_C6rbvoKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_C6sCfYKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbooKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCfoKHEeSFEt9m3bH63A" base_Comment="_C6rbuYKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_C6sCf4KHEeSFEt9m3bH63A" base_Comment="_C6rbvYKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_C6sCgIKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbf4KHEeSFEt9m3bH63A"/>
+  <standard:Create xmi:id="_C6sCgYKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbiIKHEeSFEt9m3bH63A"/>
+  <standard:Destroy xmi:id="_C6sCgoKHEeSFEt9m3bH63A" base_BehavioralFeature="_C6rbhIKHEeSFEt9m3bH63A"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Units_Map.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Units_Map.uml
index 939790c5917..da51bd38e08 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Units_Map.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Units_Map.uml
@@ -1,244 +1,244 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_C7BZoIKHEeSFEt9m3bH63A" name="Model">

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_zFtp4LekEeS3ed40DpSXCw">

-      <importedPackage xmi:type="uml:Model" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf"/>

-    </packageImport>

-    <packagedElement xmi:type="uml:Class" xmi:id="_DY62kIKHEeSFEt9m3bH63A" name="Units_Map" classifierBehavior="_DY625YKHEeSFEt9m3bH63A" isActive="true">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_DY62tIKHEeSFEt9m3bH63A" name="listeners" visibility="public" type="_DY62t4KHEeSFEt9m3bH63A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62tYKHEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62toKHEeSFEt9m3bH63A" value="1"/>

-        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_DY62u4KHEeSFEt9m3bH63A" behavior="_DY62vIKHEeSFEt9m3bH63A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_DY621oKHEeSFEt9m3bH63A" name="Units_Map$initializationFlag$1" visibility="protected">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY6214KHEeSFEt9m3bH63A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY622IKHEeSFEt9m3bH63A" value="1"/>

-      </ownedAttribute>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62x4KHEeSFEt9m3bH63A" name="register$method$1" visibility="protected" specification="_DY62wIKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DY6254KHEeSFEt9m3bH63A" annotatedElement="_DY62x4KHEeSFEt9m3bH63A">

-          <body>activity 'register$method$1'(in listener: Listener, in id: Integer) { { this.listeners.put(id, listener);

-} }</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62yIKHEeSFEt9m3bH63A" name="listener" type="_DY62kYKHEeSFEt9m3bH63A">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62yYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62yoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62y4KHEeSFEt9m3bH63A" name="id">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62zIKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62zYKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY620oKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_DY62zoKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DY6274KHEeSFEt9m3bH63A" annotatedElement="_DY620oKHEeSFEt9m3bH63A">

-          <body>activity 'test$method$1'(out listener: Listener) { listener = new Listener(&quot;Listener&quot;);

-this.register(listener, 1);

-listener = this.listeners.get(1);

-listener.notify();

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY6204KHEeSFEt9m3bH63A" name="listener" type="_DY62kYKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY621IKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY621YKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62vIKHEeSFEt9m3bH63A" name="listeners$defaultValue$1">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DY627YKHEeSFEt9m3bH63A" annotatedElement="_DY62vIKHEeSFEt9m3bH63A">

-          <body>activity 'listeners$defaultValue$1'(): '$$Alf$Library$CollectionClasses$Map__PrimitiveTypes$Integer_Units_Map$Listener__' {

-	return  new();

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62vYKHEeSFEt9m3bH63A" type="_DY62t4KHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62voKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62v4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY622YKHEeSFEt9m3bH63A" name="Units_Map$initialization$1" visibility="protected" specification="_DY622oKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DY626IKHEeSFEt9m3bH63A" annotatedElement="_DY622YKHEeSFEt9m3bH63A">

-          <body>activity 'Units_Map$initialization$1'(){

-  if (this.'Units_Map$initializationFlag$1' == null) {

-    this.listeners = 'listeners$defaultValue$1'();

-    this.'Units_Map$initializationFlag$1' = true;

-  }

-}

-</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY6224KHEeSFEt9m3bH63A" name="Units_Map$method$1" specification="_DY6234KHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DY627IKHEeSFEt9m3bH63A" annotatedElement="_DY6224KHEeSFEt9m3bH63A">

-          <body>activity 'Units_Map$method$1'(): Units_Map {

-	this.'Units_Map$initialization$1'();

-	return this;

-}</body>

-        </ownedComment>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY623IKHEeSFEt9m3bH63A" type="_DY62kIKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY623YKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY623oKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY6244KHEeSFEt9m3bH63A" name="destroy$method$1" specification="_DY625IKHEeSFEt9m3bH63A">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DY627oKHEeSFEt9m3bH63A" annotatedElement="_DY6244KHEeSFEt9m3bH63A">

-          <body>activity 'destroy$method$1'() { }</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY625YKHEeSFEt9m3bH63A" name="Units_Map$behavior$1" visibility="private">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DY626oKHEeSFEt9m3bH63A" annotatedElement="_DY625YKHEeSFEt9m3bH63A">

-          <body>activity 'Units_Map$behavior$1'() { this.test(listener);

-AssertEqual(&quot;listener.notifications&quot;, listener.notifications, 1);

-WriteLine(&quot;Done&quot;);

-}</body>

-        </ownedComment>

-      </ownedBehavior>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62wIKHEeSFEt9m3bH63A" name="register" visibility="public" method="_DY62x4KHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62wYKHEeSFEt9m3bH63A" name="listener" type="_DY62kYKHEeSFEt9m3bH63A">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62woKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62w4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62xIKHEeSFEt9m3bH63A" name="id">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62xYKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62xoKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62zoKHEeSFEt9m3bH63A" name="test" visibility="public" method="_DY620oKHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62z4KHEeSFEt9m3bH63A" name="listener" type="_DY62kYKHEeSFEt9m3bH63A" direction="out">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY620IKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY620YKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY622oKHEeSFEt9m3bH63A" name="Units_Map$initialization$1" visibility="protected" method="_DY622YKHEeSFEt9m3bH63A"/>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY6234KHEeSFEt9m3bH63A" name="Units_Map" method="_DY6224KHEeSFEt9m3bH63A">

-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY624IKHEeSFEt9m3bH63A" type="_DY62kIKHEeSFEt9m3bH63A" direction="return">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY624YKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY624oKHEeSFEt9m3bH63A" value="1"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY625IKHEeSFEt9m3bH63A" name="destroy" method="_DY6244KHEeSFEt9m3bH63A"/>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_DY62kYKHEeSFEt9m3bH63A" name="Listener">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DY62koKHEeSFEt9m3bH63A" name="name" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62k4KHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62lIKHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DY62lYKHEeSFEt9m3bH63A" name="notifications" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62loKHEeSFEt9m3bH63A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62l4KHEeSFEt9m3bH63A" value="1"/>

-          <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_DY62mIKHEeSFEt9m3bH63A" behavior="_DY62mYKHEeSFEt9m3bH63A"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DY62rYKHEeSFEt9m3bH63A" name="Listener$initializationFlag$1" visibility="protected">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62roKHEeSFEt9m3bH63A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62r4KHEeSFEt9m3bH63A" value="1"/>

-        </ownedAttribute>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62pIKHEeSFEt9m3bH63A" name="Listener$method$1" visibility="protected" specification="_DY62nYKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DY628YKHEeSFEt9m3bH63A" annotatedElement="_DY62pIKHEeSFEt9m3bH63A">

-            <body>activity 'Listener$method$1'(in name: String): Listener {

-if (this.'Listener$initializationFlag$1' == null) {

-this.'Listener$initialization$1'();

-this.name = name; 

-}

-return this;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62pYKHEeSFEt9m3bH63A" name="name">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62poKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62p4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62qIKHEeSFEt9m3bH63A" name="" type="_DY62kYKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62qYKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62qoKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62rIKHEeSFEt9m3bH63A" name="notify$method$1" visibility="protected" specification="_DY62q4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DY626YKHEeSFEt9m3bH63A" annotatedElement="_DY62rIKHEeSFEt9m3bH63A">

-            <body>activity 'notify$method$1'() { ++ this.notifications;

-}</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62mYKHEeSFEt9m3bH63A" name="notifications$defaultValue$1">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DY625oKHEeSFEt9m3bH63A" annotatedElement="_DY62mYKHEeSFEt9m3bH63A">

-            <body>activity 'notifications$defaultValue$1'(): Integer {

-	return  0;

-}</body>

-          </ownedComment>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62moKHEeSFEt9m3bH63A" direction="return">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62m4KHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62nIKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62sIKHEeSFEt9m3bH63A" name="Listener$initialization$1" visibility="protected" specification="_DY62sYKHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DY628IKHEeSFEt9m3bH63A" annotatedElement="_DY62sIKHEeSFEt9m3bH63A">

-            <body>activity 'Listener$initialization$1'(){

-  if (this.'Listener$initializationFlag$1' == null) {

-    this.notifications = 'notifications$defaultValue$1'();

-    this.'Listener$initializationFlag$1' = true;

-  }

-}

-</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62soKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_DY62s4KHEeSFEt9m3bH63A">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DY6264KHEeSFEt9m3bH63A" annotatedElement="_DY62soKHEeSFEt9m3bH63A">

-            <body>activity 'destroy$method$1'() { }</body>

-          </ownedComment>

-        </ownedBehavior>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62nYKHEeSFEt9m3bH63A" name="Listener" visibility="public" method="_DY62pIKHEeSFEt9m3bH63A">

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62noKHEeSFEt9m3bH63A" name="name">

-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62n4KHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62oIKHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62oYKHEeSFEt9m3bH63A" name="" type="_DY62kYKHEeSFEt9m3bH63A" direction="return">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62ooKHEeSFEt9m3bH63A" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62o4KHEeSFEt9m3bH63A" value="1"/>

-          </ownedParameter>

-        </ownedOperation>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62q4KHEeSFEt9m3bH63A" name="notify" visibility="public" method="_DY62rIKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62sYKHEeSFEt9m3bH63A" name="Listener$initialization$1" visibility="protected" method="_DY62sIKHEeSFEt9m3bH63A"/>

-        <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62s4KHEeSFEt9m3bH63A" name="destroy" method="_DY62soKHEeSFEt9m3bH63A"/>

-      </nestedClassifier>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_DY62t4KHEeSFEt9m3bH63A" name="$$Alf$Library$CollectionClasses$Map__PrimitiveTypes$Integer_Units_Map$Listener__">

-      <templateBinding xmi:type="uml:TemplateBinding" xmi:id="_DY62uIKHEeSFEt9m3bH63A">

-        <parameterSubstitution xmi:type="uml:TemplateParameterSubstitution" xmi:id="_DY62uYKHEeSFEt9m3bH63A">

-          <actual xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-          <formal xmi:type="uml:ClassifierTemplateParameter" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf-Library-CollectionClasses-Map-ownedTemplateSignature-ownedParameter-1"/>

-        </parameterSubstitution>

-        <parameterSubstitution xmi:type="uml:TemplateParameterSubstitution" xmi:id="_DY62uoKHEeSFEt9m3bH63A" actual="_DY62kYKHEeSFEt9m3bH63A">

-          <formal xmi:type="uml:ClassifierTemplateParameter" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf-Library-CollectionClasses-Map-ownedTemplateSignature-ownedParameter-2"/>

-        </parameterSubstitution>

-        <signature xmi:type="uml:RedefinableTemplateSignature" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf-Library-CollectionClasses-Map-ownedTemplateSignature"/>

-      </templateBinding>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_C7BZoYKHEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C7BZooKHEeSFEt9m3bH63A" 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="_jFhT1reQEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY628oKHEeSFEt9m3bH63A" base_Comment="_DY627oKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY6284KHEeSFEt9m3bH63A" base_Comment="_DY6264KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY629IKHEeSFEt9m3bH63A" base_Comment="_DY626IKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY629YKHEeSFEt9m3bH63A" base_Comment="_DY628YKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY629oKHEeSFEt9m3bH63A" base_Comment="_DY626oKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_DY6294KHEeSFEt9m3bH63A" base_BehavioralFeature="_DY625IKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY62-IKHEeSFEt9m3bH63A" base_Comment="_DY626YKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY62-YKHEeSFEt9m3bH63A" base_Comment="_DY627IKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Destroy xmi:id="_DY62-oKHEeSFEt9m3bH63A" base_BehavioralFeature="_DY62s4KHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY62-4KHEeSFEt9m3bH63A" base_Comment="_DY6254KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY62_IKHEeSFEt9m3bH63A" base_Comment="_DY627YKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_DY62_YKHEeSFEt9m3bH63A" base_BehavioralFeature="_DY62nYKHEeSFEt9m3bH63A"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY62_oKHEeSFEt9m3bH63A" base_Comment="_DY6274KHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY62_4KHEeSFEt9m3bH63A" base_Comment="_DY625oKHEeSFEt9m3bH63A" language="Alf"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_DY63AIKHEeSFEt9m3bH63A" base_Comment="_DY628IKHEeSFEt9m3bH63A" language="Alf"/>

-  <standard:Create xmi:id="_DY63AYKHEeSFEt9m3bH63A" base_BehavioralFeature="_DY6234KHEeSFEt9m3bH63A"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_C7BZoIKHEeSFEt9m3bH63A" name="Model">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_zFtp4LekEeS3ed40DpSXCw">
+      <importedPackage xmi:type="uml:Model" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Class" xmi:id="_DY62kIKHEeSFEt9m3bH63A" name="Units_Map" classifierBehavior="_DY625YKHEeSFEt9m3bH63A" isActive="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_DY62tIKHEeSFEt9m3bH63A" name="listeners" visibility="public" type="_DY62t4KHEeSFEt9m3bH63A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62tYKHEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62toKHEeSFEt9m3bH63A" value="1"/>
+        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_DY62u4KHEeSFEt9m3bH63A" behavior="_DY62vIKHEeSFEt9m3bH63A"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_DY621oKHEeSFEt9m3bH63A" name="Units_Map$initializationFlag$1" visibility="protected">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY6214KHEeSFEt9m3bH63A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY622IKHEeSFEt9m3bH63A" value="1"/>
+      </ownedAttribute>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62x4KHEeSFEt9m3bH63A" name="register$method$1" visibility="protected" specification="_DY62wIKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DY6254KHEeSFEt9m3bH63A" annotatedElement="_DY62x4KHEeSFEt9m3bH63A">
+          <body>activity 'register$method$1'(in listener: Listener, in id: Integer) { { this.listeners.put(id, listener);
+} }</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62yIKHEeSFEt9m3bH63A" name="listener" type="_DY62kYKHEeSFEt9m3bH63A">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62yYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62yoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62y4KHEeSFEt9m3bH63A" name="id">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62zIKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62zYKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY620oKHEeSFEt9m3bH63A" name="test$method$1" visibility="protected" specification="_DY62zoKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DY6274KHEeSFEt9m3bH63A" annotatedElement="_DY620oKHEeSFEt9m3bH63A">
+          <body>activity 'test$method$1'(out listener: Listener) { listener = new Listener(&quot;Listener&quot;);
+this.register(listener, 1);
+listener = this.listeners.get(1);
+listener.notify();
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY6204KHEeSFEt9m3bH63A" name="listener" type="_DY62kYKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY621IKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY621YKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62vIKHEeSFEt9m3bH63A" name="listeners$defaultValue$1">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DY627YKHEeSFEt9m3bH63A" annotatedElement="_DY62vIKHEeSFEt9m3bH63A">
+          <body>activity 'listeners$defaultValue$1'(): '$$Alf$Library$CollectionClasses$Map__PrimitiveTypes$Integer_Units_Map$Listener__' {
+	return  new();
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62vYKHEeSFEt9m3bH63A" type="_DY62t4KHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62voKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62v4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY622YKHEeSFEt9m3bH63A" name="Units_Map$initialization$1" visibility="protected" specification="_DY622oKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DY626IKHEeSFEt9m3bH63A" annotatedElement="_DY622YKHEeSFEt9m3bH63A">
+          <body>activity 'Units_Map$initialization$1'(){
+  if (this.'Units_Map$initializationFlag$1' == null) {
+    this.listeners = 'listeners$defaultValue$1'();
+    this.'Units_Map$initializationFlag$1' = true;
+  }
+}
+</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY6224KHEeSFEt9m3bH63A" name="Units_Map$method$1" specification="_DY6234KHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DY627IKHEeSFEt9m3bH63A" annotatedElement="_DY6224KHEeSFEt9m3bH63A">
+          <body>activity 'Units_Map$method$1'(): Units_Map {
+	this.'Units_Map$initialization$1'();
+	return this;
+}</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY623IKHEeSFEt9m3bH63A" type="_DY62kIKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY623YKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY623oKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY6244KHEeSFEt9m3bH63A" name="destroy$method$1" specification="_DY625IKHEeSFEt9m3bH63A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DY627oKHEeSFEt9m3bH63A" annotatedElement="_DY6244KHEeSFEt9m3bH63A">
+          <body>activity 'destroy$method$1'() { }</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY625YKHEeSFEt9m3bH63A" name="Units_Map$behavior$1" visibility="private">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DY626oKHEeSFEt9m3bH63A" annotatedElement="_DY625YKHEeSFEt9m3bH63A">
+          <body>activity 'Units_Map$behavior$1'() { this.test(listener);
+AssertEqual(&quot;listener.notifications&quot;, listener.notifications, 1);
+WriteLine(&quot;Done&quot;);
+}</body>
+        </ownedComment>
+      </ownedBehavior>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62wIKHEeSFEt9m3bH63A" name="register" visibility="public" method="_DY62x4KHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62wYKHEeSFEt9m3bH63A" name="listener" type="_DY62kYKHEeSFEt9m3bH63A">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62woKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62w4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62xIKHEeSFEt9m3bH63A" name="id">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62xYKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62xoKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62zoKHEeSFEt9m3bH63A" name="test" visibility="public" method="_DY620oKHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62z4KHEeSFEt9m3bH63A" name="listener" type="_DY62kYKHEeSFEt9m3bH63A" direction="out">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY620IKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY620YKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY622oKHEeSFEt9m3bH63A" name="Units_Map$initialization$1" visibility="protected" method="_DY622YKHEeSFEt9m3bH63A"/>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY6234KHEeSFEt9m3bH63A" name="Units_Map" method="_DY6224KHEeSFEt9m3bH63A">
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY624IKHEeSFEt9m3bH63A" type="_DY62kIKHEeSFEt9m3bH63A" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY624YKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY624oKHEeSFEt9m3bH63A" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_DY625IKHEeSFEt9m3bH63A" name="destroy" method="_DY6244KHEeSFEt9m3bH63A"/>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_DY62kYKHEeSFEt9m3bH63A" name="Listener">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_DY62koKHEeSFEt9m3bH63A" name="name" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62k4KHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62lIKHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_DY62lYKHEeSFEt9m3bH63A" name="notifications" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62loKHEeSFEt9m3bH63A" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62l4KHEeSFEt9m3bH63A" value="1"/>
+          <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_DY62mIKHEeSFEt9m3bH63A" behavior="_DY62mYKHEeSFEt9m3bH63A"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_DY62rYKHEeSFEt9m3bH63A" name="Listener$initializationFlag$1" visibility="protected">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62roKHEeSFEt9m3bH63A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62r4KHEeSFEt9m3bH63A" value="1"/>
+        </ownedAttribute>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62pIKHEeSFEt9m3bH63A" name="Listener$method$1" visibility="protected" specification="_DY62nYKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DY628YKHEeSFEt9m3bH63A" annotatedElement="_DY62pIKHEeSFEt9m3bH63A">
+            <body>activity 'Listener$method$1'(in name: String): Listener {
+if (this.'Listener$initializationFlag$1' == null) {
+this.'Listener$initialization$1'();
+this.name = name; 
+}
+return this;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62pYKHEeSFEt9m3bH63A" name="name">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62poKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62p4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62qIKHEeSFEt9m3bH63A" name="" type="_DY62kYKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62qYKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62qoKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62rIKHEeSFEt9m3bH63A" name="notify$method$1" visibility="protected" specification="_DY62q4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DY626YKHEeSFEt9m3bH63A" annotatedElement="_DY62rIKHEeSFEt9m3bH63A">
+            <body>activity 'notify$method$1'() { ++ this.notifications;
+}</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62mYKHEeSFEt9m3bH63A" name="notifications$defaultValue$1">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DY625oKHEeSFEt9m3bH63A" annotatedElement="_DY62mYKHEeSFEt9m3bH63A">
+            <body>activity 'notifications$defaultValue$1'(): Integer {
+	return  0;
+}</body>
+          </ownedComment>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62moKHEeSFEt9m3bH63A" direction="return">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62m4KHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62nIKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62sIKHEeSFEt9m3bH63A" name="Listener$initialization$1" visibility="protected" specification="_DY62sYKHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DY628IKHEeSFEt9m3bH63A" annotatedElement="_DY62sIKHEeSFEt9m3bH63A">
+            <body>activity 'Listener$initialization$1'(){
+  if (this.'Listener$initializationFlag$1' == null) {
+    this.notifications = 'notifications$defaultValue$1'();
+    this.'Listener$initializationFlag$1' = true;
+  }
+}
+</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_DY62soKHEeSFEt9m3bH63A" name="destroy$method$1" specification="_DY62s4KHEeSFEt9m3bH63A">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DY6264KHEeSFEt9m3bH63A" annotatedElement="_DY62soKHEeSFEt9m3bH63A">
+            <body>activity 'destroy$method$1'() { }</body>
+          </ownedComment>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62nYKHEeSFEt9m3bH63A" name="Listener" visibility="public" method="_DY62pIKHEeSFEt9m3bH63A">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62noKHEeSFEt9m3bH63A" name="name">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62n4KHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62oIKHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DY62oYKHEeSFEt9m3bH63A" name="" type="_DY62kYKHEeSFEt9m3bH63A" direction="return">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DY62ooKHEeSFEt9m3bH63A" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DY62o4KHEeSFEt9m3bH63A" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62q4KHEeSFEt9m3bH63A" name="notify" visibility="public" method="_DY62rIKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62sYKHEeSFEt9m3bH63A" name="Listener$initialization$1" visibility="protected" method="_DY62sIKHEeSFEt9m3bH63A"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_DY62s4KHEeSFEt9m3bH63A" name="destroy" method="_DY62soKHEeSFEt9m3bH63A"/>
+      </nestedClassifier>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_DY62t4KHEeSFEt9m3bH63A" name="$$Alf$Library$CollectionClasses$Map__PrimitiveTypes$Integer_Units_Map$Listener__">
+      <templateBinding xmi:type="uml:TemplateBinding" xmi:id="_DY62uIKHEeSFEt9m3bH63A">
+        <parameterSubstitution xmi:type="uml:TemplateParameterSubstitution" xmi:id="_DY62uYKHEeSFEt9m3bH63A">
+          <actual xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <formal xmi:type="uml:ClassifierTemplateParameter" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf-Library-CollectionClasses-Map-ownedTemplateSignature-ownedParameter-1"/>
+        </parameterSubstitution>
+        <parameterSubstitution xmi:type="uml:TemplateParameterSubstitution" xmi:id="_DY62uoKHEeSFEt9m3bH63A" actual="_DY62kYKHEeSFEt9m3bH63A">
+          <formal xmi:type="uml:ClassifierTemplateParameter" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf-Library-CollectionClasses-Map-ownedTemplateSignature-ownedParameter-2"/>
+        </parameterSubstitution>
+        <signature xmi:type="uml:RedefinableTemplateSignature" href="pathmap://PAPYRUS_ALF_LIBRARY/Alf.library.uml#Alf-Library-CollectionClasses-Map-ownedTemplateSignature"/>
+      </templateBinding>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_C7BZoYKHEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C7BZooKHEeSFEt9m3bH63A" 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="_jFhT1reQEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jFh64LeQEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY628oKHEeSFEt9m3bH63A" base_Comment="_DY627oKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY6284KHEeSFEt9m3bH63A" base_Comment="_DY6264KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY629IKHEeSFEt9m3bH63A" base_Comment="_DY626IKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY629YKHEeSFEt9m3bH63A" base_Comment="_DY628YKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY629oKHEeSFEt9m3bH63A" base_Comment="_DY626oKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_DY6294KHEeSFEt9m3bH63A" base_BehavioralFeature="_DY625IKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY62-IKHEeSFEt9m3bH63A" base_Comment="_DY626YKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY62-YKHEeSFEt9m3bH63A" base_Comment="_DY627IKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Destroy xmi:id="_DY62-oKHEeSFEt9m3bH63A" base_BehavioralFeature="_DY62s4KHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY62-4KHEeSFEt9m3bH63A" base_Comment="_DY6254KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY62_IKHEeSFEt9m3bH63A" base_Comment="_DY627YKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_DY62_YKHEeSFEt9m3bH63A" base_BehavioralFeature="_DY62nYKHEeSFEt9m3bH63A"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY62_oKHEeSFEt9m3bH63A" base_Comment="_DY6274KHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY62_4KHEeSFEt9m3bH63A" base_Comment="_DY625oKHEeSFEt9m3bH63A" language="Alf"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_DY63AIKHEeSFEt9m3bH63A" base_Comment="_DY628IKHEeSFEt9m3bH63A" language="Alf"/>
+  <standard:Create xmi:id="_DY63AYKHEeSFEt9m3bH63A" base_BehavioralFeature="_DY6234KHEeSFEt9m3bH63A"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Write.uml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Write.uml
index 4dada313159..0939d6cb0b6 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Write.uml
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/UML/Write.uml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">

-  <uml:Model xmi:id="_DZSqAIKHEeSFEt9m3bH63A" name="Model">

-    <packagedElement xmi:type="uml:Activity" xmi:id="_Dc9CAIKHEeSFEt9m3bH63A" name="Write" visibility="protected">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_Dc9CBIKHEeSFEt9m3bH63A" annotatedElement="_Dc9CAIKHEeSFEt9m3bH63A">

-        <body>activity Write(in value: any) { StandardOutputChannel.allInstances ()[1].write(value);

-}</body>

-      </ownedComment>

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Dc9CAYKHEeSFEt9m3bH63A" name="value">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Dc9CAoKHEeSFEt9m3bH63A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dc9CA4KHEeSFEt9m3bH63A" value="1"/>

-      </ownedParameter>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_DZSqAYKHEeSFEt9m3bH63A">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DZSqAoKHEeSFEt9m3bH63A" 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="_nz6VkLeQEeS_zZpc9I-Bsg">

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

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_Dc9CBYKHEeSFEt9m3bH63A" base_Comment="_Dc9CBIKHEeSFEt9m3bH63A" language="Alf"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ">
+  <uml:Model xmi:id="_DZSqAIKHEeSFEt9m3bH63A" name="Model">
+    <packagedElement xmi:type="uml:Activity" xmi:id="_Dc9CAIKHEeSFEt9m3bH63A" name="Write" visibility="protected">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Dc9CBIKHEeSFEt9m3bH63A" annotatedElement="_Dc9CAIKHEeSFEt9m3bH63A">
+        <body>activity Write(in value: any) { StandardOutputChannel.allInstances ()[1].write(value);
+}</body>
+      </ownedComment>
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Dc9CAYKHEeSFEt9m3bH63A" name="value">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Dc9CAoKHEeSFEt9m3bH63A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dc9CA4KHEeSFEt9m3bH63A" value="1"/>
+      </ownedParameter>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_DZSqAYKHEeSFEt9m3bH63A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DZSqAoKHEeSFEt9m3bH63A" 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="_nz6VkLeQEeS_zZpc9I-Bsg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nz6VkbeQEeS_zZpc9I-Bsg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Model>
+  <ActionLanguage:TextualRepresentation xmi:id="_Dc9CBYKHEeSFEt9m3bH63A" base_Comment="_Dc9CBIKHEeSFEt9m3bH63A" language="Alf"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/about.html b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/about.html
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java
index 2af8a65e49c..5ab92699e97 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java
@@ -1,30 +1,30 @@
-/*****************************************************************************

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

- *  Jeremie Tatibouet (CEA LIST)

- * 

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

-package org.eclipse.papyrus.uml.alf.tests;

-

-import org.eclipse.papyrus.uml.alf.tests.generator.GenerationTest;

-import org.eclipse.papyrus.uml.alf.tests.mapper.MappingTest;

-import org.eclipse.papyrus.uml.alf.tests.mapper.MergeTest;

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({MappingTest.class, MergeTest.class, SemanticTest.class, 

-	SingleTest.class, SyntacticTest.class, GenerationTest.class})

-public class AllTests {

-

-	public AllTests() {}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Jeremie Tatibouet (CEA LIST)
+ * 
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.alf.tests;
+
+import org.eclipse.papyrus.uml.alf.tests.generator.GenerationTest;
+import org.eclipse.papyrus.uml.alf.tests.mapper.MappingTest;
+import org.eclipse.papyrus.uml.alf.tests.mapper.MergeTest;
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({MappingTest.class, MergeTest.class, SemanticTest.class, 
+	SingleTest.class, SyntacticTest.class, GenerationTest.class})
+public class AllTests {
+
+	public AllTests() {}
+
+}
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/utils/RegisteredItemLoader.java b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/utils/RegisteredItemLoader.java
index 7a021c7daf1..07706ab5689 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/utils/RegisteredItemLoader.java
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/utils/RegisteredItemLoader.java
@@ -1,218 +1,218 @@
-/*****************************************************************************

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

- *  Jeremie Tatibouet

- * 

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

-package org.eclipse.papyrus.uml.alf.tests.utils;

-

-import java.util.Iterator;

-

-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.uml.extensionpoints.library.IRegisteredLibrary;

-import org.eclipse.papyrus.uml.extensionpoints.library.RegisteredLibrary;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.uml2.uml.PackageableElement;

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

-

-/**

- * Helper providing methods to load registered Papyrus libraries and profiles.

- * These artifact can loaded in specific resource sets or in the one managed by this

- * class.

- */

-public class RegisteredItemLoader {

-

-	private static RegisteredItemLoader instance;

-

-	private ResourceSet registeredItemResourceSet;

-

-	private RegisteredItemLoader() {

-		this.registeredItemResourceSet = new ResourceSetImpl();

-	}

-

-	public static RegisteredItemLoader getInstance() {

-		if (instance == null) {

-			instance = new RegisteredItemLoader();

-		}

-		return instance;

-	}

-

-	/**

-	 * Load a library in the resourceSet managed by this class

-	 * 

-	 * @param name

-	 *            - the searched library

-	 * @return library - a reference to the loaded library

-	 */

-	public PackageableElement getLibrary(final String name) {

-		PackageableElement library = null;

-		URI libraryURI = this.getRegisteredLibraryURI(name);

-		if (libraryURI != null) {

-			Resource resource = null;

-			Iterator<Resource> resourceIterator = this.registeredItemResourceSet.getResources().iterator();

-			while (resource == null && resourceIterator.hasNext()) {

-				Resource current = resourceIterator.next();

-				if (current.getURI().equals(libraryURI)) {

-					resource = current;

-				}

-			}

-			if (resource == null) {

-				library = this.loadLibrary(this.registeredItemResourceSet, name);

-			} else {

-				EObject target = resource.getContents().get(0);

-				if (target instanceof PackageableElement) {

-					library = (PackageableElement) target;

-				}

-			}

-		}

-		return library;

-	}

-

-	/**

-	 * Load a profile in the resourceSet managed by this class

-	 * 

-	 * @param name

-	 *            - the searched profile

-	 * @return profile - a reference to the loaded profile

-	 */

-	public Profile getProfile(final String name) {

-		Profile profile = null;

-		URI profileURI = this.getRegisteredProfileURI(name);

-		if (profileURI != null) {

-			Resource resource = null;

-			Iterator<Resource> resourceIterator = this.registeredItemResourceSet.getResources().iterator();

-			while (resource == null && resourceIterator.hasNext()) {

-				Resource current = resourceIterator.next();

-				if (current.getURI().equals(profileURI)) {

-					resource = current;

-				}

-			}

-			if (resource == null) {

-				profile = this.loadProfile(this.registeredItemResourceSet, name);

-			} else {

-				EObject target = resource.getContents().get(0);

-				if (target instanceof Profile) {

-					profile = (Profile) target;

-				}

-			}

-		}

-		return profile;

-	}

-

-	/**

-	 * Return the URI corresponding to the searched library

-	 * 

-	 * @param name

-	 *            - the name of the searched library

-	 * @return libraryURI - the URI corresponding to the library

-	 */

-	private URI getRegisteredLibraryURI(final String name) {

-		URI libraryURI = null;

-		Iterator<IRegisteredLibrary> librariesIterator = RegisteredLibrary.getRegisteredLibraries().iterator();

-		while (libraryURI == null && librariesIterator.hasNext()) {

-			IRegisteredLibrary registeredLibrary = librariesIterator.next();

-			if (registeredLibrary.getName().equals(name)) {

-				libraryURI = registeredLibrary.getUri();

-			}

-		}

-		return libraryURI;

-	}

-

-	/**

-	 * Return the URI corresponding to the searched profile

-	 * 

-	 * @param name

-	 *            - the name of the profile

-	 * @return profileURI - the URI corresponding to the profile

-	 */

-	private URI getRegisteredProfileURI(final String name) {

-		URI profileURI = null;

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile(name);

-		if (registeredProfile != null) {

-			profileURI = registeredProfile.getUri();

-		}

-		return profileURI;

-	}

-

-	/**

-	 * Load the library in the context of the given resourceSet

-	 * 

-	 * @param context

-	 *            - the resource set

-	 * @param name

-	 *            - the name of the library to load

-	 * @return library - a reference to the loaded library (null if not loaded)

-	 */

-	public PackageableElement loadLibrary(ResourceSet context, final String name) {

-		PackageableElement library = null;

-		URI libraryURI = this.getRegisteredLibraryURI(name);

-		if (libraryURI != null) {

-			Resource resource = context.getResource(libraryURI, true);

-			if (resource != null) {

-				EObject target = resource.getContents().get(0);

-				if (target instanceof PackageableElement) {

-					library = (PackageableElement) target;

-				}

-			}

-		}

-		return library;

-	}

-

-	/**

-	 * Load the profile in the context of the given resourceSet

-	 * 

-	 * @param context

-	 *            - the resourceSet

-	 * @param name

-	 *            - the name of the profile to load

-	 * @return profile - a reference to the loaded profile (null if not loaded)

-	 */

-	public Profile loadProfile(ResourceSet context, final String name) {

-		Profile profile = null;

-		URI profileURI = this.getRegisteredProfileURI(name);

-		if (profileURI != null) {

-			Resource resource = context.getResource(profileURI, true);

-			if (resource != null) {

-				EObject target = resource.getContents().get(0);

-				if (target instanceof Profile) {

-					profile = (Profile) target;

-				}

-			}

-		}

-		return profile;

-	}

-

-	/**

-	 * Unload the resources managed by the class

-	 */

-	public void clean() {

-		for (Resource r : this.registeredItemResourceSet.getResources()) {

-			if (r.isLoaded()) {

-				r.unload();

-			}

-		}

-		this.registeredItemResourceSet.getResources().clear();

-		this.registeredItemResourceSet = null;

-	}

-	

-	public class RequiredElementsNames {

-		/* Profiles */

-		public final static String STANDARD_PROFILE = "Standard";

-		public final static String ACTION_LANGUAGE_PROFILE = "ActionLanguage";

-		/* Libraries */

-		public final static String ALF_LIBRARY = "Alf Library";

-		public final static String UML_PRIMITIVE_TYPES = "UMLPrimitiveTypes";

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Jeremie Tatibouet
+ * 
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.alf.tests.utils;
+
+import java.util.Iterator;
+
+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.uml.extensionpoints.library.IRegisteredLibrary;
+import org.eclipse.papyrus.uml.extensionpoints.library.RegisteredLibrary;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.uml2.uml.PackageableElement;
+import org.eclipse.uml2.uml.Profile;
+
+/**
+ * Helper providing methods to load registered Papyrus libraries and profiles.
+ * These artifact can loaded in specific resource sets or in the one managed by this
+ * class.
+ */
+public class RegisteredItemLoader {
+
+	private static RegisteredItemLoader instance;
+
+	private ResourceSet registeredItemResourceSet;
+
+	private RegisteredItemLoader() {
+		this.registeredItemResourceSet = new ResourceSetImpl();
+	}
+
+	public static RegisteredItemLoader getInstance() {
+		if (instance == null) {
+			instance = new RegisteredItemLoader();
+		}
+		return instance;
+	}
+
+	/**
+	 * Load a library in the resourceSet managed by this class
+	 * 
+	 * @param name
+	 *            - the searched library
+	 * @return library - a reference to the loaded library
+	 */
+	public PackageableElement getLibrary(final String name) {
+		PackageableElement library = null;
+		URI libraryURI = this.getRegisteredLibraryURI(name);
+		if (libraryURI != null) {
+			Resource resource = null;
+			Iterator<Resource> resourceIterator = this.registeredItemResourceSet.getResources().iterator();
+			while (resource == null && resourceIterator.hasNext()) {
+				Resource current = resourceIterator.next();
+				if (current.getURI().equals(libraryURI)) {
+					resource = current;
+				}
+			}
+			if (resource == null) {
+				library = this.loadLibrary(this.registeredItemResourceSet, name);
+			} else {
+				EObject target = resource.getContents().get(0);
+				if (target instanceof PackageableElement) {
+					library = (PackageableElement) target;
+				}
+			}
+		}
+		return library;
+	}
+
+	/**
+	 * Load a profile in the resourceSet managed by this class
+	 * 
+	 * @param name
+	 *            - the searched profile
+	 * @return profile - a reference to the loaded profile
+	 */
+	public Profile getProfile(final String name) {
+		Profile profile = null;
+		URI profileURI = this.getRegisteredProfileURI(name);
+		if (profileURI != null) {
+			Resource resource = null;
+			Iterator<Resource> resourceIterator = this.registeredItemResourceSet.getResources().iterator();
+			while (resource == null && resourceIterator.hasNext()) {
+				Resource current = resourceIterator.next();
+				if (current.getURI().equals(profileURI)) {
+					resource = current;
+				}
+			}
+			if (resource == null) {
+				profile = this.loadProfile(this.registeredItemResourceSet, name);
+			} else {
+				EObject target = resource.getContents().get(0);
+				if (target instanceof Profile) {
+					profile = (Profile) target;
+				}
+			}
+		}
+		return profile;
+	}
+
+	/**
+	 * Return the URI corresponding to the searched library
+	 * 
+	 * @param name
+	 *            - the name of the searched library
+	 * @return libraryURI - the URI corresponding to the library
+	 */
+	private URI getRegisteredLibraryURI(final String name) {
+		URI libraryURI = null;
+		Iterator<IRegisteredLibrary> librariesIterator = RegisteredLibrary.getRegisteredLibraries().iterator();
+		while (libraryURI == null && librariesIterator.hasNext()) {
+			IRegisteredLibrary registeredLibrary = librariesIterator.next();
+			if (registeredLibrary.getName().equals(name)) {
+				libraryURI = registeredLibrary.getUri();
+			}
+		}
+		return libraryURI;
+	}
+
+	/**
+	 * Return the URI corresponding to the searched profile
+	 * 
+	 * @param name
+	 *            - the name of the profile
+	 * @return profileURI - the URI corresponding to the profile
+	 */
+	private URI getRegisteredProfileURI(final String name) {
+		URI profileURI = null;
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile(name);
+		if (registeredProfile != null) {
+			profileURI = registeredProfile.getUri();
+		}
+		return profileURI;
+	}
+
+	/**
+	 * Load the library in the context of the given resourceSet
+	 * 
+	 * @param context
+	 *            - the resource set
+	 * @param name
+	 *            - the name of the library to load
+	 * @return library - a reference to the loaded library (null if not loaded)
+	 */
+	public PackageableElement loadLibrary(ResourceSet context, final String name) {
+		PackageableElement library = null;
+		URI libraryURI = this.getRegisteredLibraryURI(name);
+		if (libraryURI != null) {
+			Resource resource = context.getResource(libraryURI, true);
+			if (resource != null) {
+				EObject target = resource.getContents().get(0);
+				if (target instanceof PackageableElement) {
+					library = (PackageableElement) target;
+				}
+			}
+		}
+		return library;
+	}
+
+	/**
+	 * Load the profile in the context of the given resourceSet
+	 * 
+	 * @param context
+	 *            - the resourceSet
+	 * @param name
+	 *            - the name of the profile to load
+	 * @return profile - a reference to the loaded profile (null if not loaded)
+	 */
+	public Profile loadProfile(ResourceSet context, final String name) {
+		Profile profile = null;
+		URI profileURI = this.getRegisteredProfileURI(name);
+		if (profileURI != null) {
+			Resource resource = context.getResource(profileURI, true);
+			if (resource != null) {
+				EObject target = resource.getContents().get(0);
+				if (target instanceof Profile) {
+					profile = (Profile) target;
+				}
+			}
+		}
+		return profile;
+	}
+
+	/**
+	 * Unload the resources managed by the class
+	 */
+	public void clean() {
+		for (Resource r : this.registeredItemResourceSet.getResources()) {
+			if (r.isLoaded()) {
+				r.unload();
+			}
+		}
+		this.registeredItemResourceSet.getResources().clear();
+		this.registeredItemResourceSet = null;
+	}
+	
+	public class RequiredElementsNames {
+		/* Profiles */
+		public final static String STANDARD_PROFILE = "Standard";
+		public final static String ACTION_LANGUAGE_PROFILE = "ActionLanguage";
+		/* Libraries */
+		public final static String ALF_LIBRARY = "Alf Library";
+		public final static String UML_PRIMITIVE_TYPES = "UMLPrimitiveTypes";
+	}
+}
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Class_Redefinitions.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Class_Redefinitions.alf
index 42237805dc6..f1b25b0aaec 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Class_Redefinitions.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Class_Redefinitions.alf
@@ -1,19 +1,19 @@
-package Redefinitions {

-

-    public abstract class A {

-      abstract p(in x: Integer);

-      abstract q(in y: Boolean);

-    }

-    

-    public abstract class B {

-      abstract p(in x: Integer);

-    }

-

-	public class Redefinitions specializes A, B {

-	  p(in x: Integer) redefines A::p { }

-	  renamed1(in x: Integer) redefines A::p, B::p { }

-	  //renamed2(in x: Integer) redefines A::p { }

-	  q(in y: Boolean) { }

-	}

-

-}

+package Redefinitions {
+
+    public abstract class A {
+      abstract p(in x: Integer);
+      abstract q(in y: Boolean);
+    }
+    
+    public abstract class B {
+      abstract p(in x: Integer);
+    }
+
+	public class Redefinitions specializes A, B {
+	  p(in x: Integer) redefines A::p { }
+	  renamed1(in x: Integer) redefines A::p, B::p { }
+	  //renamed2(in x: Integer) redefines A::p { }
+	  q(in y: Boolean) { }
+	}
+
+}
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/DisambiguationTest.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/DisambiguationTest.alf
index 901447a4d32..95ec44daa2c 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/DisambiguationTest.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/DisambiguationTest.alf
@@ -1,11 +1,11 @@
-active class DisambiguationTest {

-

-    class Customer { 

-      public name: String;

-    }

-	

-    customer : Customer;

-    	  

-} do {

-    customer.name;

+active class DisambiguationTest {
+
+    class Customer { 
+      public name: String;
+    }
+	
+    customer : Customer;
+    	  
+} do {
+    customer.name;
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Assignment.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Assignment.alf
index 872d20d274e..207206b7ebb 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Assignment.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Assignment.alf
@@ -1,53 +1,53 @@
-/**

- * Test non-indexed assignment expressions.

- **/

-active class Expressions_Assignment {

-

-    public test(out i: Integer, out f: Boolean, out h: BitString, out filename: String, out a: Integer) {

-

-      i = 1;

-      i += 4;

-      i += 1;

-      i -= 1;

-      i *= 1;

-      i %= 6;

-      i /= 1;

-      

-      f = true;

-      f &= true;

-      f |= true;

-      f ^= true;

-      h = (BitString)0;

-      h = 0xab; // Bit string conversion

-      h &= 0xff;

-      h |= 1;

-      h ^= 1;

-      h <<= 1;

-      h >>= 1;

-      h >>>= 1;

-    

-      filename = "xyz";

-      filename += ".doc";

-      

-      a = 1;

-      a += 1;

-      test::a = 1;

-      test::a += i;

-      test.a = 1;

-      test.a += 1;

-    

-    }

-    

-    public activity AssertEqual(in label : String, in value1 : any, in value2 : any) {}

-    public activity AssertFalse(in label : String, in value : Boolean) {}

-} do {

-    this.test(i,f,h,filename,a);

-    

-    AssertEqual("i", i, 5);

-    AssertFalse("f", f);

-    AssertEqual("h", h, 0x55);

-    AssertEqual("filename", filename, "xyz.doc");

-    AssertEqual("a", a, 2);

-

-    WriteLine("Done");

+/**
+ * Test non-indexed assignment expressions.
+ **/
+active class Expressions_Assignment {
+
+    public test(out i: Integer, out f: Boolean, out h: BitString, out filename: String, out a: Integer) {
+
+      i = 1;
+      i += 4;
+      i += 1;
+      i -= 1;
+      i *= 1;
+      i %= 6;
+      i /= 1;
+      
+      f = true;
+      f &= true;
+      f |= true;
+      f ^= true;
+      h = (BitString)0;
+      h = 0xab; // Bit string conversion
+      h &= 0xff;
+      h |= 1;
+      h ^= 1;
+      h <<= 1;
+      h >>= 1;
+      h >>>= 1;
+    
+      filename = "xyz";
+      filename += ".doc";
+      
+      a = 1;
+      a += 1;
+      test::a = 1;
+      test::a += i;
+      test.a = 1;
+      test.a += 1;
+    
+    }
+    
+    public activity AssertEqual(in label : String, in value1 : any, in value2 : any) {}
+    public activity AssertFalse(in label : String, in value : Boolean) {}
+} do {
+    this.test(i,f,h,filename,a);
+    
+    AssertEqual("i", i, 5);
+    AssertFalse("f", f);
+    AssertEqual("h", h, 0x55);
+    AssertEqual("filename", filename, "xyz.doc");
+    AssertEqual("a", a, 2);
+
+    WriteLine("Done");
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Assignment_Feature.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Assignment_Feature.alf
index f3ba0b77b50..60e0deb4665 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Assignment_Feature.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Assignment_Feature.alf
@@ -1,79 +1,79 @@
-/**

- * Test non-indexed feature assignment expressions

- **/

-active class Expressions_Assignment_Feature {

-

-    private x: Integer;

-    private y: Integer[] sequence;

-    

-    private class C {

-        public x: Integer;

-        public y: Integer[] sequence;

-    }

-    

-    private datatype D {

-        public x: Integer;

-        public y: Integer[] sequence;

-    }

-    

-    private assoc A {

-        public c: C;

-        public n: Integer;

-    }

-

-    private assoc B {

-        public d: D;

-        public m: Integer;

-    }

-   

-    public test(out c: C, out d: D, out n: Integer, out m: Integer,

-        out self: Expressions_Assignment_Feature) {  

-      c = new C();

-      c.x = 2;

-      c.y = 1;

-      c.y = null;

-      c.y = Integer[]{1,2};

-      

-      c.n = 3;

-      n = A::n(c);

-     

-      d = new D(0, null);

-      d.x = 2;

-      d.y = 1;

-      d.y = null;

-      d.y = Integer[]{1,2};

-      

-      d.m = 3;

-      m = B::m(d);

-           

-      this.x = 2;

-      this.y = 1;

-      this.y = null;

-      this.y = Integer[]{1,2};

-      self = this;

-  

-    }

-} do {

-  /*

-    this.test(c,d,n,m,self);

-    

-    AssertEqual("c.x", c.x, 2);

-    AssertEqual("c.y[1]", c.y[1], 1);

-    AssertEqual("c.y[2]", c.y[2], 2);

-    AssertEqual("c.n", c.n, 3);

-    AssertEqual("n", n, 3);    

-    

-    AssertEqual("d.x", d.x, 2);

-    AssertEqual("d.y[1]", d.y[1], 1);

-    AssertEqual("d.y[2]", d.y[2], 2);

-    AssertEqual("d.m", d.m, 3);

-    AssertEqual("m", m, 3); 

-    

-    AssertEqual("self.x", self.x, 2);

-    AssertEqual("self.y[1]", self.y[1], 1);

-    AssertEqual("self.y[2]", self.y[2], 2);

-

-    WriteLine("Done");

-*/

-}

+/**
+ * Test non-indexed feature assignment expressions
+ **/
+active class Expressions_Assignment_Feature {
+
+    private x: Integer;
+    private y: Integer[] sequence;
+    
+    private class C {
+        public x: Integer;
+        public y: Integer[] sequence;
+    }
+    
+    private datatype D {
+        public x: Integer;
+        public y: Integer[] sequence;
+    }
+    
+    private assoc A {
+        public c: C;
+        public n: Integer;
+    }
+
+    private assoc B {
+        public d: D;
+        public m: Integer;
+    }
+   
+    public test(out c: C, out d: D, out n: Integer, out m: Integer,
+        out self: Expressions_Assignment_Feature) {  
+      c = new C();
+      c.x = 2;
+      c.y = 1;
+      c.y = null;
+      c.y = Integer[]{1,2};
+      
+      c.n = 3;
+      n = A::n(c);
+     
+      d = new D(0, null);
+      d.x = 2;
+      d.y = 1;
+      d.y = null;
+      d.y = Integer[]{1,2};
+      
+      d.m = 3;
+      m = B::m(d);
+           
+      this.x = 2;
+      this.y = 1;
+      this.y = null;
+      this.y = Integer[]{1,2};
+      self = this;
+  
+    }
+} do {
+  /*
+    this.test(c,d,n,m,self);
+    
+    AssertEqual("c.x", c.x, 2);
+    AssertEqual("c.y[1]", c.y[1], 1);
+    AssertEqual("c.y[2]", c.y[2], 2);
+    AssertEqual("c.n", c.n, 3);
+    AssertEqual("n", n, 3);    
+    
+    AssertEqual("d.x", d.x, 2);
+    AssertEqual("d.y[1]", d.y[1], 1);
+    AssertEqual("d.y[2]", d.y[2], 2);
+    AssertEqual("d.m", d.m, 3);
+    AssertEqual("m", m, 3); 
+    
+    AssertEqual("self.x", self.x, 2);
+    AssertEqual("self.y[1]", self.y[1], 1);
+    AssertEqual("self.y[2]", self.y[2], 2);
+
+    WriteLine("Done");
+*/
+}
       
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Association.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Association.alf
index dff803d5e63..06fcbc7b449 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Association.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Association.alf
@@ -1,151 +1,151 @@
-/**

- * Test association-related expressions.

- **/

-active class Expressions_Association {

-

-    // Supporting declarations *************************************************

-    

-      class Person { 

-          public name: String = "Jack";

-          @Create public Person(in name: String[0..1]) {

-//            if (name != null) {

-//              this.name = name;

-//            }

-          }

-      }

-      class House { 

-          public id: Integer;

-          @Create public House(in id: Integer) {

-//              this.id = id;

-          }

-      }

-      class Player specializes Person { 

-          @Create public Player(in name: String[0..1]) {

-//              super(name);

-          }

-      }

-      class Team { 

-          public name: String;

-          @Create public Team(in name: String) {

-//              this.name = name;

-          }

-      }

-      class Season { 

-          public year: Integer;

-          @Create public Season(in year: Integer) {

-//              this.year = year;

-          }

-      }

-      

-      assoc Owns {

-          owner: Person;

-          house: House;

-      }

-      

-      assoc Owns1 {

-          owner1: Person;

-          house1: House[*] ordered;

-      }

-      

-      assoc Roster {

-          player: Player[*];

-          team: Team;

-          season: Season[*];

-    }

-      

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

-

-    test(

-       out owner: Person, out house: House, 

-       out house_a: House, out house_b: House[0..1], 

-       out owner1_a: Person, out house1_a: House[*],

-       out owner1_b: Person, out house1_b: House[*], out house1_c: House[*],

-       out players1_a: Player[*], out players2_a: Player[*],

-       out players1_b: Player[*], out players2_b: Player[*]

-       ) 

-    {

-      

-      jack = new Person();

-      oldHouse = new House(1);

-      newHouse = new House(2);

-      

-      Owns.createLink(jack, oldHouse);

-      Owns.createLink(owner=>jack, house=>oldHouse);

-      

-      house = jack.house;

-      owner = Owns::owner(oldHouse);

-      

-      Owns.createLink(oldHouse.owner, newHouse);

-      Owns.createLink(Owns.owner(oldHouse), newHouse);

-      

-      house_a = jack.house;

-      

-      Owns.destroyLink(owner=>jack, house=>newHouse);

-

-      house_b = jack.house;

-      

-      Owns1.createLink(owner1=>jack, house1[1]=>oldHouse);

-      Owns1.createLink(owner1=>jack, house1[2]=>newHouse);

-      Owns1.createLink(owner1=>jack, house1[1]=>newHouse);

-     

-      house1_a = jack.house1;

-      owner1_a = Owns1::owner1(newHouse);

-      

-      Owns1.createLink(owner1=>new Person("Jane"), house1[1]=>newHouse);

-      

-      house1_b = jack.house1;

-      owner1_b = Owns1::owner1(newHouse);

-      

-      Owns1.createLink(owner1=>jack, house1[2]=>new House(3));

-      

-      house1_c = jack.house1;

-

-      Owns.clearAssoc(jack);

-      

-      p1 = new Player("Fred");

-      p2 = new Player("Marvin");

-      t1 = new Team("A");

-      t2 = new Team("B");

-      y = new Season(2011);

-      

-      Roster.createLink(p1, t1, y);

-      Roster.createLink(p2, t1, y);

-      

-      players1_a = Roster.player(t1, y);

-      players2_a = Roster.player(t2, y);

-      

-      Roster.createLink(p1, t2, y);

-      

-      players1_b = Roster.player(t1, y);

-      players2_b = Roster.player(t2, y);

-      

-    }

-

-} do {

-    this.test(owner, house, house_a, house_b,

-        owner1_a, house1_a, owner1_b, house1_b, house1_c,

-        players1_a, players2_a, players1_b, players2_b);

-/*    

-    AssertEqual("owner.name", owner.name, "Jack");

-    AssertEqual("house.id", house.id, 1);

-    AssertEqual("house_a.id", house_a.id, 2);

-    AssertTrue("house_b->isEmpty()", house_b->isEmpty());

-    AssertEqual("owner1_a.name", owner1_a.name, "Jack");

-    AssertEqual("house1_a->size()", house1_a->size(), 2);

-    AssertEqual("house1_a[1].id", house1_a[1].id, 2);

-    AssertEqual("house1_a[2].id", house1_a[2].id, 1);

-    AssertEqual("owner1_b.name", owner1_b.name, "Jane");

-    AssertEqual("house1_b->size()", house1_b->size(), 1);

-    AssertEqual("house1_b[1].id", house1_b[1].id, 1);

-    AssertEqual("house1_c->size()", house1_c->size(), 2);

-    AssertEqual("house1_c[1].id", house1_c[1].id, 1);

-    AssertEqual("house1_c[2].id", house1_c[2].id, 3);

-

-    AssertList("players1_a.name", players1_a.name, String[]{"Fred","Marvin"});

-    AssertTrue("players2_a->isEmpty()", players2_a->isEmpty());

-    AssertList("players1_b.name", players1_b.name, "Marvin");

-    AssertList("players2_b.name", players2_b.name, "Fred");

-

-    WriteLine("Done");

-    */

+/**
+ * Test association-related expressions.
+ **/
+active class Expressions_Association {
+
+    // Supporting declarations *************************************************
+    
+      class Person { 
+          public name: String = "Jack";
+          @Create public Person(in name: String[0..1]) {
+//            if (name != null) {
+//              this.name = name;
+//            }
+          }
+      }
+      class House { 
+          public id: Integer;
+          @Create public House(in id: Integer) {
+//              this.id = id;
+          }
+      }
+      class Player specializes Person { 
+          @Create public Player(in name: String[0..1]) {
+//              super(name);
+          }
+      }
+      class Team { 
+          public name: String;
+          @Create public Team(in name: String) {
+//              this.name = name;
+          }
+      }
+      class Season { 
+          public year: Integer;
+          @Create public Season(in year: Integer) {
+//              this.year = year;
+          }
+      }
+      
+      assoc Owns {
+          owner: Person;
+          house: House;
+      }
+      
+      assoc Owns1 {
+          owner1: Person;
+          house1: House[*] ordered;
+      }
+      
+      assoc Roster {
+          player: Player[*];
+          team: Team;
+          season: Season[*];
+    }
+      
+    //**************************************************************************
+
+    test(
+       out owner: Person, out house: House, 
+       out house_a: House, out house_b: House[0..1], 
+       out owner1_a: Person, out house1_a: House[*],
+       out owner1_b: Person, out house1_b: House[*], out house1_c: House[*],
+       out players1_a: Player[*], out players2_a: Player[*],
+       out players1_b: Player[*], out players2_b: Player[*]
+       ) 
+    {
+      
+      jack = new Person();
+      oldHouse = new House(1);
+      newHouse = new House(2);
+      
+      Owns.createLink(jack, oldHouse);
+      Owns.createLink(owner=>jack, house=>oldHouse);
+      
+      house = jack.house;
+      owner = Owns::owner(oldHouse);
+      
+      Owns.createLink(oldHouse.owner, newHouse);
+      Owns.createLink(Owns.owner(oldHouse), newHouse);
+      
+      house_a = jack.house;
+      
+      Owns.destroyLink(owner=>jack, house=>newHouse);
+
+      house_b = jack.house;
+      
+      Owns1.createLink(owner1=>jack, house1[1]=>oldHouse);
+      Owns1.createLink(owner1=>jack, house1[2]=>newHouse);
+      Owns1.createLink(owner1=>jack, house1[1]=>newHouse);
+     
+      house1_a = jack.house1;
+      owner1_a = Owns1::owner1(newHouse);
+      
+      Owns1.createLink(owner1=>new Person("Jane"), house1[1]=>newHouse);
+      
+      house1_b = jack.house1;
+      owner1_b = Owns1::owner1(newHouse);
+      
+      Owns1.createLink(owner1=>jack, house1[2]=>new House(3));
+      
+      house1_c = jack.house1;
+
+      Owns.clearAssoc(jack);
+      
+      p1 = new Player("Fred");
+      p2 = new Player("Marvin");
+      t1 = new Team("A");
+      t2 = new Team("B");
+      y = new Season(2011);
+      
+      Roster.createLink(p1, t1, y);
+      Roster.createLink(p2, t1, y);
+      
+      players1_a = Roster.player(t1, y);
+      players2_a = Roster.player(t2, y);
+      
+      Roster.createLink(p1, t2, y);
+      
+      players1_b = Roster.player(t1, y);
+      players2_b = Roster.player(t2, y);
+      
+    }
+
+} do {
+    this.test(owner, house, house_a, house_b,
+        owner1_a, house1_a, owner1_b, house1_b, house1_c,
+        players1_a, players2_a, players1_b, players2_b);
+/*    
+    AssertEqual("owner.name", owner.name, "Jack");
+    AssertEqual("house.id", house.id, 1);
+    AssertEqual("house_a.id", house_a.id, 2);
+    AssertTrue("house_b->isEmpty()", house_b->isEmpty());
+    AssertEqual("owner1_a.name", owner1_a.name, "Jack");
+    AssertEqual("house1_a->size()", house1_a->size(), 2);
+    AssertEqual("house1_a[1].id", house1_a[1].id, 2);
+    AssertEqual("house1_a[2].id", house1_a[2].id, 1);
+    AssertEqual("owner1_b.name", owner1_b.name, "Jane");
+    AssertEqual("house1_b->size()", house1_b->size(), 1);
+    AssertEqual("house1_b[1].id", house1_b[1].id, 1);
+    AssertEqual("house1_c->size()", house1_c->size(), 2);
+    AssertEqual("house1_c[1].id", house1_c[1].id, 1);
+    AssertEqual("house1_c[2].id", house1_c[2].id, 3);
+
+    AssertList("players1_a.name", players1_a.name, String[]{"Fred","Marvin"});
+    AssertTrue("players2_a->isEmpty()", players2_a->isEmpty());
+    AssertList("players1_b.name", players1_b.name, "Marvin");
+    AssertList("players2_b.name", players2_b.name, "Fred");
+
+    WriteLine("Done");
+    */
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Constructor_Destructor.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Constructor_Destructor.alf
index 738861c1d58..155fc0a2ac1 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Constructor_Destructor.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Constructor_Destructor.alf
@@ -1,108 +1,108 @@
-/**

- * Test constructor and destructor expressions.

- **/

-active class Expressions_Constructor_Destructor {

-

-    // Supporting declarations *************************************************

-    

-    class Initialization { 

-  	    public a: Integer = this.b -> size();

-  	    public b: Integer = 1;

-    }

-    class Initialization2 specializes Initialization {

-  	    public c: Integer = this.a + 2;

-    }

-    class Monitor { 

-        @Destroy public destroy(in recoveryLog: Log) { 

-            recoveryLog.logged = true; 

-        }

-    }

-    class Log { 

-    	  public name: String = "Default";

-    	  public logged: Boolean = false;

-    }

-    class Employee { 

-        public id: Integer;

-     	  public name: String;

-   	    public transferred: Boolean = false;

-   	    public relocated: Boolean = false;

-   		

-        @Create public Employee(in id: Integer, in name: String) { 

-            this.id = id;

-   	        this.name = name;

-   	    }

-  	    @Create public transferred(in employeeInfo: Employee) { 

-  	        this(employeeInfo.id, employeeInfo.name);

-  	        this.transferred = true;

-  	    }

-        @Create public relocated(in employeeInfo: Employee) {

-            this.transferred(employeeInfo);

-            this.relocated = true;

-        }

-    }

-    

-    datatype D0 {

-        public y: Integer[] sequence;

-    }

-   	

-    datatype D specializes D0 {

-        public x: String;

-    }

-  	

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

-

-    test(

-    	out employee1: Employee, out employee2: Employee, out employee3: Employee,

-    	out init: Initialization, 

-    	out log: Log, out monitor1: Monitor, out monitor2: Monitor,

-    	out d: D) {

-	  

-      i = 100;

-      name = "Fred";

-

-      employee1 = new Employee(i, name);

-      employee2 = new Employee::transferred(employee1);

-      employee3 = new Employee::relocated(employee2);

-      init = new Initialization2();

-      log = new Log();

-      monitor1 = new Monitor();

-	  

-      init.destroy();

-      

-      (monitor2 = new Monitor()).destroy(log);

-      

-      d = new D("test", Integer[]{1,2});

-      d = new D(x => "text");

-      d = new D('y' => Integer[]{1,2}, 'x' => "Test");

-    }

-

-} do {

-    this.test(employee1, employee2, employee3, init, log, monitor1, monitor2, d);

-    

-//    AssertEqual("employee1.id", employee1.id, 100);

-//    AssertEqual("employee1.name", employee1.name, "Fred");

-//    AssertFalse("employee1.transferred", employee1.transferred);

-//    AssertFalse("employee1.relocated", employee1.relocated);

-//    

-//    AssertEqual("employee2.id", employee2.id, 100);

-//    AssertEqual("employee2.name", employee2.name, "Fred");

-//    AssertTrue("employee2.transferred", employee2.transferred);

-//    AssertFalse("employee2.relocated", employee2.relocated);

-//    

-//    AssertEqual("employee3.id", employee3.id, 100);

-//    AssertEqual("employee3.name", employee3.name, "Fred");

-//    AssertTrue("employee3.transferred", employee3.transferred);

-//    AssertTrue("employee3.relocated", employee3.relocated);

-//    

-//    AssertFalse("init instanceof Initialization", init instanceof Initialization);

-//    

-//    AssertTrue("monitor1 instanceof Monitor", monitor1 instanceof Monitor);

-//    AssertFalse("monitor2 instanceof Monitor", monitor2 instanceof Monitor);

-//    AssertEqual("log.name", log.name, "Default");

-//    AssertTrue("log.logged", log.logged);

-//    

-//    AssertEqual("d.x", d.x, "test");

-//    AssertList("d.y", d.y, Integer[]{1,2});

-

-    WriteLine("Done");

+/**
+ * Test constructor and destructor expressions.
+ **/
+active class Expressions_Constructor_Destructor {
+
+    // Supporting declarations *************************************************
+    
+    class Initialization { 
+  	    public a: Integer = this.b -> size();
+  	    public b: Integer = 1;
+    }
+    class Initialization2 specializes Initialization {
+  	    public c: Integer = this.a + 2;
+    }
+    class Monitor { 
+        @Destroy public destroy(in recoveryLog: Log) { 
+            recoveryLog.logged = true; 
+        }
+    }
+    class Log { 
+    	  public name: String = "Default";
+    	  public logged: Boolean = false;
+    }
+    class Employee { 
+        public id: Integer;
+     	  public name: String;
+   	    public transferred: Boolean = false;
+   	    public relocated: Boolean = false;
+   		
+        @Create public Employee(in id: Integer, in name: String) { 
+            this.id = id;
+   	        this.name = name;
+   	    }
+  	    @Create public transferred(in employeeInfo: Employee) { 
+  	        this(employeeInfo.id, employeeInfo.name);
+  	        this.transferred = true;
+  	    }
+        @Create public relocated(in employeeInfo: Employee) {
+            this.transferred(employeeInfo);
+            this.relocated = true;
+        }
+    }
+    
+    datatype D0 {
+        public y: Integer[] sequence;
+    }
+   	
+    datatype D specializes D0 {
+        public x: String;
+    }
+  	
+    //**************************************************************************
+
+    test(
+    	out employee1: Employee, out employee2: Employee, out employee3: Employee,
+    	out init: Initialization, 
+    	out log: Log, out monitor1: Monitor, out monitor2: Monitor,
+    	out d: D) {
+	  
+      i = 100;
+      name = "Fred";
+
+      employee1 = new Employee(i, name);
+      employee2 = new Employee::transferred(employee1);
+      employee3 = new Employee::relocated(employee2);
+      init = new Initialization2();
+      log = new Log();
+      monitor1 = new Monitor();
+	  
+      init.destroy();
+      
+      (monitor2 = new Monitor()).destroy(log);
+      
+      d = new D("test", Integer[]{1,2});
+      d = new D(x => "text");
+      d = new D('y' => Integer[]{1,2}, 'x' => "Test");
+    }
+
+} do {
+    this.test(employee1, employee2, employee3, init, log, monitor1, monitor2, d);
+    
+//    AssertEqual("employee1.id", employee1.id, 100);
+//    AssertEqual("employee1.name", employee1.name, "Fred");
+//    AssertFalse("employee1.transferred", employee1.transferred);
+//    AssertFalse("employee1.relocated", employee1.relocated);
+//    
+//    AssertEqual("employee2.id", employee2.id, 100);
+//    AssertEqual("employee2.name", employee2.name, "Fred");
+//    AssertTrue("employee2.transferred", employee2.transferred);
+//    AssertFalse("employee2.relocated", employee2.relocated);
+//    
+//    AssertEqual("employee3.id", employee3.id, 100);
+//    AssertEqual("employee3.name", employee3.name, "Fred");
+//    AssertTrue("employee3.transferred", employee3.transferred);
+//    AssertTrue("employee3.relocated", employee3.relocated);
+//    
+//    AssertFalse("init instanceof Initialization", init instanceof Initialization);
+//    
+//    AssertTrue("monitor1 instanceof Monitor", monitor1 instanceof Monitor);
+//    AssertFalse("monitor2 instanceof Monitor", monitor2 instanceof Monitor);
+//    AssertEqual("log.name", log.name, "Default");
+//    AssertTrue("log.logged", log.logged);
+//    
+//    AssertEqual("d.x", d.x, "test");
+//    AssertList("d.y", d.y, Integer[]{1,2});
+
+    WriteLine("Done");
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Invocation.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Invocation.alf
index 6182e60418d..66ac0720c51 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Invocation.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Invocation.alf
@@ -1,97 +1,97 @@
-private import Alf::Library::PrimitiveBehaviors::IntegerFunctions::ToString;

-/**

- * Test behavior, operation and super invocation expressions.

- **/

-active class Expressions_Invocation {

-

-    // Supporting declarations *************************************************

-    

-  	activity A(in x: Integer, in y: Boolean[0..1]): Integer { 

-  	  return x; 	  

-  	}

-  	activity ComputeInterest(in amount: Integer): Integer { return amount; }

-  	activity B(out s: String) { s = "Hello"; }

-  	activity C(in b: BitString, out c: Integer) { c = 5; }

-  	

-    class Super {

-      public value: Integer = 0;

-      public name: String = "";

-      

-      public run() { }

-      public initialize(in value: Integer) { this.value = value; }

-      public setName(in name: String) { this.name = name; }

-    }

-    

-    class Super1 specializes Super {

-      public 'do'(in i: Integer) {

-        super.run();

-        super.initialize(i);

-        super.Super::setName("Fred");

-      }

-    }

-    

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

-

-    test(

-        out c: Integer, out b: BitString,

-        inout status1: String, out status2: String, out statuses: String[*],

-        out i: Integer, out j: Integer, out k: Integer, out l: Integer, out m: Integer,

-        out n: Integer, out n1: Integer, 

-        out obj: Super1, out list: Super[*] sequence, out ns: Integer) {

-          

-//        ComputeInterest("a"); // Type error!

-	

-        c = +0;

-        b = (BitString)c;

-        C(b, c);

-        C(c, b); // Bit string conversion

-        

-        B(status1);

-        B(status2);

-        B(statuses);

-        B(s);  // Define local name "s" as an output argument.

-        

-        i = A(1, true);

-        j = A(x=>2, y=>true);

-        k = A(y=>true, x=>3);

-        l = A(x=>4);

-        m = A(5, null);

-        

-        n1 = ComputeInterest(n = 3);

-        (obj = new Super1()).'do'(n);

-        new Super();

-        

-        list = (Super)null;

-        list = including(list, obj);

-        ns = size(Super.allInstances());

-	  }

-} do {

-    status1 = "Blah";

-    this.test(c, b, status1, status2, statuses, i, j, k, l, m, n, n1, obj, list, ns);

-    

-//    AssertEqual("b", b, 5);

-//    AssertEqual("c", c, 5);

-//    

-//    AssertEqual("status1", status1, "Hello");

-//    AssertEqual("status2", status2, "Hello");

-//    AssertList("statuses", statuses, "Hello");

-//    

-//    AssertEqual("i", i, 1);

-//    AssertEqual("j", j, 2);

-//    AssertEqual("k", k, 3);

-//    AssertEqual("l", l, 4);

-//    AssertEqual("m", m, 5);

-//    

-//    AssertEqual("n", n, 3);

-//    AssertEqual("n1", n1, 3);

-//    

-//    AssertEqual("obj.value", obj.value, 3);

-//    AssertEqual("obj.name", obj.name, "Fred");

-//    

-//    AssertEqual("list->size()", list->size(), 1);

-//    AssertTrue("list[1]==obj", list[1]==obj);

-//    

-//    AssertEqual("ns", ns, 2);

-

-    WriteLine("Done");

+private import Alf::Library::PrimitiveBehaviors::IntegerFunctions::ToString;
+/**
+ * Test behavior, operation and super invocation expressions.
+ **/
+active class Expressions_Invocation {
+
+    // Supporting declarations *************************************************
+    
+  	activity A(in x: Integer, in y: Boolean[0..1]): Integer { 
+  	  return x; 	  
+  	}
+  	activity ComputeInterest(in amount: Integer): Integer { return amount; }
+  	activity B(out s: String) { s = "Hello"; }
+  	activity C(in b: BitString, out c: Integer) { c = 5; }
+  	
+    class Super {
+      public value: Integer = 0;
+      public name: String = "";
+      
+      public run() { }
+      public initialize(in value: Integer) { this.value = value; }
+      public setName(in name: String) { this.name = name; }
+    }
+    
+    class Super1 specializes Super {
+      public 'do'(in i: Integer) {
+        super.run();
+        super.initialize(i);
+        super.Super::setName("Fred");
+      }
+    }
+    
+	  //**************************************************************************
+
+    test(
+        out c: Integer, out b: BitString,
+        inout status1: String, out status2: String, out statuses: String[*],
+        out i: Integer, out j: Integer, out k: Integer, out l: Integer, out m: Integer,
+        out n: Integer, out n1: Integer, 
+        out obj: Super1, out list: Super[*] sequence, out ns: Integer) {
+          
+//        ComputeInterest("a"); // Type error!
+	
+        c = +0;
+        b = (BitString)c;
+        C(b, c);
+        C(c, b); // Bit string conversion
+        
+        B(status1);
+        B(status2);
+        B(statuses);
+        B(s);  // Define local name "s" as an output argument.
+        
+        i = A(1, true);
+        j = A(x=>2, y=>true);
+        k = A(y=>true, x=>3);
+        l = A(x=>4);
+        m = A(5, null);
+        
+        n1 = ComputeInterest(n = 3);
+        (obj = new Super1()).'do'(n);
+        new Super();
+        
+        list = (Super)null;
+        list = including(list, obj);
+        ns = size(Super.allInstances());
+	  }
+} do {
+    status1 = "Blah";
+    this.test(c, b, status1, status2, statuses, i, j, k, l, m, n, n1, obj, list, ns);
+    
+//    AssertEqual("b", b, 5);
+//    AssertEqual("c", c, 5);
+//    
+//    AssertEqual("status1", status1, "Hello");
+//    AssertEqual("status2", status2, "Hello");
+//    AssertList("statuses", statuses, "Hello");
+//    
+//    AssertEqual("i", i, 1);
+//    AssertEqual("j", j, 2);
+//    AssertEqual("k", k, 3);
+//    AssertEqual("l", l, 4);
+//    AssertEqual("m", m, 5);
+//    
+//    AssertEqual("n", n, 3);
+//    AssertEqual("n1", n1, 3);
+//    
+//    AssertEqual("obj.value", obj.value, 3);
+//    AssertEqual("obj.name", obj.name, "Fred");
+//    
+//    AssertEqual("list->size()", list->size(), 1);
+//    AssertTrue("list[1]==obj", list[1]==obj);
+//    
+//    AssertEqual("ns", ns, 2);
+
+    WriteLine("Done");
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Literal_Name.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Literal_Name.alf
index 9365657ff38..0756d778903 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Literal_Name.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Literal_Name.alf
@@ -1,46 +1,46 @@
-/**

- * Test literal and name expressions.

- **/

-active class Expressions_Literal_Name {

-    enum Empty { }

-    

-    enum E {A, B, C, D}

-    

-    test(in a: Integer,

-      out i: any, out j: any, out k: any, out l: any, out m: any, out n: any, out x: any, out y: any,

-      out b: Integer, out c: Integer, out d: Integer, out e: E) {

-    

-      i = 1234;

-      j = 0;

-      k = 0b1010111000010000;

-      l = 0B0100_1010_0101_1011;

-      m = 0xAE10;

-      n = 0X4a_5b;

-      x = 057410;

-      y = 0_045_133;

-      

-      b = a;

-      c = Expressions_Literal_Name::test::a;

-      d = Expressions_Literal_Name.test.a;

-      

-      e = E::A;

-    

-    }

-} do {

-    this.test(1,i,j,k,l,m,n,x,y,b,c,d);

-    

-//    AssertEqual("i", i, 1234);

-//    AssertEqual("j", j, 0);

-//    AssertEqual("k", k, 44_560);

-//    AssertEqual("l", l, 19_035);

-//    AssertEqual("m", m, 44_560);

-//    AssertEqual("n", n, 19_035);

-//    AssertEqual("x", x, 24_328);

-//    AssertEqual("y", y, 19_035);

-//    

-//    AssertEqual("b", b, 1);

-//    AssertEqual("c", c, 1);

-//    AssertEqual("d", d, 1);

-

-    WriteLine("Done");

+/**
+ * Test literal and name expressions.
+ **/
+active class Expressions_Literal_Name {
+    enum Empty { }
+    
+    enum E {A, B, C, D}
+    
+    test(in a: Integer,
+      out i: any, out j: any, out k: any, out l: any, out m: any, out n: any, out x: any, out y: any,
+      out b: Integer, out c: Integer, out d: Integer, out e: E) {
+    
+      i = 1234;
+      j = 0;
+      k = 0b1010111000010000;
+      l = 0B0100_1010_0101_1011;
+      m = 0xAE10;
+      n = 0X4a_5b;
+      x = 057410;
+      y = 0_045_133;
+      
+      b = a;
+      c = Expressions_Literal_Name::test::a;
+      d = Expressions_Literal_Name.test.a;
+      
+      e = E::A;
+    
+    }
+} do {
+    this.test(1,i,j,k,l,m,n,x,y,b,c,d);
+    
+//    AssertEqual("i", i, 1234);
+//    AssertEqual("j", j, 0);
+//    AssertEqual("k", k, 44_560);
+//    AssertEqual("l", l, 19_035);
+//    AssertEqual("m", m, 44_560);
+//    AssertEqual("n", n, 19_035);
+//    AssertEqual("x", x, 24_328);
+//    AssertEqual("y", y, 19_035);
+//    
+//    AssertEqual("b", b, 1);
+//    AssertEqual("c", c, 1);
+//    AssertEqual("d", d, 1);
+
+    WriteLine("Done");
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Operator.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Operator.alf
index ead735a225f..d28883e8b41 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Operator.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Operator.alf
@@ -1,134 +1,134 @@
-/**

- * Test various operator expressions.

- **/

-active class Expressions_Operator {

-

-    // Supporting declarations *************************************************

-    

-    class Monitor {

-        public getActiveSensor(): Sensor { return new Sensor(); }

-    }

-    class Sensor {

-      public getReading(): Integer { return 2; }

-    }

-    class Person { }

-    class Employee specializes Person {

-      public id: Integer;

-      public name: String;

-    }

-    

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

-

-  test(

-     out i: Integer, out j: Integer,

-     out bs: BitString, out h: Integer,

-     out a: Boolean, out b: Boolean, out c: Boolean, out d: Boolean, out e: Boolean,

-     out e1: Boolean, out e2: Boolean, out e3: Boolean, out e4: Boolean, out e5: Boolean,

-     out e6: Boolean, out e7: Boolean, out e8: Boolean, out e9: Boolean,

-     out f: Boolean, out f1: Boolean, out f2: Boolean,

-     out x: any, out y: any[*] sequence, out z: Integer[], out r: Integer) {

-    

-    employee = new Employee();

-    monitor = new Monitor();

-

-    i = 1;

-    j = 2;

-      

-    i = +i; // 1

-    i = -i; // -1

-    i = i * j; // -2

-    i = i / j; // -1

-    i = i % j; // -1

-    i = i + j; // 1

-    i = i - j; // -1

-    

-    bs = (BitString)0xAB; // 0b10101011

-    bs = ~bs; // 0b11111111111111111111111101010100

-    bs = bs & 0xF0; // 0b01010000

-    bs = bs | 0360; // 0b11110000

-    bs = bs << 2; // 0b1111000000

-    bs = bs >> 2; // 0b11110000

-    bs = bs >>> 2; // 0b00111100

-    bs = bs ^ 4; // 0b00111000

-    

-    h = 0xAB;

-    h = (Integer)~h;

-    h = (Integer)(h & 0xF0);

-    h = (Integer)(h | 0360);

-    h = (Integer)(h << 2);

-    h = (Integer)(h >> 2);

-    h = (Integer)(h >>> 2);

-    h = (Integer)(h ^ 4); // 0x38

-      

-    a = i > j;

-    b = i < j;

-    c = i >= j;

-    d = i <= j;

-    

-    f = true;

-    g = false;

-    

-    e = f | g;

-    e = e & f;

-    e = !e;

-    

-    e1 = 3 < *;

-    e2 = (UnlimitedNatural)(+3) < *;

-    

-    e3 = employee instanceof Person;

-    e4 = i hastype Employee;

-    

-    e5 = i==0;

-    e6 = monitor!=monitor;

-    e7 = employee.name==null;

-    e8 = null!=employee.name;

-    e9 = null==null;

-    

-    f = i < j & (i > j | f);    

-      

-    f1 = i > 0 && 2 < j;

-    f2 = i == 0 || 2 >= j;

-    

-    x = !f? 1: +2;

-    y = f? Integer[]{1,2}: 0;    

-    z = (Integer)any[]{1,"banana",2};

-    

-    //r = $monitor.getActiveSensor().getReading();    

-  }

-} do {

-    this.test(i, j, bs, h, a, b, c, d, e, e1, e2, e3, e4, e5, e6, e7, e8, e9,

-      f, f1, f2, x, y, z, r);

-    /*  

-    AssertEqual("i", i, -1);

-    AssertEqual("j", j, 2);

-    AssertEqual("bs", bs, (BitString)0b00111000);

-    AssertEqual("h", h, 0x38);

-    

-    AssertFalse("a", a);

-    AssertTrue("b", b);

-    AssertFalse("c", c);

-    AssertTrue("d", d);

-    AssertFalse("e", e);

-    

-    AssertTrue("e1", e1);

-    AssertTrue("e2", e2);

-    AssertTrue("e3", e3);

-    AssertFalse("e4", e4);

-    AssertFalse("e5", e5);

-    AssertFalse("e6", e6);

-    AssertTrue("e7", e7);

-    AssertFalse("e8", e8);

-    AssertTrue("e9", e9);

-    

-    AssertTrue("f", f);

-    AssertFalse("f1", f1);

-    AssertTrue("f2", f2);

-    

-    AssertEqual("x", x, +2);

-    AssertList("y", y, Integer[]{1,2});

-    AssertList("z", z, Integer[]{1,2});

-    

-    AssertEqual("r", r, 2);

-    */

-    WriteLine("Done");

+/**
+ * Test various operator expressions.
+ **/
+active class Expressions_Operator {
+
+    // Supporting declarations *************************************************
+    
+    class Monitor {
+        public getActiveSensor(): Sensor { return new Sensor(); }
+    }
+    class Sensor {
+      public getReading(): Integer { return 2; }
+    }
+    class Person { }
+    class Employee specializes Person {
+      public id: Integer;
+      public name: String;
+    }
+    
+  //**************************************************************************
+
+  test(
+     out i: Integer, out j: Integer,
+     out bs: BitString, out h: Integer,
+     out a: Boolean, out b: Boolean, out c: Boolean, out d: Boolean, out e: Boolean,
+     out e1: Boolean, out e2: Boolean, out e3: Boolean, out e4: Boolean, out e5: Boolean,
+     out e6: Boolean, out e7: Boolean, out e8: Boolean, out e9: Boolean,
+     out f: Boolean, out f1: Boolean, out f2: Boolean,
+     out x: any, out y: any[*] sequence, out z: Integer[], out r: Integer) {
+    
+    employee = new Employee();
+    monitor = new Monitor();
+
+    i = 1;
+    j = 2;
+      
+    i = +i; // 1
+    i = -i; // -1
+    i = i * j; // -2
+    i = i / j; // -1
+    i = i % j; // -1
+    i = i + j; // 1
+    i = i - j; // -1
+    
+    bs = (BitString)0xAB; // 0b10101011
+    bs = ~bs; // 0b11111111111111111111111101010100
+    bs = bs & 0xF0; // 0b01010000
+    bs = bs | 0360; // 0b11110000
+    bs = bs << 2; // 0b1111000000
+    bs = bs >> 2; // 0b11110000
+    bs = bs >>> 2; // 0b00111100
+    bs = bs ^ 4; // 0b00111000
+    
+    h = 0xAB;
+    h = (Integer)~h;
+    h = (Integer)(h & 0xF0);
+    h = (Integer)(h | 0360);
+    h = (Integer)(h << 2);
+    h = (Integer)(h >> 2);
+    h = (Integer)(h >>> 2);
+    h = (Integer)(h ^ 4); // 0x38
+      
+    a = i > j;
+    b = i < j;
+    c = i >= j;
+    d = i <= j;
+    
+    f = true;
+    g = false;
+    
+    e = f | g;
+    e = e & f;
+    e = !e;
+    
+    e1 = 3 < *;
+    e2 = (UnlimitedNatural)(+3) < *;
+    
+    e3 = employee instanceof Person;
+    e4 = i hastype Employee;
+    
+    e5 = i==0;
+    e6 = monitor!=monitor;
+    e7 = employee.name==null;
+    e8 = null!=employee.name;
+    e9 = null==null;
+    
+    f = i < j & (i > j | f);    
+      
+    f1 = i > 0 && 2 < j;
+    f2 = i == 0 || 2 >= j;
+    
+    x = !f? 1: +2;
+    y = f? Integer[]{1,2}: 0;    
+    z = (Integer)any[]{1,"banana",2};
+    
+    //r = $monitor.getActiveSensor().getReading();    
+  }
+} do {
+    this.test(i, j, bs, h, a, b, c, d, e, e1, e2, e3, e4, e5, e6, e7, e8, e9,
+      f, f1, f2, x, y, z, r);
+    /*  
+    AssertEqual("i", i, -1);
+    AssertEqual("j", j, 2);
+    AssertEqual("bs", bs, (BitString)0b00111000);
+    AssertEqual("h", h, 0x38);
+    
+    AssertFalse("a", a);
+    AssertTrue("b", b);
+    AssertFalse("c", c);
+    AssertTrue("d", d);
+    AssertFalse("e", e);
+    
+    AssertTrue("e1", e1);
+    AssertTrue("e2", e2);
+    AssertTrue("e3", e3);
+    AssertFalse("e4", e4);
+    AssertFalse("e5", e5);
+    AssertFalse("e6", e6);
+    AssertTrue("e7", e7);
+    AssertFalse("e8", e8);
+    AssertTrue("e9", e9);
+    
+    AssertTrue("f", f);
+    AssertFalse("f1", f1);
+    AssertTrue("f2", f2);
+    
+    AssertEqual("x", x, +2);
+    AssertList("y", y, Integer[]{1,2});
+    AssertList("z", z, Integer[]{1,2});
+    
+    AssertEqual("r", r, 2);
+    */
+    WriteLine("Done");
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Construction.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Construction.alf
index f41cdb4f7b2..b984ac19bf2 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Construction.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Construction.alf
@@ -1,80 +1,80 @@
-/**

- * Test sequence construction expressions.

- **/

-active class Expressions_Sequence_Construction {

-

-    // Supporting declarations *************************************************

-

-    class Customer { 

-      public name: String;

-      @Create Customer(in name: String) { this.name = name; }

-    }

-    getList(): Integer[1..*] { return Integer[]{4,5,6}; }

-  	

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

-	

-    test(

-      out seq1: String[] sequence, 

-      out seq2: String[] sequence,

-      out seq3: any[] sequence,

-      out seq4: Integer[] sequence,

-      out seq5: Integer[] sequence,

-      out seq6: Integer[] sequence,

-      out seq7: Integer[] sequence,

-      out x: Integer,

-      out customers: Customer[] sequence,

-      out set1: Set<Integer>,

-      out set2: Set<Integer>,

-      out list: List< List<String> >

-    ) {

-	  

-	    seq1 = String[]{"apple","orange","strawberry"};

-	    seq2 = new String[]{"apple","orange","strawberry",};

-      seq3 = any[]{1, true, "blah"};

-      seq4 = Integer[]{1, 2, 3,};

-	    seq5 = Integer[]{1, 2, 3};

-	    seq6 = Integer[]{1..3};

-	    seq7 = null;

-	  

-	    x = this.getList()[2];

-	

-	    i = 2;

-	    customers = Customer[]{ new Customer("A"), new Customer("B") };

-	    customers[i] = new Customer("C");

-	  

-      set1 = new Set<Integer>(Integer[]{1,3,45});

-      set2 = Set<Integer>{1, 3, 45};

-      new Bag<String>{"Test"};

-      list = new List< List<String> >{{"apple","orange"},{"strawberry","raspberry"}};

-    }	  

-} do {

-  /*

-    this.test(seq1,seq2,seq3,seq4,seq5,seq6,seq7,x,customers,set1,set2,list);    

-    

-    AssertList("seq1", seq1, any[]{"apple","orange","strawberry"});

-    AssertList("seq2", seq2, any[]{"apple","orange","strawberry"});

-    AssertList("seq3", seq3, any[]{1, true, "blah"});

-    AssertList("seq4", seq4, any[]{1,2,3});

-    AssertList("seq5", seq5, any[]{1,2,3});

-    AssertList("seq6", seq6, any[]{1,2,3});

-    AssertTrue("seq7->isEmpty()", seq7->isEmpty());

-    

-    AssertEqual("x5", x, 5);

-    

-    AssertList("customers.name", customers.name, String[]{"A", "C"});

-    

-    AssertTrue("set1.includes(1)", set1.includes(1));

-    AssertTrue("set1.includes(3)", set1.includes(3));

-    AssertTrue("set1.includes(45)", set1.includes(45));

-    

-    AssertTrue("set2.includes(1)", set2.includes(1));

-    AssertTrue("set2.includes(3)", set2.includes(3));

-    AssertTrue("set2.includes(45)", set2.includes(45));

-    

-    AssertEqual("list.size()", list.size(), 2);

-    AssertList("list.at(1)", list.at(1).toSequence(), any[]{"apple","orange"});

-    AssertList("list.at(2)", list.at(2).toSequence(), any[]{"strawberry","raspberry"});

-

-    WriteLine("Done");

-    */

+/**
+ * Test sequence construction expressions.
+ **/
+active class Expressions_Sequence_Construction {
+
+    // Supporting declarations *************************************************
+
+    class Customer { 
+      public name: String;
+      @Create Customer(in name: String) { this.name = name; }
+    }
+    getList(): Integer[1..*] { return Integer[]{4,5,6}; }
+  	
+    //**************************************************************************
+	
+    test(
+      out seq1: String[] sequence, 
+      out seq2: String[] sequence,
+      out seq3: any[] sequence,
+      out seq4: Integer[] sequence,
+      out seq5: Integer[] sequence,
+      out seq6: Integer[] sequence,
+      out seq7: Integer[] sequence,
+      out x: Integer,
+      out customers: Customer[] sequence,
+      out set1: Set<Integer>,
+      out set2: Set<Integer>,
+      out list: List< List<String> >
+    ) {
+	  
+	    seq1 = String[]{"apple","orange","strawberry"};
+	    seq2 = new String[]{"apple","orange","strawberry",};
+      seq3 = any[]{1, true, "blah"};
+      seq4 = Integer[]{1, 2, 3,};
+	    seq5 = Integer[]{1, 2, 3};
+	    seq6 = Integer[]{1..3};
+	    seq7 = null;
+	  
+	    x = this.getList()[2];
+	
+	    i = 2;
+	    customers = Customer[]{ new Customer("A"), new Customer("B") };
+	    customers[i] = new Customer("C");
+	  
+      set1 = new Set<Integer>(Integer[]{1,3,45});
+      set2 = Set<Integer>{1, 3, 45};
+      new Bag<String>{"Test"};
+      list = new List< List<String> >{{"apple","orange"},{"strawberry","raspberry"}};
+    }	  
+} do {
+  /*
+    this.test(seq1,seq2,seq3,seq4,seq5,seq6,seq7,x,customers,set1,set2,list);    
+    
+    AssertList("seq1", seq1, any[]{"apple","orange","strawberry"});
+    AssertList("seq2", seq2, any[]{"apple","orange","strawberry"});
+    AssertList("seq3", seq3, any[]{1, true, "blah"});
+    AssertList("seq4", seq4, any[]{1,2,3});
+    AssertList("seq5", seq5, any[]{1,2,3});
+    AssertList("seq6", seq6, any[]{1,2,3});
+    AssertTrue("seq7->isEmpty()", seq7->isEmpty());
+    
+    AssertEqual("x5", x, 5);
+    
+    AssertList("customers.name", customers.name, String[]{"A", "C"});
+    
+    AssertTrue("set1.includes(1)", set1.includes(1));
+    AssertTrue("set1.includes(3)", set1.includes(3));
+    AssertTrue("set1.includes(45)", set1.includes(45));
+    
+    AssertTrue("set2.includes(1)", set2.includes(1));
+    AssertTrue("set2.includes(3)", set2.includes(3));
+    AssertTrue("set2.includes(45)", set2.includes(45));
+    
+    AssertEqual("list.size()", list.size(), 2);
+    AssertList("list.at(1)", list.at(1).toSequence(), any[]{"apple","orange"});
+    AssertList("list.at(2)", list.at(2).toSequence(), any[]{"strawberry","raspberry"});
+
+    WriteLine("Done");
+    */
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Expansion_Reduction.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Expansion_Reduction.alf
index 77e0ae5cb3f..72fa2d8ff73 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Expansion_Reduction.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Expansion_Reduction.alf
@@ -1,120 +1,120 @@
-private import Alf::Library::PrimitiveBehaviors::IntegerFunctions::*;

-/**

- * Test sequence expansion and reduction expressions.

- **/

-active class Expressions_Sequence_Expansion_Reduction {

-

-    // Supporting declarations *************************************************

-    

-  	public class Employee {

-    	public age: Integer = 51;

-    	public isMarried: Boolean = true;

-    	public name: String = "Joan";

-    	public title: String = "President";

-    	public id: Integer = 1;

-    }

-    

-    public class Attribute {

-    

-      public type: Integer = 0;

-      

-    }

-  

-    public class Something {

-    

-      public attribute: Attribute [*] = new Attribute();

-      

-    }

-    

-    public class Object {

-    

-      public attr: Attribute;

-    

-      public init (in attr: Attribute) {

-        this.attr = attr;

-      }

-      

-    }

-    

-    activity Bad(in x: Integer, in y: Integer): Integer { return x/y; }

-

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

-

-	public activity test(

-	  out sum: Integer,

-	  out remainder: Integer,

-	  out bad: Integer,

-	  out select: Employee[*] sequence, 

-	  out reject: Employee[*] sequence,

-	  out collect: String[*] sequence,

-	  out iterate: String[*] sequence,

-	  out forAll: Boolean,

-	  out exists: Boolean,

-	  out one: Boolean,

-	  out unique: Boolean,

-	  out jack: Employee,

-	  out joan: Employee,

-	  out something: Something,

-	  out obj: Object) {

-	  

-	  subtotals = Integer[]{1,2,3};

-	  sum = subtotals->reduce '+';

-	  remainder = subtotals->reduce ordered '%';

-	  bad = Integer[]{1,0,4,2}->reduce Bad;

-	  

-	  e1 = new Employee();

-	  e2 = new Employee();

-	  e2.name = "Jack";

-	  e2.age = 30;

-	  e2.isMarried = false;

-	  e2.title = "Director";

-	  e2.id = 1;

-	  

-	  employees = Employee[]{e1, e2};

-	    

-	  select = employees->select e (e.age>50);

-	  reject = employees->reject e (e.isMarried);

-	  collect = employees->collect a (a.name);

-	  iterate = employees->iterate e (e.name);

-	  forAll = employees->forAll e (e.age<=65);

-	  exists = employees->exists e (e.name=="Joan");

-	  one = employees->one e (e.title=="President");

-	  unique = employees->isUnique e (e.id);

-	  

-	  jack = Employee->select e (e.name=="Jack")[1];

-	  joan = Employee.allInstances()->select e (e.name=="Joan")[1];

-	  

-	  myType = +1;

-    something = new Something();

-    something.attribute->iterate attr (attr.type = myType);

-    

-    obj = new Object();

-    something.attribute->iterate attr (obj.init(attr));

-    

-	}

-} do {

-    test(sum, remainder, bad, 

-    select, reject, collect, iterate, forAll, exists, one, unique, 

-    jack, joan, something, obj);

-    

-//    AssertEqual("sum",sum, 6);

-//    AssertEqual("remainder", remainder, 1);

-//    AssertEqual("bad", bad, 2);

-//    

-//    AssertList("select.name", select.name, String[]{"Joan"});

-//    AssertList("reject.name", reject.name, String[]{"Jack"});

-//    AssertList("collect.name", collect, String[]{"Joan","Jack"});

-//    AssertList("iterate.name", iterate, String[]{"Joan","Jack"});

-//    AssertTrue("forAll", forAll);

-//    AssertTrue("exists", exists);

-//    AssertTrue("one", one);

-//    AssertFalse("unique", unique);

-//    

-//    AssertEqual("jack.name", jack.name, "Jack");

-//    AssertEqual("joan.name", joan.name, "Joan");

-//

-//    AssertList("something.attribute.type", something.attribute.type, 1);

-//    AssertEqual("obj.attr.type", obj.attr.type, 1); 

-    

-    WriteLine("Done");

+private import Alf::Library::PrimitiveBehaviors::IntegerFunctions::*;
+/**
+ * Test sequence expansion and reduction expressions.
+ **/
+active class Expressions_Sequence_Expansion_Reduction {
+
+    // Supporting declarations *************************************************
+    
+  	public class Employee {
+    	public age: Integer = 51;
+    	public isMarried: Boolean = true;
+    	public name: String = "Joan";
+    	public title: String = "President";
+    	public id: Integer = 1;
+    }
+    
+    public class Attribute {
+    
+      public type: Integer = 0;
+      
+    }
+  
+    public class Something {
+    
+      public attribute: Attribute [*] = new Attribute();
+      
+    }
+    
+    public class Object {
+    
+      public attr: Attribute;
+    
+      public init (in attr: Attribute) {
+        this.attr = attr;
+      }
+      
+    }
+    
+    activity Bad(in x: Integer, in y: Integer): Integer { return x/y; }
+
+	//**************************************************************************
+
+	public activity test(
+	  out sum: Integer,
+	  out remainder: Integer,
+	  out bad: Integer,
+	  out select: Employee[*] sequence, 
+	  out reject: Employee[*] sequence,
+	  out collect: String[*] sequence,
+	  out iterate: String[*] sequence,
+	  out forAll: Boolean,
+	  out exists: Boolean,
+	  out one: Boolean,
+	  out unique: Boolean,
+	  out jack: Employee,
+	  out joan: Employee,
+	  out something: Something,
+	  out obj: Object) {
+	  
+	  subtotals = Integer[]{1,2,3};
+	  sum = subtotals->reduce '+';
+	  remainder = subtotals->reduce ordered '%';
+	  bad = Integer[]{1,0,4,2}->reduce Bad;
+	  
+	  e1 = new Employee();
+	  e2 = new Employee();
+	  e2.name = "Jack";
+	  e2.age = 30;
+	  e2.isMarried = false;
+	  e2.title = "Director";
+	  e2.id = 1;
+	  
+	  employees = Employee[]{e1, e2};
+	    
+	  select = employees->select e (e.age>50);
+	  reject = employees->reject e (e.isMarried);
+	  collect = employees->collect a (a.name);
+	  iterate = employees->iterate e (e.name);
+	  forAll = employees->forAll e (e.age<=65);
+	  exists = employees->exists e (e.name=="Joan");
+	  one = employees->one e (e.title=="President");
+	  unique = employees->isUnique e (e.id);
+	  
+	  jack = Employee->select e (e.name=="Jack")[1];
+	  joan = Employee.allInstances()->select e (e.name=="Joan")[1];
+	  
+	  myType = +1;
+    something = new Something();
+    something.attribute->iterate attr (attr.type = myType);
+    
+    obj = new Object();
+    something.attribute->iterate attr (obj.init(attr));
+    
+	}
+} do {
+    test(sum, remainder, bad, 
+    select, reject, collect, iterate, forAll, exists, one, unique, 
+    jack, joan, something, obj);
+    
+//    AssertEqual("sum",sum, 6);
+//    AssertEqual("remainder", remainder, 1);
+//    AssertEqual("bad", bad, 2);
+//    
+//    AssertList("select.name", select.name, String[]{"Joan"});
+//    AssertList("reject.name", reject.name, String[]{"Jack"});
+//    AssertList("collect.name", collect, String[]{"Joan","Jack"});
+//    AssertList("iterate.name", iterate, String[]{"Joan","Jack"});
+//    AssertTrue("forAll", forAll);
+//    AssertTrue("exists", exists);
+//    AssertTrue("one", one);
+//    AssertFalse("unique", unique);
+//    
+//    AssertEqual("jack.name", jack.name, "Jack");
+//    AssertEqual("joan.name", joan.name, "Joan");
+//
+//    AssertList("something.attribute.type", something.attribute.type, 1);
+//    AssertEqual("obj.attr.type", obj.attr.type, 1); 
+    
+    WriteLine("Done");
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Operation.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Operation.alf
index 03627ae4b3f..5fa5b444075 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Operation.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Sequence_Operation.alf
@@ -1,55 +1,55 @@
-/**

- * Test sequence operation expressions.

- **/

-active class Expressions_Sequence_Operation {

-

-    // Supporting declarations *************************************************

-    

-  	class Customer { 

-  		public name: String;

-  		@Create Customer(in name: String) { this.name = name; }

-	}

-  	

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

-

-	test(

-		out notEmpty: Boolean, out includes: Boolean, out m: Integer, out n: Integer,

-		out customers: Customer[*], out list: any[*]) {

-	

-	  customer = new Customer("A");

-	  customers = Customer[]{};

-	  

-	  notEmpty = customers->notEmpty();

-	  customers->notEmpty(); // Check that notEmpty is still resolvable as a behavior.

-	  includes = customers->includes(customer);

-	  customers = customers->including(customer);

-	  customers->add(new Customer("B"));

-	  customers->add(new Customer("C"));

-	  customers->add(customer);

-	  customers->removeAt(2);

-	  customers->remove(customer);

-	  

-	  m = Customer->size();

-	  n = Customer.allInstances()->size();

-	  

-	  list = null; // Type is "any".

-	  list = list->including(customer);

-	  list->add(customer);

-	  list->add("Blah");

-	  list->add(1);

-	  list->removeAll(customer);

-	}

-	

-} do {

-    this.test(notEmpty, includes, n, m, customers, list);

-    

-//    AssertFalse("notEmpty", notEmpty);

-//    AssertFalse("includes", includes);

-//    AssertEqual("n", n, 3);

-//    AssertEqual("m", m, 3);

-//    

-//    AssertList("customers.name", customers.name, "C");

-//    AssertList("list", list, any[]{"Blah", 1});

-

-    WriteLine("Done");

+/**
+ * Test sequence operation expressions.
+ **/
+active class Expressions_Sequence_Operation {
+
+    // Supporting declarations *************************************************
+    
+  	class Customer { 
+  		public name: String;
+  		@Create Customer(in name: String) { this.name = name; }
+	}
+  	
+	//**************************************************************************
+
+	test(
+		out notEmpty: Boolean, out includes: Boolean, out m: Integer, out n: Integer,
+		out customers: Customer[*], out list: any[*]) {
+	
+	  customer = new Customer("A");
+	  customers = Customer[]{};
+	  
+	  notEmpty = customers->notEmpty();
+	  customers->notEmpty(); // Check that notEmpty is still resolvable as a behavior.
+	  includes = customers->includes(customer);
+	  customers = customers->including(customer);
+	  customers->add(new Customer("B"));
+	  customers->add(new Customer("C"));
+	  customers->add(customer);
+	  customers->removeAt(2);
+	  customers->remove(customer);
+	  
+	  m = Customer->size();
+	  n = Customer.allInstances()->size();
+	  
+	  list = null; // Type is "any".
+	  list = list->including(customer);
+	  list->add(customer);
+	  list->add("Blah");
+	  list->add(1);
+	  list->removeAll(customer);
+	}
+	
+} do {
+    this.test(notEmpty, includes, n, m, customers, list);
+    
+//    AssertFalse("notEmpty", notEmpty);
+//    AssertFalse("includes", includes);
+//    AssertEqual("n", n, 3);
+//    AssertEqual("m", m, 3);
+//    
+//    AssertList("customers.name", customers.name, "C");
+//    AssertList("list", list, any[]{"Blah", 1});
+
+    WriteLine("Done");
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Template.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Template.alf
index 475bf7cac0a..b09f4f01202 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Template.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Expressions_Template.alf
@@ -1,79 +1,79 @@
-/**

- * Test expressions involving templates.

- **/

-active class Expressions_Template {

-

-    public receive signal Continue { }

-

-    public activity A<T specializes B>(in x: T): Integer { 

-      return x.i;

-    }

-    

-    public class B {

-      public i: Integer;

-      @Create public B(in i: Integer) { this.i = i; }

-    }

-    

-    public class C<T> {

-        p: T;

-        

-        @Create public C(in p: T) { this.p = p; }

-        r(): T { return this.p; }

-        

-        activity E(in x: T): T { return x; }

-    }

-    

-    public active class H<T> {

-        public a: T;

-        public b: T;

-        public t: TestRunner;

-        @Create public H(in a: T, in t: TestRunner) { 

-          this.a = a; 

-          this.t = t;

-        }

-    } do {

-        $(this.b = new C<T>(this.a).r());

-        this.t.Continue();

-    }

-    

-    public active class TestRunner {

-      public receive signal Start { }

-      public receive signal Continue { }

-      

-      public test(

-        out i: Integer, out j: Integer, out h: H<B>,

-        out s: Set<Integer>, out list: List<Integer>

-        ) {

-        

-        b = new B(1);

-        

-        i = A<B>(b);

-        j = C<B>.E(b).i;

-        h = new H<B>(b, this);      

-  

-        s = new Set<Integer>(null);

-        s.add(1);

-        

-        list = List<Integer>{1, 2, 3};

-      }

-      

-    } do {

-      /*

-      accept (Start);

-      this.test(i, j, h, s, list);

-      accept (Continue);

-      

-      AssertEqual("i", i, 1);

-      AssertEqual("j", j, 1);

-      AssertEqual("h.b.i", h.b.i, 1);

-      

-      AssertList("s", s.toSequence(), 1);

-      AssertList("list", list.toSequence(), Integer[]{1,2,3});

-      

-      WriteLine("Done");

-      */

-    }

-    

-} do {

-   new TestRunner().Start();

+/**
+ * Test expressions involving templates.
+ **/
+active class Expressions_Template {
+
+    public receive signal Continue { }
+
+    public activity A<T specializes B>(in x: T): Integer { 
+      return x.i;
+    }
+    
+    public class B {
+      public i: Integer;
+      @Create public B(in i: Integer) { this.i = i; }
+    }
+    
+    public class C<T> {
+        p: T;
+        
+        @Create public C(in p: T) { this.p = p; }
+        r(): T { return this.p; }
+        
+        activity E(in x: T): T { return x; }
+    }
+    
+    public active class H<T> {
+        public a: T;
+        public b: T;
+        public t: TestRunner;
+        @Create public H(in a: T, in t: TestRunner) { 
+          this.a = a; 
+          this.t = t;
+        }
+    } do {
+        $(this.b = new C<T>(this.a).r());
+        this.t.Continue();
+    }
+    
+    public active class TestRunner {
+      public receive signal Start { }
+      public receive signal Continue { }
+      
+      public test(
+        out i: Integer, out j: Integer, out h: H<B>,
+        out s: Set<Integer>, out list: List<Integer>
+        ) {
+        
+        b = new B(1);
+        
+        i = A<B>(b);
+        j = C<B>.E(b).i;
+        h = new H<B>(b, this);      
+  
+        s = new Set<Integer>(null);
+        s.add(1);
+        
+        list = List<Integer>{1, 2, 3};
+      }
+      
+    } do {
+      /*
+      accept (Start);
+      this.test(i, j, h, s, list);
+      accept (Continue);
+      
+      AssertEqual("i", i, 1);
+      AssertEqual("j", j, 1);
+      AssertEqual("h.b.i", h.b.i, 1);
+      
+      AssertList("s", s.toSequence(), 1);
+      AssertList("list", list.toSequence(), Integer[]{1,2,3});
+      
+      WriteLine("Done");
+      */
+    }
+    
+} do {
+   new TestRunner().Start();
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/ReferentTest.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/ReferentTest.alf
index 4bbe4c24bfe..4e48409c82d 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/ReferentTest.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/ReferentTest.alf
@@ -1,10 +1,10 @@
-class ReferentTest {

-

-  public active class Test {

-    private test(out test: Test) {

-    }

-    

-  } do {

-    this.test();

-  }

-}

+class ReferentTest {
+
+  public active class Test {
+    private test(out test: Test) {
+    }
+    
+  } do {
+    this.test();
+  }
+}
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Accept.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Accept.alf
index c5dda80f0d8..f827b80b1ed 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Accept.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Accept.alf
@@ -1,124 +1,124 @@
-/**

- * Test accept statements.

- **/

-active class Statements_Accept {

-

-  private abstract active class Super {

-    public signal SignalNewArrival { public name: String; }

-    public receive signal SignalTermination { }

-  }

-

-  private active class Test specializes Super {

-  

-    public sig: any;

-    public sig1: any;

-    public name: String;

-    public terminate: Boolean;

-    public arrival: SignalNewArrival;

-    

-    public count: Integer = 0;

-    public signals: any[*] sequence;

-    

-    public flag: Boolean;

-

-    public receive SignalNewArrival;

-    

-    public tester: TestRunner;

-    

-    @Create

-    public Test(in tester: TestRunner) {

-      this.tester = tester;

-    }

-  

-  } do {

-    

-    accept (sig: SignalNewArrival, SignalTermination);    

-    this.sig = sig;

-    

-    terminate = false;

-    accept (arrival1: SignalNewArrival) {

-      this.name = arrival1.name;

-    } or accept (SignalTermination) {

-      terminate = true;

-    }

-    this.terminate = terminate;

-    

-    accept (SignalNewArrival);

-    

-    accept (arrival3: SignalNewArrival);

-    this.arrival = arrival3;

-    

-    for (i in 1..2) {

-      accept (s1: SignalNewArrival, SignalTermination);

-      this.signals[i] = s1;

-    }

-    

-    do {

-      accept (s: SignalNewArrival, SignalTermination);

-      this.count++;

-    } while (s hastype SignalNewArrival);

-    

-    if (true) {

-      accept (SignalNewArrival);

-      this.flag = true;

-    } else {

-      accept (SignalTermination);

-      this.flag = false;

-    }

-    

-    accept (sig1: SignalTermination);

-    this.sig1 = sig1;

-    

-    this.tester.Continue();

-    

-  }

-  

-  public active class TestRunner {

-    public receive signal Start { }

-    public receive signal Continue { }

-

-    private run(out test: Test) {

-      test = new Test(this);

-      

-      test.SignalTermination();

-      test.SignalNewArrival("Arrival1");

-      test.SignalNewArrival("Arrival2");

-      test.SignalNewArrival("Arrival3");

-      

-      test.SignalNewArrival("Arrival4");

-      test.SignalTermination();

-      

-      test.SignalNewArrival("Arrival5");    

-      test.SignalNewArrival("Arrival6");

-      test.SignalTermination();

-      

-      test.SignalNewArrival("Arrival7");

-      test.SignalNewArrival("Arrival8");

-      test.SignalTermination();

-    }

-    

-  } do {

-    /*

-    accept(Start);

-    this.run(test);

-    accept (Continue);

-  

-    AssertTrue("test.sig instanceof SignalTermination", test.sig instanceof Test::SignalTermination);

-    AssertEqual("test.name", test.name, "Arrival1");

-    AssertFalse("test.terminate", test.terminate);

-    AssertEqual("test.arrival.name", test.arrival.name, "Arrival3");

-    

-    AssertTrue("test.signals[1] hastype SignalArrival", test.signals[1] hastype Test::SignalNewArrival);

-    AssertTrue("test.signals[2] hastype SignalTermination", test.signals[2] hastype Test::SignalTermination);

-    

-    AssertEqual("test.count", test.count, 3);

-    AssertTrue("test.flag", test.flag);

-    AssertTrue("test.sig1 instanceof SignalTermination", test.sig1 instanceof Test::SignalTermination);

-    

-    WriteLine("Done");

-    */

-  }

-

-} do {

-  new TestRunner().Start();

-}

+/**
+ * Test accept statements.
+ **/
+active class Statements_Accept {
+
+  private abstract active class Super {
+    public signal SignalNewArrival { public name: String; }
+    public receive signal SignalTermination { }
+  }
+
+  private active class Test specializes Super {
+  
+    public sig: any;
+    public sig1: any;
+    public name: String;
+    public terminate: Boolean;
+    public arrival: SignalNewArrival;
+    
+    public count: Integer = 0;
+    public signals: any[*] sequence;
+    
+    public flag: Boolean;
+
+    public receive SignalNewArrival;
+    
+    public tester: TestRunner;
+    
+    @Create
+    public Test(in tester: TestRunner) {
+      this.tester = tester;
+    }
+  
+  } do {
+    
+    accept (sig: SignalNewArrival, SignalTermination);    
+    this.sig = sig;
+    
+    terminate = false;
+    accept (arrival1: SignalNewArrival) {
+      this.name = arrival1.name;
+    } or accept (SignalTermination) {
+      terminate = true;
+    }
+    this.terminate = terminate;
+    
+    accept (SignalNewArrival);
+    
+    accept (arrival3: SignalNewArrival);
+    this.arrival = arrival3;
+    
+    for (i in 1..2) {
+      accept (s1: SignalNewArrival, SignalTermination);
+      this.signals[i] = s1;
+    }
+    
+    do {
+      accept (s: SignalNewArrival, SignalTermination);
+      this.count++;
+    } while (s hastype SignalNewArrival);
+    
+    if (true) {
+      accept (SignalNewArrival);
+      this.flag = true;
+    } else {
+      accept (SignalTermination);
+      this.flag = false;
+    }
+    
+    accept (sig1: SignalTermination);
+    this.sig1 = sig1;
+    
+    this.tester.Continue();
+    
+  }
+  
+  public active class TestRunner {
+    public receive signal Start { }
+    public receive signal Continue { }
+
+    private run(out test: Test) {
+      test = new Test(this);
+      
+      test.SignalTermination();
+      test.SignalNewArrival("Arrival1");
+      test.SignalNewArrival("Arrival2");
+      test.SignalNewArrival("Arrival3");
+      
+      test.SignalNewArrival("Arrival4");
+      test.SignalTermination();
+      
+      test.SignalNewArrival("Arrival5");    
+      test.SignalNewArrival("Arrival6");
+      test.SignalTermination();
+      
+      test.SignalNewArrival("Arrival7");
+      test.SignalNewArrival("Arrival8");
+      test.SignalTermination();
+    }
+    
+  } do {
+    /*
+    accept(Start);
+    this.run(test);
+    accept (Continue);
+  
+    AssertTrue("test.sig instanceof SignalTermination", test.sig instanceof Test::SignalTermination);
+    AssertEqual("test.name", test.name, "Arrival1");
+    AssertFalse("test.terminate", test.terminate);
+    AssertEqual("test.arrival.name", test.arrival.name, "Arrival3");
+    
+    AssertTrue("test.signals[1] hastype SignalArrival", test.signals[1] hastype Test::SignalNewArrival);
+    AssertTrue("test.signals[2] hastype SignalTermination", test.signals[2] hastype Test::SignalTermination);
+    
+    AssertEqual("test.count", test.count, 3);
+    AssertTrue("test.flag", test.flag);
+    AssertTrue("test.sig1 instanceof SignalTermination", test.sig1 instanceof Test::SignalTermination);
+    
+    WriteLine("Done");
+    */
+  }
+
+} do {
+  new TestRunner().Start();
+}
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Classify.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Classify.alf
index eeae3bb030b..79a423d5786 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Classify.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Classify.alf
@@ -1,79 +1,79 @@
-/**

- * Test classify statements.

- **/

-active class Statements_Classify {

-

-    // Supporting declarations *************************************************

-    

-    class Monitor { }

-	  class InActiveMonitor specializes Monitor { }

-	  active class ActiveMonitor specializes Monitor {

-	      public n: Integer = 0;

-	  } do {

-	      this.n = 1;

-	      TestRunner.allInstances().Continue();

-	  }

-	  

-    class Employee { }

-    class Administrator specializes Employee { }

-    class Staff specializes Employee { }

-    class PartTime specializes Employee { }

-    class Issue { }

-    class Pending specializes Issue { }

-    class InProcess specializes Issue { }

-    class Overdue specializes Issue { }

-    class Resolved specializes Issue { }

-    

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

-

-    active class TestRunner {

-      public receive signal Start { }

-      public receive signal Continue { }

-      

-      public test(out employee: Employee, out monitor: Monitor, out issue: Issue) {

-      

-        // Setup

-  	    employee = new Staff();

-  	    monitor = new InActiveMonitor();

-  	    issue = new Pending();

-  	    // ***

-  	  	  

-  	    classify employee from * to Administrator;

-  	    classify employee to PartTime;

-  	    classify employee from Administrator;

-  	    classify monitor from InActiveMonitor to ActiveMonitor;

-  	    classify issue 

-  	      from Pending, Overdue 

-  	      to Resolved, InProcess;

-  	      	    

-      }

-    

-    } do {

-      /*

-      accept (Start);

-    	this.test(employee, monitor, issue);

-    	accept (Continue);

-    	

-    	AssertTrue("employee instanceof Employee", employee instanceof Employee);

-    	AssertFalse("employee hastype Staff", employee hastype Staff);

-    	AssertFalse("employee hastype Administrator", employee hastype Administrator);

-    	AssertTrue("employee hastype PartTime", employee hastype PartTime);

-    	

-    	AssertTrue("monitor instanceof Monitor", monitor instanceof Monitor);

-    	AssertFalse("monitor hastype InActiveMonitor", monitor hastype InActiveMonitor);

-    	AssertTrue("monitor hastype ActiveMonitor", monitor hastype ActiveMonitor);

-    	AssertEqual("monitor.n", ((ActiveMonitor)monitor).n, 1);

-    	

-    	AssertTrue("issue instanceof Issue", issue instanceof Issue);

-    	AssertFalse("issue hastype Pending", issue hastype Pending);

-    	AssertFalse("issue hastype Overdue", issue hastype Overdue);

-    	AssertTrue("issue hastype Resolved", issue hastype Resolved);

-    	AssertTrue("issue hastype InProcess", issue hastype InProcess);

-

-      WriteLine("Done");

-      */

-    }

-    

-} do {

-  new TestRunner().Start();

+/**
+ * Test classify statements.
+ **/
+active class Statements_Classify {
+
+    // Supporting declarations *************************************************
+    
+    class Monitor { }
+	  class InActiveMonitor specializes Monitor { }
+	  active class ActiveMonitor specializes Monitor {
+	      public n: Integer = 0;
+	  } do {
+	      this.n = 1;
+	      TestRunner.allInstances().Continue();
+	  }
+	  
+    class Employee { }
+    class Administrator specializes Employee { }
+    class Staff specializes Employee { }
+    class PartTime specializes Employee { }
+    class Issue { }
+    class Pending specializes Issue { }
+    class InProcess specializes Issue { }
+    class Overdue specializes Issue { }
+    class Resolved specializes Issue { }
+    
+	//**************************************************************************
+
+    active class TestRunner {
+      public receive signal Start { }
+      public receive signal Continue { }
+      
+      public test(out employee: Employee, out monitor: Monitor, out issue: Issue) {
+      
+        // Setup
+  	    employee = new Staff();
+  	    monitor = new InActiveMonitor();
+  	    issue = new Pending();
+  	    // ***
+  	  	  
+  	    classify employee from * to Administrator;
+  	    classify employee to PartTime;
+  	    classify employee from Administrator;
+  	    classify monitor from InActiveMonitor to ActiveMonitor;
+  	    classify issue 
+  	      from Pending, Overdue 
+  	      to Resolved, InProcess;
+  	      	    
+      }
+    
+    } do {
+      /*
+      accept (Start);
+    	this.test(employee, monitor, issue);
+    	accept (Continue);
+    	
+    	AssertTrue("employee instanceof Employee", employee instanceof Employee);
+    	AssertFalse("employee hastype Staff", employee hastype Staff);
+    	AssertFalse("employee hastype Administrator", employee hastype Administrator);
+    	AssertTrue("employee hastype PartTime", employee hastype PartTime);
+    	
+    	AssertTrue("monitor instanceof Monitor", monitor instanceof Monitor);
+    	AssertFalse("monitor hastype InActiveMonitor", monitor hastype InActiveMonitor);
+    	AssertTrue("monitor hastype ActiveMonitor", monitor hastype ActiveMonitor);
+    	AssertEqual("monitor.n", ((ActiveMonitor)monitor).n, 1);
+    	
+    	AssertTrue("issue instanceof Issue", issue instanceof Issue);
+    	AssertFalse("issue hastype Pending", issue hastype Pending);
+    	AssertFalse("issue hastype Overdue", issue hastype Overdue);
+    	AssertTrue("issue hastype Resolved", issue hastype Resolved);
+    	AssertTrue("issue hastype InProcess", issue hastype InProcess);
+
+      WriteLine("Done");
+      */
+    }
+    
+} do {
+  new TestRunner().Start();
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Conditional.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Conditional.alf
index 70ead178705..61d51e23397 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Conditional.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_Conditional.alf
@@ -1,102 +1,102 @@
-/**

- * Test if and switch statements.

- **/  

-active class Statements_Conditional {

-

-    // Supporting declarations *************************************************

-    

-    class Monitor { 

-    	public raiseAlarm(in sensorId: Integer) { }

-    	public cleanUp() { }

-    }

-    enum Condition { normal, alert, critical, error }

-    

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

-

-    test(out condition1: Condition, out condition2: Condition, out condition3: Condition,

-    	 out year: Integer, out month: Integer, out numDays: Integer ) {

-    

-      // Setup

-      reading = 150;

-      threshold = 10;

-      safeLimit = 100;

-      criticalLimit = 200;

-      errorLimit = 1000;

-      sensorId = 1;

-      monitor = new Monitor();

-      year = 2012;

-      // *****

-      

-      if (reading > threshold) {

-         monitor.raiseAlarm(sensorId); 

-      }

-      

-      //@determinate @assured

-      if (reading <= safeLimit) {

-        condition1 = Condition::normal; }

-      or if (reading > safeLimit && reading <= criticalLimit) {

-        condition1 = Condition::alert; }

-      or if (reading > criticalLimit) {

-        condition1 = Condition::critical; }

-      

-      reading = 500;

-      

-      if (reading <= safeLimit) {

-        condition2 = Condition::normal; 

-      }

-      else if (reading <= criticalLimit) {

-        condition2 = Condition::alert; 

-      }

-      else {

-        condition2 = Condition::critical; 

-      }

-      

-      if (reading <= safeLimit) {

-        condition3 = Condition::normal; }

-      else if (reading > safeLimit && reading <= criticalLimit) {

-        condition3 = Condition::alert; }

-      or if (reading > criticalLimit && reading < errorLimit) {

-        condition3 = Condition::critical; }

-      else {

-        condition3 = Condition::error; }

-      

-      switch (year) {

-      	case 2012:

-      	  month = 2;

-    		default:

-    		  month = 3;

-      }

-      

-      switch (month) {

-        case 1: case 3: case 5: case 7: case 8: case 10: case 12:

-          numDays = 31; 

-         case 4: case 6: case 9: case 11:

-          numDays = 30; 

-        case 2:

-          if ( ((year % 4 == 0) && !(year % 100 == 0))

-               || (year % 400 == 0) ) {

-            numDays = 29;

-          } 

-          else {

-            numDays = 28;

-          }

-        default:

-          WriteLine("Invalid month.");

-          numDays = 0;

-      }

-	  

-    }

-} do {

-  /*

-	this.test(condition1, condition2, condition3, year, month, numDays);

-	

-	AssertEqual("condition1", condition1, Condition::alert);

-	AssertEqual("condition2", condition2, Condition::critical);

-	AssertEqual("condition3", condition3, Condition::critical);

-	AssertEqual("year", year, 2012);

-	AssertEqual("month", month, 2);

-	AssertEqual("numDays", numDays, 29);

-

-  WriteLine("Done");

-  */

+/**
+ * Test if and switch statements.
+ **/  
+active class Statements_Conditional {
+
+    // Supporting declarations *************************************************
+    
+    class Monitor { 
+    	public raiseAlarm(in sensorId: Integer) { }
+    	public cleanUp() { }
+    }
+    enum Condition { normal, alert, critical, error }
+    
+    //**************************************************************************
+
+    test(out condition1: Condition, out condition2: Condition, out condition3: Condition,
+    	 out year: Integer, out month: Integer, out numDays: Integer ) {
+    
+      // Setup
+      reading = 150;
+      threshold = 10;
+      safeLimit = 100;
+      criticalLimit = 200;
+      errorLimit = 1000;
+      sensorId = 1;
+      monitor = new Monitor();
+      year = 2012;
+      // *****
+      
+      if (reading > threshold) {
+         monitor.raiseAlarm(sensorId); 
+      }
+      
+      //@determinate @assured
+      if (reading <= safeLimit) {
+        condition1 = Condition::normal; }
+      or if (reading > safeLimit && reading <= criticalLimit) {
+        condition1 = Condition::alert; }
+      or if (reading > criticalLimit) {
+        condition1 = Condition::critical; }
+      
+      reading = 500;
+      
+      if (reading <= safeLimit) {
+        condition2 = Condition::normal; 
+      }
+      else if (reading <= criticalLimit) {
+        condition2 = Condition::alert; 
+      }
+      else {
+        condition2 = Condition::critical; 
+      }
+      
+      if (reading <= safeLimit) {
+        condition3 = Condition::normal; }
+      else if (reading > safeLimit && reading <= criticalLimit) {
+        condition3 = Condition::alert; }
+      or if (reading > criticalLimit && reading < errorLimit) {
+        condition3 = Condition::critical; }
+      else {
+        condition3 = Condition::error; }
+      
+      switch (year) {
+      	case 2012:
+      	  month = 2;
+    		default:
+    		  month = 3;
+      }
+      
+      switch (month) {
+        case 1: case 3: case 5: case 7: case 8: case 10: case 12:
+          numDays = 31; 
+         case 4: case 6: case 9: case 11:
+          numDays = 30; 
+        case 2:
+          if ( ((year % 4 == 0) && !(year % 100 == 0))
+               || (year % 400 == 0) ) {
+            numDays = 29;
+          } 
+          else {
+            numDays = 28;
+          }
+        default:
+          WriteLine("Invalid month.");
+          numDays = 0;
+      }
+	  
+    }
+} do {
+  /*
+	this.test(condition1, condition2, condition3, year, month, numDays);
+	
+	AssertEqual("condition1", condition1, Condition::alert);
+	AssertEqual("condition2", condition2, Condition::critical);
+	AssertEqual("condition3", condition3, Condition::critical);
+	AssertEqual("year", year, 2012);
+	AssertEqual("month", month, 2);
+	AssertEqual("numDays", numDays, 29);
+
+  WriteLine("Done");
+  */
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_For_Looping.alf b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_For_Looping.alf
index 5fcea607e65..e5596320579 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_For_Looping.alf
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/tests/Statements_For_Looping.alf
@@ -1,93 +1,93 @@
-/**

- * Test for statements.

- **/

-active class Statements_For_Looping {

-

-    // Supporting declarations *************************************************

-    

-	private class Sensor {

-		private reading: Integer[0..1];

-		@Create public Sensor(in reading: Integer[0..1]) {

-			this.reading = reading;

-		}

-		public getNextReading(): Integer[0..1] { return this.reading; }

-    }

-	private class ActivityEdgeInstance {

-		public token: Integer;

-		public sendOffer(in token: Integer) {

-			this.token = token;

-		}

-	}

-	

-    private activity processRecord(in index: Integer) { }

-    

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

-

-    public test(

-    	out readings: Integer[*], out sum1: Integer,

-    	out outgoingEdges: ActivityEdgeInstance[*],

-    	out SnEven: Integer[*], out SnOdd: Integer[*]) {

-    

-      // Setup

-  	  noiseLimit = 0;

-  	  sensors = Sensor[]{new Sensor(1), new Sensor(2), new Sensor(null), new Sensor(3)};

-  	  reading = +0;

-  	  readings = null;

-  	  recordCount = 10;

-  	  let sum: Integer = 0; // Make sure assigned values work right for local declaration statements.

-  	  outgoingEdges = ActivityEdgeInstance[]{new ActivityEdgeInstance(), new ActivityEdgeInstance()};

-  	  tokens = Integer[]{1, 2, 3};

-  	  SLower = Integer[]{4, 5, 6};

-  	  SUpper = Integer[]{1, 2, 3};

-  	  SnEven = null;

-  	  SnOdd = null;

-  	  V = Integer[]{10, 20, 30};

-	    // *****

-	    

-  	  for (s in sensors) {

-        reading = s.getNextReading();

-  	    if (reading->isEmpty()) {

-  	      break;

-  	    }

-  	    if (reading > noiseLimit) {

-  	      readings->add(reading);

-  	    }

-  	  }

-  	  

-  	  for (j in 1..recordCount) {

-  	    sum = sum + j;

-  	  }

-  	  sum1 = sum;

-  	  

-  	  for (ActivityEdgeInstance outgoingEdge: outgoingEdges, Integer token: tokens) {

-  	    outgoingEdge.sendOffer(token);

-  	  }

-  	  

-  	  //@parallel 

-  	  for (outgoingEdge in outgoingEdges, token in tokens) {

-  	    outgoingEdge.sendOffer(outgoingEdge.token + token);

-  	  }

-  	  

-  	  //@parallel(SnEven,SnOdd)

-  	  for (lower in SLower, upper in SUpper, root in V) {

-  	    //@parallel 

-  	    {

-  	      add(SnEven, lower+upper);

-  	      SnOdd->add((lower-upper)*root);

-  	    }

-  	  }

-  	  

-    }

-} do {

-  /*

-	this.test(readings, sum, outgoingEdges, SnEven, SnOdd);

-	

-	AssertList("readings", readings, Integer[]{1,2});

-	AssertEqual("sum", sum, 55);

-	AssertList("outgoingEdges.token", outgoingEdges.token, Integer[]{2,4});

-	AssertList("SnEven", SnEven, Integer[]{5,7,9});

-	AssertList("SnOdd", SnOdd, Integer[]{30,60,90});

-

-  WriteLine("Done");

-  */

-}

+/**
+ * Test for statements.
+ **/
+active class Statements_For_Looping {
+
+    // Supporting declarations *************************************************
+    
+	private class Sensor {
+		private reading: Integer[0..1];
+		@Create public Sensor(in reading: Integer[0..1]) {
+			this.reading = reading;
+		}
+		public getNextReading(): Integer[0..1] { return this.reading; }
+    }
+	private class ActivityEdgeInstance {
+		public token: Integer;
+		public sendOffer(in token: Integer) {
+			this.token = token;
+		}
+	}
+	
+    private activity processRecord(in index: Integer) { }
+    
+	//**************************************************************************
+
+    public test(
+    	out readings: Integer[*], out sum1: Integer,
+    	out outgoingEdges: ActivityEdgeInstance[*],
+    	out SnEven: Integer[*], out SnOdd: Integer[*]) {
+    
+      // Setup
+  	  noiseLimit = 0;
+  	  sensors = Sensor[]{new Sensor(1), new Sensor(2), new Sensor(null), new Sensor(3)};
+  	  reading = +0;
+  	  readings = null;
+  	  recordCount = 10;
+  	  let sum: Integer = 0; // Make sure assigned values work right for local declaration statements.
+  	  outgoingEdges = ActivityEdgeInstance[]{new ActivityEdgeInstance(), new ActivityEdgeInstance()};
+  	  tokens = Integer[]{1, 2, 3};
+  	  SLower = Integer[]{4, 5, 6};
+  	  SUpper = Integer[]{1, 2, 3};
+  	  SnEven = null;
+  	  SnOdd = null;
+  	  V = Integer[]{10, 20, 30};
+	    // *****
+	    
+  	  for (s in sensors) {
+        reading = s.getNextReading();
+  	    if (reading->isEmpty()) {
+  	      break;
+  	    }
+  	    if (reading > noiseLimit) {
+  	      readings->add(reading);
+  	    }
+  	  }
+  	  
+  	  for (j in 1..recordCount) {
+  	    sum = sum + j;
+  	  }
+  	  sum1 = sum;
+  	  
+  	  for (ActivityEdgeInstance outgoingEdge: outgoingEdges, Integer token: tokens) {
+  	    outgoingEdge.sendOffer(token);
+  	  }
+  	  
+  	  //@parallel 
+  	  for (outgoingEdge in outgoingEdges, token in tokens) {
+  	    outgoingEdge.sendOffer(outgoingEdge.token + token);
+  	  }
+  	  
+  	  //@parallel(SnEven,SnOdd)
+  	  for (lower in SLower, upper in SUpper, root in V) {
+  	    //@parallel 
+  	    {
+  	      add(SnEven, lower+upper);
+  	      SnOdd->add((lower-upper)*root);
+  	    }
+  	  }
+  	  
+    }
+} do {
+  /*
+	this.test(readings, sum, outgoingEdges, SnEven, SnOdd);
+	
+	AssertList("readings", readings, Integer[]{1,2});
+	AssertEqual("sum", sum, 55);
+	AssertList("outgoingEdges.token", outgoingEdges.token, Integer[]{2,4});
+	AssertList("SnEven", SnEven, Integer[]{5,7,9});
+	AssertList("SnOdd", SnOdd, Integer[]{30,60,90});
+
+  WriteLine("Done");
+  */
+}
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
index 99cdc2cde1a..d655082be0b 100755
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0

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

- org.junit;bundle-version="4.11.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.emf.ecore;bundle-version="2.11.0",

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

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

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

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

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

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

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

- org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="[3.0.0,4.0.0)",

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

- com.google.inject;bundle-version="3.0.0",

- org.eclipse.xtext.xbase.lib;bundle-version="2.11.0",

- org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)"

-Export-Package: org.eclipse.papyrus.uml.profile.assistants.generator.tests

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.generator.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="2.11.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)",
+ com.google.inject;bundle-version="3.0.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.11.0",
+ org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)"
+Export-Package: org.eclipse.papyrus.uml.profile.assistants.generator.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.generator.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
index 4966bc3e010..469195216bb 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
-Manifest-Version: 1.0

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

- org.junit;bundle-version="4.11.0",

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.emf.ecore;bundle-version="2.11.0",

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

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

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

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

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

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

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

- com.google.inject;bundle-version="3.0.0",

- org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",

- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)"

-Export-Package: org.eclipse.papyrus.uml.profile.types.generator.tests

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="2.11.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="[2.0.0,3.0.0)",
+ com.google.inject;bundle-version="3.0.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)"
+Export-Package: org.eclipse.papyrus.uml.profile.types.generator.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
index f4efffbaa34..dd05ab72f71 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

- org.eclipse.emf.ecore;bundle-version="2.10.0",

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

- org.eclipse.core.resources;bundle-version="3.8.100",

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

- org.eclipse.ui.ide;bundle-version="3.9.0",

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

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

- org.eclipse.pde;bundle-version="3.8.100",

- org.eclipse.pde.ui;bundle-version="3.8.0",

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

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

- org.eclipse.core.expressions;bundle-version="3.4.600",

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

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

-Export-Package: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Import-Package: com.google.common.collect;version="21.0.0"

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.emf.ecore;bundle-version="2.10.0",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="3.8.100",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui.ide;bundle-version="3.9.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.pde;bundle-version="3.8.100",
+ org.eclipse.pde.ui;bundle-version="3.8.0",
+ org.eclipse.papyrus.uml.decoratormodel;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.expressions;bundle-version="3.4.600",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.decoratormodel.controlmode;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
index 8dd560aeba2..941c79f04c2 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
@@ -1,36 +1,36 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

- org.eclipse.emf.ecore;bundle-version="2.10.0",

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

- org.eclipse.core.resources;bundle-version="3.8.100",

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

- org.eclipse.ui.ide;bundle-version="3.9.0",

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

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

- org.eclipse.pde;bundle-version="3.8.100",

- org.eclipse.pde.ui;bundle-version="3.8.0",

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

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

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

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

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

- org.eclipse.core.expressions;bundle-version="3.4.600",

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

-Export-Package: org.eclipse.papyrus.uml.decoratormodel.helper.tests,

- org.eclipse.papyrus.uml.decoratormodel.internal.expressions.tests,

- org.eclipse.papyrus.uml.decoratormodel.internal.resource.tests,

- org.eclipse.papyrus.uml.decoratormodel.tests

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.tests;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.io;version="21.0.0",

- com.google.common.util.concurrent;version="21.0.0"

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.emf.ecore;bundle-version="2.10.0",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="3.8.100",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui.ide;bundle-version="3.9.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.pde;bundle-version="3.8.100",
+ org.eclipse.pde.ui;bundle-version="3.8.0",
+ org.eclipse.papyrus.uml.decoratormodel;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.expressions;bundle-version="3.4.600",
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.decoratormodel.helper.tests,
+ org.eclipse.papyrus.uml.decoratormodel.internal.expressions.tests,
+ org.eclipse.papyrus.uml.decoratormodel.internal.resource.tests,
+ org.eclipse.papyrus.uml.decoratormodel.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.tests;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.io;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
index 547c6a897b7..72c7ef56318 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
@@ -1,35 +1,35 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

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

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

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

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml.editor; bundle-version="[5.2.0,6.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.xtend.lib;bundle-version="2.8.1",

- org.eclipse.papyrus.uml.types.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.activity.tests,

- org.eclipse.papyrus.uml.diagram.activity.tests.canonical;x-friends:="org.eclipse.papyrus.uml.diagram.interactionoverview.tests",

- org.eclipse.papyrus.uml.diagram.activity.tests.generation

-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.uml.diagram.activity.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.activity.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml.editor; bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.activity.tests,
+ org.eclipse.papyrus.uml.diagram.activity.tests.canonical;x-friends:="org.eclipse.papyrus.uml.diagram.interactionoverview.tests",
+ org.eclipse.papyrus.uml.diagram.activity.tests.generation
+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.uml.diagram.activity.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.activity.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/build.properties
index cce67f79551..3cb5db1bb6c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/build.properties
@@ -1,10 +1,10 @@
-source.. = src/,\

-           test-gen/,\

-           xtend-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               content/

-src.includes = about.html

+source.. = src/,\
+           test-gen/,\
+           xtend-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               content/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/Activator.java
index 5a6be2c2701..b48672b5f21 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/Activator.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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.tests;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.activity.tests"; //$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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.activity.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/AllTests.java
index f9c95c969d4..ab5bba3616e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/AllTests.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2009, 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 464647

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.tests;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;

-import org.eclipse.papyrus.uml.diagram.activity.tests.canonical.AllCanonicalTests;

-import org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AllPinDerivationTests;

-import org.eclipse.papyrus.uml.diagram.activity.tests.edit.helper.ExpansionRegionHelperTest;

-import org.eclipse.papyrus.uml.diagram.activity.tests.edit.part.ExpansionRegionCompartmentEPTest;

-import org.eclipse.papyrus.uml.diagram.activity.tests.edit.part.RoundedCompartmentTest;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		// canonical

-		AllCanonicalTests.class,

-		AllPinDerivationTests.class,

-		ExpansionRegionHelperTest.class,

-		ExpansionRegionCompartmentEPTest.class,

-		RoundedCompartmentTest.class,

-

-})

-@DynamicClasses("org.eclipse.papyrus.uml.diagram.activity.test.AllGenTests")

-public class AllTests {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 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 464647
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.tests;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;
+import org.eclipse.papyrus.uml.diagram.activity.tests.canonical.AllCanonicalTests;
+import org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AllPinDerivationTests;
+import org.eclipse.papyrus.uml.diagram.activity.tests.edit.helper.ExpansionRegionHelperTest;
+import org.eclipse.papyrus.uml.diagram.activity.tests.edit.part.ExpansionRegionCompartmentEPTest;
+import org.eclipse.papyrus.uml.diagram.activity.tests.edit.part.RoundedCompartmentTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All tests together.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		// canonical
+		AllCanonicalTests.class,
+		AllPinDerivationTests.class,
+		ExpansionRegionHelperTest.class,
+		ExpansionRegionCompartmentEPTest.class,
+		RoundedCompartmentTest.class,
+
+})
+@DynamicClasses("org.eclipse.papyrus.uml.diagram.activity.test.AllGenTests")
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/IActivityDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/IActivityDiagramTestsConstants.java
index 1c7991f4cf0..90fe7605284 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/IActivityDiagramTestsConstants.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/IActivityDiagramTestsConstants.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.tests;

-

-public interface IActivityDiagramTestsConstants {

-

-	/** name of the test project */

-	public final String PROJECT_NAME = "ActivityDiagramTestProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "ActivityDiagramTest.di";

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.tests;
+
+public interface IActivityDiagramTestsConstants {
+
+	/** name of the test project */
+	public final String PROJECT_NAME = "ActivityDiagramTestProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "ActivityDiagramTest.di";
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractPapyrusTestCase.java
index e6e516032d8..45afeb5b215 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractPapyrusTestCase.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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart;

-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusSemanticTestCase;

-

-

-/**

- * The Class AbstractPapyrusTestCase.

- */

-public abstract class AbstractPapyrusTestCase extends AbstractPapyrusSemanticTestCase{

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return  new CreateActivityDiagramCommand();

-	}

-

-	protected IGraphicalEditPart getActivityCompartmentEditPart() {

-		IGraphicalEditPart activityEP = findChildBySemanticHint(getDiagramEditPart(), ActivityEditPart.VISUAL_ID);

-		return findChildBySemanticHint(activityEP, ActivityActivityContentCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Override

-	protected IElementType getTypeByID(String vid) {

-		return UMLElementTypes.getElementType(vid);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusSemanticTestCase;
+
+
+/**
+ * The Class AbstractPapyrusTestCase.
+ */
+public abstract class AbstractPapyrusTestCase extends AbstractPapyrusSemanticTestCase{
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return  new CreateActivityDiagramCommand();
+	}
+
+	protected IGraphicalEditPart getActivityCompartmentEditPart() {
+		IGraphicalEditPart activityEP = findChildBySemanticHint(getDiagramEditPart(), ActivityEditPart.VISUAL_ID);
+		return findChildBySemanticHint(activityEP, ActivityActivityContentCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Override
+	protected IElementType getTypeByID(String vid) {
+		return UMLElementTypes.getElementType(vid);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityAffixedChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityAffixedChildNode.java
index a52ba051b82..41763a5828f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityAffixedChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityAffixedChildNode.java
@@ -1,211 +1,211 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNotSame;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.uml2.uml.Element;

-import org.junit.Before;

-

-

-public class AbstractTestActivityAffixedChildNode extends AbstractPapyrusTestCase {

-

-

-	private GraphicalEditPart containerEditPart;

-

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		

-		return null;

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IActivityDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IActivityDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		projectCreation();

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);

-		containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-	}

-

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type, int subElementNumberGN) {

-

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, containerEditPart.getChildren().size() == subElementNumberGN + 1);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, containerEditPart.getDiagramPreferencesHint());

-		Command command = containerEditPart.getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertNotSame(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command, UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		containerEditPart.refresh();

-		assertEquals(CREATION + TEST_THE_EXECUTION, containerEditPart.getChildren().size(), subElementNumberGN + 2);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertEquals(CREATION + TEST_THE_UNDO, containerEditPart.getChildren().size(), subElementNumberGN);//strange!!

-		assertEquals(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size(), 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertEquals("CREATION: " + TEST_THE_REDO, containerEditPart.getChildren().size(), subElementNumberGN + 1);

-

-	}

-

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testViewDeletion(IElementType type, int subElementNumber) {

-		//DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, containerEditPart.getChildren().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((GraphicalEditPart)containerEditPart.getChildren().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, containerEditPart.getChildren().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, containerEditPart.getChildren().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, containerEditPart.getChildren().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 1);

-

-	}

-

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testDestroy(IElementType type, int subElementNumber) {

-		//DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, containerEditPart.getChildren().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ((GraphicalEditPart)containerEditPart.getChildren().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, containerEditPart.getChildren().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, containerEditPart.getChildren().size() == 1);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, containerEditPart.getChildren().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 0);

-	}

-

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testDrop(IElementType type, int subElementNumber) {

-		//DROP

-		assertTrue(DROP + INITIALIZATION_TEST, containerEditPart.getChildren().size() == 0);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-

-

-		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		ArrayList<Element> list = new ArrayList<Element>();

-		list.add(getRootSemanticModel().getOwnedElements().get(0));

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(new Point(20, 20));

-		Command command = containerEditPart.getCommand(dropObjectsRequest);

-		assertNotNull(DROP + COMMAND_NULL, command);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DROP + TEST_THE_EXECUTION, containerEditPart.getChildren().size() != 0);

-		assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() != 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DROP + TEST_THE_UNDO, containerEditPart.getChildren().size() == 0);

-		assertTrue(DROP + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() != 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DROP + TEST_THE_REDO, containerEditPart.getChildren().size() != 0);

-		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() != 0);

-	}

-

-

-	/**

-	 * Test to manage child node.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testToManageChildNode(IElementType type, int subElementNumberGN) {

-		testToCreateANode(type, subElementNumberGN);

-		// the node is still present

-		testDestroy(type, subElementNumberGN);

-		// the node has been destroyed, the UML element also

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		// the node and the UML element are present

-		testViewDeletion(type, subElementNumberGN);

-		// The node has been deleted, the uml element is still present

-		testDrop(type, subElementNumberGN);

-

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.uml2.uml.Element;
+import org.junit.Before;
+
+
+public class AbstractTestActivityAffixedChildNode extends AbstractPapyrusTestCase {
+
+
+	private GraphicalEditPart containerEditPart;
+
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		
+		return null;
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IActivityDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IActivityDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		projectCreation();
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);
+		containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
+	}
+
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type, int subElementNumberGN) {
+
+		//CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, containerEditPart.getChildren().size() == subElementNumberGN + 1);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, containerEditPart.getDiagramPreferencesHint());
+		Command command = containerEditPart.getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertNotSame(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command, UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		containerEditPart.refresh();
+		assertEquals(CREATION + TEST_THE_EXECUTION, containerEditPart.getChildren().size(), subElementNumberGN + 2);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertEquals(CREATION + TEST_THE_UNDO, containerEditPart.getChildren().size(), subElementNumberGN);//strange!!
+		assertEquals(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size(), 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertEquals("CREATION: " + TEST_THE_REDO, containerEditPart.getChildren().size(), subElementNumberGN + 1);
+
+	}
+
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testViewDeletion(IElementType type, int subElementNumber) {
+		//DELETION OF THE VIEW
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, containerEditPart.getChildren().size() == 1);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((GraphicalEditPart)containerEditPart.getChildren().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, containerEditPart.getChildren().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, containerEditPart.getChildren().size() == 1);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, containerEditPart.getChildren().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 1);
+
+	}
+
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testDestroy(IElementType type, int subElementNumber) {
+		//DESTROY SEMANTIC+ VIEW
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, containerEditPart.getChildren().size() == 1);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = ((GraphicalEditPart)containerEditPart.getChildren().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, containerEditPart.getChildren().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, containerEditPart.getChildren().size() == 1);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, containerEditPart.getChildren().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 0);
+	}
+
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testDrop(IElementType type, int subElementNumber) {
+		//DROP
+		assertTrue(DROP + INITIALIZATION_TEST, containerEditPart.getChildren().size() == 0);
+		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+
+
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		list.add(getRootSemanticModel().getOwnedElements().get(0));
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(new Point(20, 20));
+		Command command = containerEditPart.getCommand(dropObjectsRequest);
+		assertNotNull(DROP + COMMAND_NULL, command);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DROP + TEST_THE_EXECUTION, containerEditPart.getChildren().size() != 0);
+		assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() != 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DROP + TEST_THE_UNDO, containerEditPart.getChildren().size() == 0);
+		assertTrue(DROP + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() != 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DROP + TEST_THE_REDO, containerEditPart.getChildren().size() != 0);
+		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() != 0);
+	}
+
+
+	/**
+	 * Test to manage child node.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testToManageChildNode(IElementType type, int subElementNumberGN) {
+		testToCreateANode(type, subElementNumberGN);
+		// the node is still present
+		testDestroy(type, subElementNumberGN);
+		// the node has been destroyed, the UML element also
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		// the node and the UML element are present
+		testViewDeletion(type, subElementNumberGN);
+		// The node has been deleted, the uml element is still present
+		testDrop(type, subElementNumberGN);
+
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildNode.java
index dd2d834046c..4a1818dced1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildNode.java
@@ -1,119 +1,119 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;

-import org.eclipse.swt.widgets.Display;

-

-public abstract class AbstractTestActivityChildNode extends TestChildNode {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected boolean isSemanticTest() {

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateActivityDiagramCommand();

-	}

-

-	/**

-	 * Test change container.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	@Override

-	public void testChangeContainer(IElementType type, IElementType containerType) {

-		//CHANGE CONTAINER

-		assertEquals(CHANGE_CONTAINER + INITIALIZATION_TEST, 1, getContainerEditPart().getChildren().size());

-		assertEquals(CHANGE_CONTAINER + INITIALIZATION_TEST, 1, getRootSemanticModel().getOwnedElements().size());

-

-		final Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(containerType, getContainerEditPart().getDiagramPreferencesHint());

-

-		command = null;

-		Display.getDefault().syncExec(new Runnable() {

-

-			public void run() {

-				command = getContainerEditPart().getCommand(requestcreation);

-			}

-		});

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		executeOnUIThread(command);

-		assertEquals(CONTAINER_CREATION + TEST_THE_EXECUTION, 2, getRootView().getChildren().size());

-		GraphicalEditPart containerEditPart = (GraphicalEditPart)getContainerEditPart().getChildren().get(1);

-		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);

-		changeBoundsRequest.setEditParts((EditPart)getContainerEditPart().getChildren().get(0));

-		changeBoundsRequest.setLocation(new Point(30, 30));

-		ShapeCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < containerEditPart.getChildren().size()) {

-			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {

-				compartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null);

-

-		command = compartment.getCommand(changeBoundsRequest);

-		assertNotNull(CHANGE_CONTAINER, command);

-		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-

-		// execute change container

-		executeOnUIThread(command);

-		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, getRootView().getChildren().size());

-		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, getRootSemanticModel().getOwnedElements().size());

-		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, compartment.getChildren().size());

-

-		// undo change container

-		undoOnUIThread();

-		assertEquals(CHANGE_CONTAINER + TEST_THE_UNDO, 2, getRootView().getChildren().size());

-		assertEquals(CHANGE_CONTAINER + TEST_THE_UNDO, 2, getRootSemanticModel().getOwnedElements().size());

-		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 0, compartment.getChildren().size());

-

-		// redo change container

-		redoOnUIThread();

-		assertEquals(CHANGE_CONTAINER + TEST_THE_REDO, 1, getRootView().getChildren().size());

-		// assertEquals(CHANGE_CONTAINER + TEST_THE_REDO, 1, getRootSemanticModel().getOwnedElements().size());

-		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, compartment.getChildren().size());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;
+import org.eclipse.swt.widgets.Display;
+
+public abstract class AbstractTestActivityChildNode extends TestChildNode {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean isSemanticTest() {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateActivityDiagramCommand();
+	}
+
+	/**
+	 * Test change container.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	@Override
+	public void testChangeContainer(IElementType type, IElementType containerType) {
+		//CHANGE CONTAINER
+		assertEquals(CHANGE_CONTAINER + INITIALIZATION_TEST, 1, getContainerEditPart().getChildren().size());
+		assertEquals(CHANGE_CONTAINER + INITIALIZATION_TEST, 1, getRootSemanticModel().getOwnedElements().size());
+
+		final Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(containerType, getContainerEditPart().getDiagramPreferencesHint());
+
+		command = null;
+		Display.getDefault().syncExec(new Runnable() {
+
+			public void run() {
+				command = getContainerEditPart().getCommand(requestcreation);
+			}
+		});
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		executeOnUIThread(command);
+		assertEquals(CONTAINER_CREATION + TEST_THE_EXECUTION, 2, getRootView().getChildren().size());
+		GraphicalEditPart containerEditPart = (GraphicalEditPart)getContainerEditPart().getChildren().get(1);
+		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);
+		changeBoundsRequest.setEditParts((EditPart)getContainerEditPart().getChildren().get(0));
+		changeBoundsRequest.setLocation(new Point(30, 30));
+		ShapeCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < containerEditPart.getChildren().size()) {
+			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
+				compartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null);
+
+		command = compartment.getCommand(changeBoundsRequest);
+		assertNotNull(CHANGE_CONTAINER, command);
+		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+
+		// execute change container
+		executeOnUIThread(command);
+		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, getRootView().getChildren().size());
+		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, getRootSemanticModel().getOwnedElements().size());
+		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, compartment.getChildren().size());
+
+		// undo change container
+		undoOnUIThread();
+		assertEquals(CHANGE_CONTAINER + TEST_THE_UNDO, 2, getRootView().getChildren().size());
+		assertEquals(CHANGE_CONTAINER + TEST_THE_UNDO, 2, getRootSemanticModel().getOwnedElements().size());
+		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 0, compartment.getChildren().size());
+
+		// redo change container
+		redoOnUIThread();
+		assertEquals(CHANGE_CONTAINER + TEST_THE_REDO, 1, getRootView().getChildren().size());
+		// assertEquals(CHANGE_CONTAINER + TEST_THE_REDO, 1, getRootSemanticModel().getOwnedElements().size());
+		assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, compartment.getChildren().size());
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildwithOtherCreation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildwithOtherCreation.java
index 1077b2e1d93..f187705f6be 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildwithOtherCreation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildwithOtherCreation.java
@@ -1,292 +1,292 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.uml2.uml.Element;

-import org.junit.Before;

-

-/**

- * Set as deprecated.

- *

- * @use {@link AbstractTestActivityChildNode}

- */

-@Deprecated

-public abstract class AbstractTestActivityChildwithOtherCreation extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {

-

-	/** The root compartment. */

-	protected ShapeCompartmentEditPart rootCompartment = null;

-

-	/**

-	 * Gets the root compartment.

-	 *

-	 * @return the root compartment

-	 */

-	protected ShapeCompartmentEditPart getRootCompartment() {

-		assertNotNull(rootCompartment);

-		return rootCompartment;

-	}

-

-	protected abstract CreateViewRequest createViewRequestShapeContainer();

-

-	/**

-	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()

-	 *

-	 * @return

-	 */

-

-	@Override

-	protected View getRootView() {

-		return (View)getRootCompartment().getModel();

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		projectCreation();

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);

-		GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-		rootCompartment = null;

-		int index = 0;

-		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {

-			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {

-				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-

-	}

-

-	/**

-	 * Test to manage child node.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testToManageChildNode(IElementType type, IElementType containerType, boolean containerMove) {

-		testToCreateANode(type);

-		// the node is still present

-		testDestroy(type);

-		// the node has been destroyed, the UML element also

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		// the node and the UML element are present

-		testViewDeletion(type);

-		// The node has been deleted, the uml element is still present

-		testDrop(type);

-		// the node and element are present

-		if(containerMove) {

-			testChangeContainer(type, containerType);

-		}

-	}

-

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testViewDeletion(IElementType type) {

-		//DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 2);

-

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((GraphicalEditPart)getRootCompartment().getChildren().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootCompartment().getChildren().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 2);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootCompartment().getChildren().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 2);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootCompartment().getChildren().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 2);

-

-	}

-

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testDestroy(IElementType type) {

-		//DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 2);

-

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ((GraphicalEditPart)getRootCompartment().getChildren().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootCompartment().getChildren().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootCompartment().getChildren().size() == 1);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 2);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootCompartment().getChildren().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 1);

-	}

-

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testDrop(IElementType type) {

-		//DROP

-		assertTrue(DROP + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 0);

-		assertTrue(DROP + INITIALIZATION_TEST, (getRootSemanticModel().getOwnedElements()).size() == 2);

-

-		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		ArrayList<Element> list = new ArrayList<Element>();

-		list.add(getRootSemanticModel().getOwnedElements().get(1));

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(new Point(20, 20));

-		Command command = getRootCompartment().getCommand(dropObjectsRequest);

-		assertNotNull(DROP + COMMAND_NULL, command);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DROP + TEST_THE_EXECUTION, getRootCompartment().getChildren().size() != 0);

-		assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() != 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DROP + TEST_THE_UNDO, getRootCompartment().getChildren().size() == 0);

-		assertTrue(DROP + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() != 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DROP + TEST_THE_REDO, getRootCompartment().getChildren().size() != 0);

-		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() != 0);

-	}

-

-

-

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getRootCompartment().getDiagramPreferencesHint());

-		Command command = getRootCompartment().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 0);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue("CREATION: " + TEST_THE_REDO, getRootCompartment().getChildren().size() == 1);

-

-	}

-

-

-	/**

-	 * Test change container.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testChangeContainer(IElementType type, IElementType containerType) {

-		//CHANGE CONTAINER

-		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 1);

-		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-

-

-		Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(containerType, getRootCompartment().getDiagramPreferencesHint());

-		Command command = getRootCompartment().getCommand(requestcreation);

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CONTAINER_CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 2);

-		GraphicalEditPart containerEditPart = (GraphicalEditPart)getRootCompartment().getChildren().get(1);

-		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);

-		changeBoundsRequest.setEditParts((EditPart)getRootCompartment().getChildren().get(0));

-		changeBoundsRequest.setLocation(new Point(30, 30));

-		ShapeCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < containerEditPart.getChildren().size()) {

-			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {

-				compartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null);

-

-

-		command = compartment.getCommand(changeBoundsRequest);

-		assertNotNull(CHANGE_CONTAINER, command);

-		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, getRootView().getChildren().size() == 2);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 2);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, getRootView().getChildren().size() == 1);

-		//Here there is a problem for activity diagram it is not clear

-		//assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.uml2.uml.Element;
+import org.junit.Before;
+
+/**
+ * Set as deprecated.
+ *
+ * @use {@link AbstractTestActivityChildNode}
+ */
+@Deprecated
+public abstract class AbstractTestActivityChildwithOtherCreation extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {
+
+	/** The root compartment. */
+	protected ShapeCompartmentEditPart rootCompartment = null;
+
+	/**
+	 * Gets the root compartment.
+	 *
+	 * @return the root compartment
+	 */
+	protected ShapeCompartmentEditPart getRootCompartment() {
+		assertNotNull(rootCompartment);
+		return rootCompartment;
+	}
+
+	protected abstract CreateViewRequest createViewRequestShapeContainer();
+
+	/**
+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()
+	 *
+	 * @return
+	 */
+
+	@Override
+	protected View getRootView() {
+		return (View)getRootCompartment().getModel();
+	}
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		projectCreation();
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);
+		GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
+		rootCompartment = null;
+		int index = 0;
+		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {
+			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
+				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+
+	}
+
+	/**
+	 * Test to manage child node.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testToManageChildNode(IElementType type, IElementType containerType, boolean containerMove) {
+		testToCreateANode(type);
+		// the node is still present
+		testDestroy(type);
+		// the node has been destroyed, the UML element also
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		// the node and the UML element are present
+		testViewDeletion(type);
+		// The node has been deleted, the uml element is still present
+		testDrop(type);
+		// the node and element are present
+		if(containerMove) {
+			testChangeContainer(type, containerType);
+		}
+	}
+
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testViewDeletion(IElementType type) {
+		//DELETION OF THE VIEW
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 1);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 2);
+
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((GraphicalEditPart)getRootCompartment().getChildren().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootCompartment().getChildren().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 2);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootCompartment().getChildren().size() == 1);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 2);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootCompartment().getChildren().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 2);
+
+	}
+
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testDestroy(IElementType type) {
+		//DESTROY SEMANTIC+ VIEW
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 1);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 2);
+
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = ((GraphicalEditPart)getRootCompartment().getChildren().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootCompartment().getChildren().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootCompartment().getChildren().size() == 1);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 2);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootCompartment().getChildren().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 1);
+	}
+
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testDrop(IElementType type) {
+		//DROP
+		assertTrue(DROP + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 0);
+		assertTrue(DROP + INITIALIZATION_TEST, (getRootSemanticModel().getOwnedElements()).size() == 2);
+
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		list.add(getRootSemanticModel().getOwnedElements().get(1));
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(new Point(20, 20));
+		Command command = getRootCompartment().getCommand(dropObjectsRequest);
+		assertNotNull(DROP + COMMAND_NULL, command);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DROP + TEST_THE_EXECUTION, getRootCompartment().getChildren().size() != 0);
+		assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() != 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DROP + TEST_THE_UNDO, getRootCompartment().getChildren().size() == 0);
+		assertTrue(DROP + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() != 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DROP + TEST_THE_REDO, getRootCompartment().getChildren().size() != 0);
+		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() != 0);
+	}
+
+
+
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+
+		//CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getRootCompartment().getDiagramPreferencesHint());
+		Command command = getRootCompartment().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 0);
+		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue("CREATION: " + TEST_THE_REDO, getRootCompartment().getChildren().size() == 1);
+
+	}
+
+
+	/**
+	 * Test change container.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testChangeContainer(IElementType type, IElementType containerType) {
+		//CHANGE CONTAINER
+		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, getRootCompartment().getChildren().size() == 1);
+		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+
+
+		Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(containerType, getRootCompartment().getDiagramPreferencesHint());
+		Command command = getRootCompartment().getCommand(requestcreation);
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CONTAINER_CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 2);
+		GraphicalEditPart containerEditPart = (GraphicalEditPart)getRootCompartment().getChildren().get(1);
+		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);
+		changeBoundsRequest.setEditParts((EditPart)getRootCompartment().getChildren().get(0));
+		changeBoundsRequest.setLocation(new Point(30, 30));
+		ShapeCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < containerEditPart.getChildren().size()) {
+			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
+				compartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null);
+
+
+		command = compartment.getCommand(changeBoundsRequest);
+		assertNotNull(CHANGE_CONTAINER, command);
+		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, getRootView().getChildren().size() == 2);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 2);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, getRootView().getChildren().size() == 1);
+		//Here there is a problem for activity diagram it is not clear
+		//assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestCaseIntoStructureActivity.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestCaseIntoStructureActivity.java
index 183b18a5202..d1a8cd278dc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestCaseIntoStructureActivity.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestCaseIntoStructureActivity.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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNotSame;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;

-import org.junit.Before;

-

-

-/**

- * The Class AbstractPapyrusTestCase.

- */

-public abstract class AbstractTestCaseIntoStructureActivity extends TestChildNode {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateActivityDiagramCommand();

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		projectCreation();

-		assertEquals(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size(), 1);

-		GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-		rootCompartment = null;

-		int index = 0;

-		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {

-			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {

-				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-

-		//create the structured Node

-		CreateViewRequest requestcreation = createViewRequestShapeContainer();

-		requestcreation.setSize(new Dimension(500, 500));

-		Command command = rootCompartment.getCommand(requestcreation);

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertNotSame(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command, UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertEquals(CREATION + INITIALIZATION_TEST, rootCompartment.getChildren().size(), 1);

-		containerEditPart = (GraphicalEditPart)rootCompartment.getChildren().get(0);

-		rootCompartment = null;

-		index = 0;

-		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {

-			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {

-				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));

-			}

-			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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;
+import org.junit.Before;
+
+
+/**
+ * The Class AbstractPapyrusTestCase.
+ */
+public abstract class AbstractTestCaseIntoStructureActivity extends TestChildNode {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateActivityDiagramCommand();
+	}
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		projectCreation();
+		assertEquals(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size(), 1);
+		GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
+		rootCompartment = null;
+		int index = 0;
+		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {
+			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
+				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+
+		//create the structured Node
+		CreateViewRequest requestcreation = createViewRequestShapeContainer();
+		requestcreation.setSize(new Dimension(500, 500));
+		Command command = rootCompartment.getCommand(requestcreation);
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertNotSame(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command, UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertEquals(CREATION + INITIALIZATION_TEST, rootCompartment.getChildren().size(), 1);
+		containerEditPart = (GraphicalEditPart)rootCompartment.getChildren().get(0);
+		rootCompartment = null;
+		index = 0;
+		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {
+			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
+				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+
+
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java
index 26c01c5c881..c5840453758 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-

-/**

- * All test in canonical package

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-// child nodes

-TestActivityDiagramChildNode.class, 

-// TestActivityDiagramChildWithOtherCreationNode.class, 

-TestActivityChildNodeInStructuredActivity.class,

-TestActivityGroup.class,

-TestDropObjects.class,

-TestCommentLink.class,

-TestSemanticContainerFeature.class,

-TestLinks.class,

-TestControlNodesInStructuredActivityNodes.class,

-TestItemProviderCommand.class

-})

-public class AllCanonicalTests {

-

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.canonical;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * All test in canonical package
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+// child nodes
+TestActivityDiagramChildNode.class, 
+// TestActivityDiagramChildWithOtherCreationNode.class, 
+TestActivityChildNodeInStructuredActivity.class,
+TestActivityGroup.class,
+TestDropObjects.class,
+TestCommentLink.class,
+TestSemanticContainerFeature.class,
+TestLinks.class,
+TestControlNodesInStructuredActivityNodes.class,
+TestItemProviderCommand.class
+})
+public class AllCanonicalTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramLink.java
index 3cd1b188c1f..f9f14294c00 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramLink.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;

-

-

-/**

- * The Class TestActivityDiagramLink use to test link that are contained by the owner of the target and the source

- */

-public class TestActivityDiagramLink extends TestLink {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		

-		return null;

-	}

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IActivityDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IActivityDiagramTestsConstants.FILE_NAME;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;
+
+
+/**
+ * The Class TestActivityDiagramLink use to test link that are contained by the owner of the target and the source
+ */
+public class TestActivityDiagramLink extends TestLink {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		
+		return null;
+	}
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IActivityDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IActivityDiagramTestsConstants.FILE_NAME;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityParameterNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityParameterNode.java
index 546983dc50e..9b89c31720b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityParameterNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityParameterNode.java
@@ -1,194 +1,194 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNull;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-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.View;

-import org.eclipse.papyrus.commands.wrappers.GMFtoGEFCommandWrapper;

-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityParameterNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityParameterNodeExceptionLabelEditPart;

-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityParameterNodeStreamLabelEditPart;

-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;

-import org.eclipse.uml2.uml.ActivityParameterNode;

-import org.eclipse.uml2.uml.Parameter;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Test;

-

-public class TestActivityParameterNode extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IActivityDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IActivityDiagramTestsConstants.FILE_NAME;

-	}

-

-	public org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Test

-	public void testStreamLabel() {

-		IGraphicalEditPart activityParameterNodeEP = createChild(ActivityParameterNodeEditPart.VISUAL_ID, (IGraphicalEditPart) getActivityCompartmentEditPart().getParent());

-		checkStreamLabel(activityParameterNodeEP);

-

-		ActivityParameterNode activityParameterNode = (ActivityParameterNode) activityParameterNodeEP.resolveSemanticElement();

-

-		TransactionalEditingDomain domain = activityParameterNodeEP.getEditingDomain();

-		CreateParameterInActivityParameterNode createParamterCommand = new CreateParameterInActivityParameterNode(domain, activityParameterNode);

-		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(createParamterCommand));

-		checkStreamLabel(activityParameterNodeEP);

-

-		Parameter parameter = activityParameterNode.getParameter();

-

-		setBooleanValue(domain, UMLPackage.eINSTANCE.getParameter_IsStream(), parameter, Boolean.TRUE);

-		checkStreamLabel(activityParameterNodeEP);

-

-		setBooleanValue(domain, UMLPackage.eINSTANCE.getParameter_IsStream(), parameter, Boolean.FALSE);

-		checkStreamLabel(activityParameterNodeEP);

-

-		SetValueCommand removeParameter = new SetValueCommand(new SetRequest(domain, activityParameterNode, UMLPackage.eINSTANCE.getActivityParameterNode_Parameter(), null));

-		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(removeParameter));

-		checkStreamLabel(activityParameterNodeEP);

-	}

-

-	@Test

-	public void testExceptionLabel() {

-		IGraphicalEditPart activityParameterNodeEP = createChild(ActivityParameterNodeEditPart.VISUAL_ID, (IGraphicalEditPart) getActivityCompartmentEditPart().getParent());

-		checkExceptionLabel(activityParameterNodeEP);

-

-		ActivityParameterNode activityParameterNode = (ActivityParameterNode) activityParameterNodeEP.resolveSemanticElement();

-		TransactionalEditingDomain domain = activityParameterNodeEP.getEditingDomain();

-		CreateParameterInActivityParameterNode createParamterCommand = new CreateParameterInActivityParameterNode(domain, activityParameterNode);

-		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(createParamterCommand));

-		checkExceptionLabel(activityParameterNodeEP);

-

-		Parameter parameter = activityParameterNode.getParameter();

-

-		setBooleanValue(domain, UMLPackage.eINSTANCE.getParameter_IsException(), parameter, Boolean.TRUE);

-		checkExceptionLabel(activityParameterNodeEP);

-

-		setBooleanValue(domain, UMLPackage.eINSTANCE.getParameter_IsException(), parameter, Boolean.FALSE);

-		checkExceptionLabel(activityParameterNodeEP);

-

-		SetValueCommand removeParameter = new SetValueCommand(new SetRequest(domain, activityParameterNode, UMLPackage.eINSTANCE.getActivityParameterNode_Parameter(), null));

-		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(removeParameter));

-		checkExceptionLabel(activityParameterNodeEP);

-	}

-

-	/**

-	 * @param domain

-	 * @param parameter

-	 */

-	private void setBooleanValue(TransactionalEditingDomain domain, EAttribute feature, Parameter parameter, Boolean value) {

-		SetValueCommand setStreamValueToTrue = new SetValueCommand(new SetRequest(domain, parameter, feature, value));

-		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(setStreamValueToTrue));

-	}

-

-	protected void checkStreamLabel(IGraphicalEditPart activityParameterNodeEP) {

-		checkLabel(activityParameterNodeEP, ActivityParameterNodeStreamLabelEditPart.VISUAL_ID, "stream");

-	}

-

-	protected void checkExceptionLabel(IGraphicalEditPart activityParameterNodeEP) {

-		checkLabel(activityParameterNodeEP, ActivityParameterNodeExceptionLabelEditPart.VISUAL_ID, "exception");

-	}

-

-	protected void checkLabel(IGraphicalEditPart activityParameterNodeEP, String vid, String name) {

-		View activityParameterNodeView = activityParameterNodeEP.getNotationView();

-		View streamLabelView = null;

-		for (Object child : activityParameterNodeView.getChildren()) {

-			View view = (View) child;

-			if (view.getType().equals(vid)) {

-				streamLabelView = view;

-				break;

-			}

-		}

-		assertNotNull("ActivityParameterNode view does not contain " + name + " label view", streamLabelView);

-

-		ActivityParameterNode activityParameterNode = (ActivityParameterNode) activityParameterNodeEP.resolveSemanticElement();

-		Parameter parameter = activityParameterNode.getParameter();

-

-		boolean expectedVisibility = parameter != null && parameter.isStream();

-		assertEquals("Actual " + name + " label visible value don't equals expected value", expectedVisibility, streamLabelView.isVisible());

-

-		IGraphicalEditPart labelEP = null;

-		for (Object child : activityParameterNodeEP.getChildren()) {

-			IGraphicalEditPart childEP = (IGraphicalEditPart) child;

-			String type = childEP.getNotationView().getType();

-			if (type != null && type.equals(vid)) {

-				labelEP = childEP;

-				break;

-			}

-		}

-		if (expectedVisibility) {

-			assertNotNull(name + " label editpart should be visible", labelEP);

-		} else {

-			assertNull(name + " label editpart should not be visible", labelEP);

-		}

-	}

-

-	protected DiagramEventBroker getDiagramEventBroker() {

-		TransactionalEditingDomain editingDomain = getActivityCompartmentEditPart().getEditingDomain();

-		if (editingDomain != null) {

-			return DiagramEventBroker.getInstance(editingDomain);

-		}

-		return null;

-	}

-

-	public static class CreateParameterInActivityParameterNode extends AbstractTransactionalCommand {

-

-		private final ActivityParameterNode myActivityParameterNode;

-

-		public CreateParameterInActivityParameterNode(TransactionalEditingDomain domain, ActivityParameterNode node) {

-			super(domain, "create parameter", null);

-			myActivityParameterNode = node;

-		}

-

-		@Override

-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-			Parameter paramter = (Parameter) UMLFactory.eINSTANCE.create(UMLPackage.eINSTANCE.getParameter());

-			myActivityParameterNode.getActivity().eSet(UMLPackage.eINSTANCE.getBehavior_OwnedParameter(), paramter);

-			myActivityParameterNode.eSet(UMLPackage.eINSTANCE.getActivityParameterNode_Parameter(), paramter);

-			return CommandResult.newOKCommandResult();

-		}

-

-	}

-

-	@Override

-	protected void execute(final Command command) {

-		resetLastOperationFailedState();

-		getActivityCompartmentEditPart().getViewer().getEditDomain().getCommandStack().execute(command);

-		assertLastOperationSuccessful();

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+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.View;
+import org.eclipse.papyrus.commands.wrappers.GMFtoGEFCommandWrapper;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityParameterNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityParameterNodeExceptionLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityParameterNodeStreamLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
+import org.eclipse.uml2.uml.ActivityParameterNode;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Test;
+
+public class TestActivityParameterNode extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IActivityDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IActivityDiagramTestsConstants.FILE_NAME;
+	}
+
+	public org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Test
+	public void testStreamLabel() {
+		IGraphicalEditPart activityParameterNodeEP = createChild(ActivityParameterNodeEditPart.VISUAL_ID, (IGraphicalEditPart) getActivityCompartmentEditPart().getParent());
+		checkStreamLabel(activityParameterNodeEP);
+
+		ActivityParameterNode activityParameterNode = (ActivityParameterNode) activityParameterNodeEP.resolveSemanticElement();
+
+		TransactionalEditingDomain domain = activityParameterNodeEP.getEditingDomain();
+		CreateParameterInActivityParameterNode createParamterCommand = new CreateParameterInActivityParameterNode(domain, activityParameterNode);
+		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(createParamterCommand));
+		checkStreamLabel(activityParameterNodeEP);
+
+		Parameter parameter = activityParameterNode.getParameter();
+
+		setBooleanValue(domain, UMLPackage.eINSTANCE.getParameter_IsStream(), parameter, Boolean.TRUE);
+		checkStreamLabel(activityParameterNodeEP);
+
+		setBooleanValue(domain, UMLPackage.eINSTANCE.getParameter_IsStream(), parameter, Boolean.FALSE);
+		checkStreamLabel(activityParameterNodeEP);
+
+		SetValueCommand removeParameter = new SetValueCommand(new SetRequest(domain, activityParameterNode, UMLPackage.eINSTANCE.getActivityParameterNode_Parameter(), null));
+		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(removeParameter));
+		checkStreamLabel(activityParameterNodeEP);
+	}
+
+	@Test
+	public void testExceptionLabel() {
+		IGraphicalEditPart activityParameterNodeEP = createChild(ActivityParameterNodeEditPart.VISUAL_ID, (IGraphicalEditPart) getActivityCompartmentEditPart().getParent());
+		checkExceptionLabel(activityParameterNodeEP);
+
+		ActivityParameterNode activityParameterNode = (ActivityParameterNode) activityParameterNodeEP.resolveSemanticElement();
+		TransactionalEditingDomain domain = activityParameterNodeEP.getEditingDomain();
+		CreateParameterInActivityParameterNode createParamterCommand = new CreateParameterInActivityParameterNode(domain, activityParameterNode);
+		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(createParamterCommand));
+		checkExceptionLabel(activityParameterNodeEP);
+
+		Parameter parameter = activityParameterNode.getParameter();
+
+		setBooleanValue(domain, UMLPackage.eINSTANCE.getParameter_IsException(), parameter, Boolean.TRUE);
+		checkExceptionLabel(activityParameterNodeEP);
+
+		setBooleanValue(domain, UMLPackage.eINSTANCE.getParameter_IsException(), parameter, Boolean.FALSE);
+		checkExceptionLabel(activityParameterNodeEP);
+
+		SetValueCommand removeParameter = new SetValueCommand(new SetRequest(domain, activityParameterNode, UMLPackage.eINSTANCE.getActivityParameterNode_Parameter(), null));
+		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(removeParameter));
+		checkExceptionLabel(activityParameterNodeEP);
+	}
+
+	/**
+	 * @param domain
+	 * @param parameter
+	 */
+	private void setBooleanValue(TransactionalEditingDomain domain, EAttribute feature, Parameter parameter, Boolean value) {
+		SetValueCommand setStreamValueToTrue = new SetValueCommand(new SetRequest(domain, parameter, feature, value));
+		executeOnUIThread(GMFtoGEFCommandWrapper.wrap(setStreamValueToTrue));
+	}
+
+	protected void checkStreamLabel(IGraphicalEditPart activityParameterNodeEP) {
+		checkLabel(activityParameterNodeEP, ActivityParameterNodeStreamLabelEditPart.VISUAL_ID, "stream");
+	}
+
+	protected void checkExceptionLabel(IGraphicalEditPart activityParameterNodeEP) {
+		checkLabel(activityParameterNodeEP, ActivityParameterNodeExceptionLabelEditPart.VISUAL_ID, "exception");
+	}
+
+	protected void checkLabel(IGraphicalEditPart activityParameterNodeEP, String vid, String name) {
+		View activityParameterNodeView = activityParameterNodeEP.getNotationView();
+		View streamLabelView = null;
+		for (Object child : activityParameterNodeView.getChildren()) {
+			View view = (View) child;
+			if (view.getType().equals(vid)) {
+				streamLabelView = view;
+				break;
+			}
+		}
+		assertNotNull("ActivityParameterNode view does not contain " + name + " label view", streamLabelView);
+
+		ActivityParameterNode activityParameterNode = (ActivityParameterNode) activityParameterNodeEP.resolveSemanticElement();
+		Parameter parameter = activityParameterNode.getParameter();
+
+		boolean expectedVisibility = parameter != null && parameter.isStream();
+		assertEquals("Actual " + name + " label visible value don't equals expected value", expectedVisibility, streamLabelView.isVisible());
+
+		IGraphicalEditPart labelEP = null;
+		for (Object child : activityParameterNodeEP.getChildren()) {
+			IGraphicalEditPart childEP = (IGraphicalEditPart) child;
+			String type = childEP.getNotationView().getType();
+			if (type != null && type.equals(vid)) {
+				labelEP = childEP;
+				break;
+			}
+		}
+		if (expectedVisibility) {
+			assertNotNull(name + " label editpart should be visible", labelEP);
+		} else {
+			assertNull(name + " label editpart should not be visible", labelEP);
+		}
+	}
+
+	protected DiagramEventBroker getDiagramEventBroker() {
+		TransactionalEditingDomain editingDomain = getActivityCompartmentEditPart().getEditingDomain();
+		if (editingDomain != null) {
+			return DiagramEventBroker.getInstance(editingDomain);
+		}
+		return null;
+	}
+
+	public static class CreateParameterInActivityParameterNode extends AbstractTransactionalCommand {
+
+		private final ActivityParameterNode myActivityParameterNode;
+
+		public CreateParameterInActivityParameterNode(TransactionalEditingDomain domain, ActivityParameterNode node) {
+			super(domain, "create parameter", null);
+			myActivityParameterNode = node;
+		}
+
+		@Override
+		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+			Parameter paramter = (Parameter) UMLFactory.eINSTANCE.create(UMLPackage.eINSTANCE.getParameter());
+			myActivityParameterNode.getActivity().eSet(UMLPackage.eINSTANCE.getBehavior_OwnedParameter(), paramter);
+			myActivityParameterNode.eSet(UMLPackage.eINSTANCE.getActivityParameterNode_Parameter(), paramter);
+			return CommandResult.newOKCommandResult();
+		}
+
+	}
+
+	@Override
+	protected void execute(final Command command) {
+		resetLastOperationFailedState();
+		getActivityCompartmentEditPart().getViewer().getEditDomain().getCommandStack().execute(command);
+		assertLastOperationSuccessful();
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/AllPinDerivationTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/AllPinDerivationTests.java
index 19e845a8e49..429b24c3813 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/AllPinDerivationTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/AllPinDerivationTests.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * 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:

- *   J�r�mie TATIBOUET (CEA LIST) - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({ TestAcceptCallActionPinDerivation.class, TestAcceptEventActionPinDerivation.class, TestAddStructuralFeatureValueActionPinDerivation.class, TestCallBehaviorActionPinDerivation.class, TestCallOperationActionPinDerivation.class,

-		TestCreateLinkActionPinDerivation.class, TestCreateObjectActionPinDerivation.class, TestDestroyLinkActionPinDerivation.class, TestReadLinkActionPinDerivation.class, TestReadSelfActionPinDerivation.class,

-		TestReadStructuralFeatureActionPinDerivation.class, TestSendSignalActionPinDerivation.class, TestStartClassifierBehaviorActionPinDerivation.class, TestStartObjectBehaviorActionPinDerivation.class, TestTestIdentityActionPinDerivation.class,

-		TestValueSpecificationActionPinDerivation.class })

-

-

-

-

-

-public class AllPinDerivationTests {

-

-}

+/*****************************************************************************
+ * 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:
+ *   J�r�mie TATIBOUET (CEA LIST) - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({ TestAcceptCallActionPinDerivation.class, TestAcceptEventActionPinDerivation.class, TestAddStructuralFeatureValueActionPinDerivation.class, TestCallBehaviorActionPinDerivation.class, TestCallOperationActionPinDerivation.class,
+		TestCreateLinkActionPinDerivation.class, TestCreateObjectActionPinDerivation.class, TestDestroyLinkActionPinDerivation.class, TestReadLinkActionPinDerivation.class, TestReadSelfActionPinDerivation.class,
+		TestReadStructuralFeatureActionPinDerivation.class, TestSendSignalActionPinDerivation.class, TestStartClassifierBehaviorActionPinDerivation.class, TestStartObjectBehaviorActionPinDerivation.class, TestTestIdentityActionPinDerivation.class,
+		TestValueSpecificationActionPinDerivation.class })
+
+
+
+
+
+public class AllPinDerivationTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/PinDerivationAssertionUtils.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/PinDerivationAssertionUtils.java
index 3e5b97b53f4..9d5aa32d6d3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/PinDerivationAssertionUtils.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/PinDerivationAssertionUtils.java
@@ -1,166 +1,166 @@
-/*****************************************************************************

- * 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:

- *   Jérémie TATIBOUET (CEA LIST) - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.uml2.uml.InputPin;

-import org.eclipse.uml2.uml.OutputPin;

-import org.eclipse.uml2.uml.Parameter;

-import org.eclipse.uml2.uml.ParameterDirectionKind;

-import org.eclipse.uml2.uml.Pin;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLFactory;

-

-public class PinDerivationAssertionUtils {

-

-	/**

-	 * A pin is said to match a under the following conditions

-	 * 1] pin type is cohesive with parameter direction

-	 * - direction: IN => InputPin

-	 * - direction: INOUT => pin type does not matter

-	 * - direction: OUT => OutputPin

-	 * - direction: RETURN => InputPin

-	 * 2] pin name is similar to parameter name

-	 * 3] pin lower bound is similar to parameter lower bound

-	 * 4] pin upper bound is similar to parameter upper bound

-	 * 

-	 * @param pin

-	 *            the pin to match with the parameter

-	 * @param parameter

-	 *            the parameter against with the pin is matched

-	 * @return match

-	 *         true if match could be established, false otherwise

-	 */

-	public static <P extends Pin> boolean assertMatch(P pin, Parameter parameter) {

-		boolean match = true;

-		match = pin.getType() == parameter.getType();

-		if (parameter.getDirection() == ParameterDirectionKind.OUT_LITERAL |

-				parameter.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {

-			match = pin instanceof OutputPin;

-		} else if (parameter.getDirection() == ParameterDirectionKind.IN_LITERAL) {

-			match = pin instanceof InputPin;

-		}

-		if (match && parameter.getName() != null) {

-			if (pin.getName().matches("\\[[a-z]+\\]\\s.*")) {

-				match = pin.getName().replaceFirst("\\[[a-z]+\\]\\s", "").equals(parameter.getName());

-			} else {

-				match = pin.getName().equals(parameter.getName());

-			}

-		}

-		if (match) {

-			match = pin.getLower() == parameter.getLower();

-			if (match) {

-				match = pin.getUpper() == parameter.getUpper();

-			}

-		}

-		return match;

-	}

-

-	/**

-	 * Output pins and parameters are said to be cohesive if:

-	 * 1] There are as many pin as the number of out/return/in-out parameters

-	 * 2] Each output pin matches (see assertMatch) a parameter

-	 * 3] The pins order match the parameters order

-	 * 

-	 * @param pins

-	 *            list of arguments for the action

-	 * @param parameters

-	 *            list of parameters

-	 * @return cohesion

-	 *         true if cohesion is established false otherwise

-	 */

-	public static boolean assertArgumentsAndParametersCohesion(List<InputPin> pins, List<Parameter> parameters) {

-		boolean cohesion = true;

-		List<Parameter> inputParameters = new ArrayList<Parameter>();

-		for (Parameter parameter : parameters) {

-			if (parameter.getDirection() == ParameterDirectionKind.IN_LITERAL |

-					parameter.getDirection() == ParameterDirectionKind.INOUT_LITERAL) {

-				inputParameters.add(parameter);

-			}

-		}

-		if (pins.size() == inputParameters.size()) {

-			int index = 0;

-			while (cohesion && index < inputParameters.size()) {

-				cohesion = assertMatch(pins.get(index), inputParameters.get(index));

-				index++;

-			}

-		} else {

-			cohesion = false;

-		}

-		return cohesion;

-	}

-

-	/**

-	 * Input pins and parameters are said to be cohesive if:

-	 * 1] There are as many pin as the number of in/in-out parameters

-	 * 2] Each input pin matches (see assertMatch) a parameter

-	 * 3] The pins order match the parameters order

-	 * 

-	 * @param pins

-	 *            list of arguments for the action

-	 * @param parameters

-	 *            list of parameters

-	 * @return cohesion

-	 *         true if cohesion is established false otherwise

-	 */

-	public static boolean assertResultsAndParametersCohesion(List<OutputPin> pins, List<Parameter> parameters) {

-		boolean cohesion = true;

-		List<Parameter> outputParameters = new ArrayList<Parameter>();

-		for (Parameter parameter : parameters) {

-			if (parameter.getDirection() == ParameterDirectionKind.RETURN_LITERAL |

-					parameter.getDirection() == ParameterDirectionKind.INOUT_LITERAL |

-					parameter.getDirection() == ParameterDirectionKind.OUT_LITERAL) {

-				outputParameters.add(parameter);

-			}

-		}

-		if (pins.size() == outputParameters.size()) {

-			int index = 0;

-			while (cohesion && index < outputParameters.size()) {

-				cohesion = assertMatch(pins.get(index), outputParameters.get(index));

-				index++;

-			}

-		} else {

-			cohesion = false;

-		}

-		return cohesion;

-	}

-

-	/**

-	 * Input pins are said to match properties under the following conditions:

-	 * 1] There are as many pin as the number of properties

-	 * 2] Each input pin match a particular property

-	 * 3] Pins order match the properties order

-	 * 

-	 * @param pins

-	 *            list of arguments for the action

-	 * @param properties

-	 *            list of properties

-	 * @return true if cohesion is established false otherwise

-	 */

-	public static boolean assertArgumentsAndAttributesCohesion(List<InputPin> pins, List<Property> properties) {

-		List<Parameter> parameters = new ArrayList<Parameter>();

-		for (Property property : properties) {

-			Parameter parameter = UMLFactory.eINSTANCE.createParameter();

-			parameter.setDirection(ParameterDirectionKind.IN_LITERAL);

-			parameter.setName(property.getName());

-			parameter.setType(property.getType());

-			parameter.setLower(property.getLower());

-			parameter.setUpper(property.getUpper());

-			parameters.add(parameter);

-		}

-		return assertArgumentsAndParametersCohesion(pins, parameters);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *   Jérémie TATIBOUET (CEA LIST) - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.uml2.uml.InputPin;
+import org.eclipse.uml2.uml.OutputPin;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.Pin;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLFactory;
+
+public class PinDerivationAssertionUtils {
+
+	/**
+	 * A pin is said to match a under the following conditions
+	 * 1] pin type is cohesive with parameter direction
+	 * - direction: IN => InputPin
+	 * - direction: INOUT => pin type does not matter
+	 * - direction: OUT => OutputPin
+	 * - direction: RETURN => InputPin
+	 * 2] pin name is similar to parameter name
+	 * 3] pin lower bound is similar to parameter lower bound
+	 * 4] pin upper bound is similar to parameter upper bound
+	 * 
+	 * @param pin
+	 *            the pin to match with the parameter
+	 * @param parameter
+	 *            the parameter against with the pin is matched
+	 * @return match
+	 *         true if match could be established, false otherwise
+	 */
+	public static <P extends Pin> boolean assertMatch(P pin, Parameter parameter) {
+		boolean match = true;
+		match = pin.getType() == parameter.getType();
+		if (parameter.getDirection() == ParameterDirectionKind.OUT_LITERAL |
+				parameter.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
+			match = pin instanceof OutputPin;
+		} else if (parameter.getDirection() == ParameterDirectionKind.IN_LITERAL) {
+			match = pin instanceof InputPin;
+		}
+		if (match && parameter.getName() != null) {
+			if (pin.getName().matches("\\[[a-z]+\\]\\s.*")) {
+				match = pin.getName().replaceFirst("\\[[a-z]+\\]\\s", "").equals(parameter.getName());
+			} else {
+				match = pin.getName().equals(parameter.getName());
+			}
+		}
+		if (match) {
+			match = pin.getLower() == parameter.getLower();
+			if (match) {
+				match = pin.getUpper() == parameter.getUpper();
+			}
+		}
+		return match;
+	}
+
+	/**
+	 * Output pins and parameters are said to be cohesive if:
+	 * 1] There are as many pin as the number of out/return/in-out parameters
+	 * 2] Each output pin matches (see assertMatch) a parameter
+	 * 3] The pins order match the parameters order
+	 * 
+	 * @param pins
+	 *            list of arguments for the action
+	 * @param parameters
+	 *            list of parameters
+	 * @return cohesion
+	 *         true if cohesion is established false otherwise
+	 */
+	public static boolean assertArgumentsAndParametersCohesion(List<InputPin> pins, List<Parameter> parameters) {
+		boolean cohesion = true;
+		List<Parameter> inputParameters = new ArrayList<Parameter>();
+		for (Parameter parameter : parameters) {
+			if (parameter.getDirection() == ParameterDirectionKind.IN_LITERAL |
+					parameter.getDirection() == ParameterDirectionKind.INOUT_LITERAL) {
+				inputParameters.add(parameter);
+			}
+		}
+		if (pins.size() == inputParameters.size()) {
+			int index = 0;
+			while (cohesion && index < inputParameters.size()) {
+				cohesion = assertMatch(pins.get(index), inputParameters.get(index));
+				index++;
+			}
+		} else {
+			cohesion = false;
+		}
+		return cohesion;
+	}
+
+	/**
+	 * Input pins and parameters are said to be cohesive if:
+	 * 1] There are as many pin as the number of in/in-out parameters
+	 * 2] Each input pin matches (see assertMatch) a parameter
+	 * 3] The pins order match the parameters order
+	 * 
+	 * @param pins
+	 *            list of arguments for the action
+	 * @param parameters
+	 *            list of parameters
+	 * @return cohesion
+	 *         true if cohesion is established false otherwise
+	 */
+	public static boolean assertResultsAndParametersCohesion(List<OutputPin> pins, List<Parameter> parameters) {
+		boolean cohesion = true;
+		List<Parameter> outputParameters = new ArrayList<Parameter>();
+		for (Parameter parameter : parameters) {
+			if (parameter.getDirection() == ParameterDirectionKind.RETURN_LITERAL |
+					parameter.getDirection() == ParameterDirectionKind.INOUT_LITERAL |
+					parameter.getDirection() == ParameterDirectionKind.OUT_LITERAL) {
+				outputParameters.add(parameter);
+			}
+		}
+		if (pins.size() == outputParameters.size()) {
+			int index = 0;
+			while (cohesion && index < outputParameters.size()) {
+				cohesion = assertMatch(pins.get(index), outputParameters.get(index));
+				index++;
+			}
+		} else {
+			cohesion = false;
+		}
+		return cohesion;
+	}
+
+	/**
+	 * Input pins are said to match properties under the following conditions:
+	 * 1] There are as many pin as the number of properties
+	 * 2] Each input pin match a particular property
+	 * 3] Pins order match the properties order
+	 * 
+	 * @param pins
+	 *            list of arguments for the action
+	 * @param properties
+	 *            list of properties
+	 * @return true if cohesion is established false otherwise
+	 */
+	public static boolean assertArgumentsAndAttributesCohesion(List<InputPin> pins, List<Property> properties) {
+		List<Parameter> parameters = new ArrayList<Parameter>();
+		for (Property property : properties) {
+			Parameter parameter = UMLFactory.eINSTANCE.createParameter();
+			parameter.setDirection(ParameterDirectionKind.IN_LITERAL);
+			parameter.setName(property.getName());
+			parameter.setType(property.getType());
+			parameter.setLower(property.getLower());
+			parameter.setUpper(property.getUpper());
+			parameters.add(parameter);
+		}
+		return assertArgumentsAndParametersCohesion(pins, parameters);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestAcceptEventActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestAcceptEventActionPinDerivation.java
index 315d5dea6f8..f05459ce156 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestAcceptEventActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestAcceptEventActionPinDerivation.java
@@ -1,835 +1,835 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.derivation.pins;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.AcceptEventAction;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.CallEvent;

-import org.eclipse.uml2.uml.ChangeEvent;

-import org.eclipse.uml2.uml.Generalization;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.SignalEvent;

-import org.eclipse.uml2.uml.TimeEvent;

-import org.eclipse.uml2.uml.Trigger;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * 

- * Test for automated pin derivation for AcceptEventAction and AcceptCallAction

- *

- */

-public class TestAcceptEventActionPinDerivation extends AbstractTestPinDerivation {

-

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.AcceptEventActionEditHelperAdvice";

-

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_SIGNAL = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEditHelperAdvice";

-

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_SIGNALEVENT = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEventEditHelperAdvice";

-

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice";

-

-	private AcceptEventAction acceptEventAction;

-

-	private Trigger baseTrigger;

-

-	private Signal baseSignal;

-

-	private Trigger extendedTrigger1;

-

-	private Signal extendedSignal1;

-

-	private Trigger extendedTrigger2;

-

-	private Signal extendedSignal2;

-

-	private Trigger trigger3;

-

-	private Signal Signal3;

-

-	private Trigger triggerTimerEvent;

-

-	private Trigger triggerChangeEvent;

-

-	private Trigger triggerCallEvent;

-

-	/**

-	 * Constructor.

-	 */

-	public TestAcceptEventActionPinDerivation() {

-		this.populateBaseTestModel();

-		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION

-		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();

-		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.ACCEPTE_EVENT_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the AcceptEventAction is available

-	 */

-	@Test

-	public void testAdviceForAcceptEventActionExists() {

-		Assert.assertNotNull("AcceptEventAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-		Assert.assertNotNull("SignalEvent advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_SIGNALEVENT));

-		Assert.assertNotNull("Signal advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_SIGNAL));

-		Assert.assertNotNull("Property advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY));

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having already been synchronized with 'baseTrigger', ensure that if the isUnmarshall property is set to true

-	 * the action evolves then pins are updated accordingly.

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin typed by the signal

-	 * - 3] AcceptEventAction 'isUmnarshall' feature is set to true

-	 * - AcceptEventAction has now 2 pin

-	 * - 1 for the property p1 of baseSignal type with integer (type of p1)

-	 * - 1 for the property p2 of baseSignal type with boolean (type of p2)

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallFalse_ToIsUnmarshallTrue() {

-		// Assign baseTrigger to acceptEventAction

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.baseTrigger);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);

-		if (!editAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));

-

-		// Set isUnmarshall to true

-		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);

-		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);

-		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have 2 result pins", this.acceptEventAction.getResults().size() == 2);

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p1",

-				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Integer"));

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p2",

-				this.acceptEventAction.getResults().get(1).getType() == this.getPrimitiveType("Boolean"));

-		if (!editAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is false.

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin typed by the signal

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallFalse_SingleTrigger_SignalEvent() {

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.baseTrigger);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);

-		if (!editAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the baseSignal", this.acceptEventAction.getResults().get(0).getType() == baseSignal);

-

-		if (!editAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is false.

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with the 'TriggerTimeEvent'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin typed by Real

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallFalse_SingleTrigger_TimeEvent() {

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerTimerEvent);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);

-		if (!editAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the real", this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Real"));

-

-		if (!editAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is false.

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with the 'TriggerChangeEvent'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 0 pin

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallFalse_SingleTrigger_ChangeEvent() {

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerChangeEvent);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);

-		if (!editAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have no result pin", this.acceptEventAction.getResults().size() == 0);

-

-		if (!editAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is false.

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with the 'TriggerCallEvent'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 0 pin

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallFalse_SingleTrigger_CallEvent() {

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerCallEvent);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);

-		if (!editAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have no result pin", this.acceptEventAction.getResults().size() == 0);

-

-		if (!editAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having already been synchronized with 'extendedTrigger1' specification,

-	 * ensure that if a new trigger is add pin evolves accordingly

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin

-	 * - 1 pin typed by the extendedSignal1

-	 * - 3] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1' and 'extendedTrigger2'

-	 * - 4] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin

-	 * - 1 pin typed by the baseSignal (common ancestor)

-	 * 

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallFalse_MultipleTrigger_SignalEvent_CommonAncestor() {

-		// Assign extendedTrigger1 to acceptEventAction

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);

-		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);

-		if (!baseEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));

-

-		// Assign extendedTrigger1 to acceptEventAction

-		List<Trigger> triggers = new ArrayList<Trigger>();

-		triggers.add(this.extendedTrigger1);

-		triggers.add(this.extendedTrigger2);

-		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), triggers);

-		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);

-		if (!extendedEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by BaseSignal",

-				this.acceptEventAction.getResults().get(0).getType() == this.baseSignal);

-		if (!baseEditAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having already been synchronized with 'extendedTrigger1' specification,

-	 * ensure that if a new trigger is add pin evolves accordingly

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin

-	 * - 1 pin typed by the extendedSignal1

-	 * - 3] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1' and 'triggerTimerEvent'

-	 * - 4] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 0 pin

-	 * 

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallFalse_MultipleTrigger_MixedEvents() {

-		// Assign extendedTrigger1 to acceptEventAction

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);

-		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);

-		if (!baseEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));

-

-		// Assign extendedTrigger1 to acceptEventAction

-		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), triggerTimerEvent);

-		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);

-		if (!extendedEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);

-		Assert.assertTrue("AcceptEventAction shall have a result not type",

-				this.acceptEventAction.getResults().get(0).getType() == null);

-		if (!baseEditAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is true.

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'isUmnarshall' feature is set to true

-	 * - 2] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'

-	 * - 3] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 2 pin

-	 * - 1 for the property p1 of baseSignal type with integer (type of p1)

-	 * - 1 for the property p2 of baseSignal type with boolean (type of p2)

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallTrue_SingleTrigger_SignalEvent() {

-		// Set isUnmarshall to true

-		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);

-		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);

-		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));

-

-		// Assign baseTrigger to acceptEventAction

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.baseTrigger);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);

-		if (!editAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have 2 result pins", this.acceptEventAction.getResults().size() == 2);

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p1",

-				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Integer"));

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p2",

-				this.acceptEventAction.getResults().get(1).getType() == this.getPrimitiveType("Boolean"));

-		if (!editAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is true.

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'isUmnarshall' feature is set to true

-	 * - 2] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'

-	 * - 3] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin

-	 * - 1 pin type by real

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallTrue_SingleTrigger_TimeEvent() {

-		// Set isUnmarshall to true

-		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);

-		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);

-		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));

-

-		// Assign baseTrigger to acceptEventAction

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerTimerEvent);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);

-		if (!editAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have a result pins", this.acceptEventAction.getResults().size() == 1);

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by real",

-				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Real"));

-		if (!editAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having already been synchronized with 'baseTrigger' specification, ensure that if the the 'trigger' feature

-	 * of the action evolves then pins are updated accordingly

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 3 pins

-	 * - 3 argument pins (p1, p2 and p3).

-	 * - 3] AcceptEventAction 'trigger' feature is set an other trigger 'extendedTrigger2'

-	 * - 4] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 2 pins

-	 * - 2 pins for parameter of the common signal (baseSignal)

-	 * 

-	 * Note: along the synchronization process pins p1 and p2 are not deleted. This makes sure that user edges can be preserved.

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallTrue_MultipleTrigger_SignalEvent_CommonAncestor() {

-		// Set isUnmarshall to true

-		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);

-		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);

-		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));

-

-		// Assign extendedTrigger1 to acceptEventAction

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);

-		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);

-		if (!baseEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));

-

-		// Assign extendedTrigger2 to acceptEventAction

-		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger2);

-		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);

-		if (!extendedEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have 2 result pins", this.acceptEventAction.getResults().size() == 2);

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p1",

-				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Integer"));

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p2",

-				this.acceptEventAction.getResults().get(1).getType() == this.getPrimitiveType("Boolean"));

-		if (!baseEditAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having already been synchronized with 'baseTrigger' specification, ensure that if the the 'trigger' feature

-	 * of the action evolves then pins are updated accordingly

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 3 pins

-	 * - 3 argument pins (p1, p2 and p3).

-	 * - 3] AcceptEventAction 'trigger' feature is set an other trigger 'extendedTrigger2'

-	 * - 4] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 0 pins because there is no common ancestor

-	 * 

-	 * Note: along the synchronization process pins p1 and p2 are not deleted. This makes sure that user edges can be preserved.

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallTrue_MultipleTrigger_SignalEvent_NoCommonAncestor() {

-		// Set isUnmarshall to true

-		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);

-		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);

-		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));

-

-		// Assign extendedTrigger1 to acceptEventAction

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);

-		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);

-		if (!baseEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));

-

-		// Assign trigger3 to acceptEventAction

-		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.trigger3);

-		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);

-		if (!extendedEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have no result pins", this.acceptEventAction.getResults().size() == 0);

-

-		if (!baseEditAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having already been synchronized with 'extendedTrigger1' specification,

-	 * ensure that if a new trigger is add pin evolves accordingly

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'

-	 * - 2] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin

-	 * - 1 pin typed by the extendedSignal1

-	 * - 3] Ass a trigger associate to a timeEvent

-	 * - 4] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin

-	 * - 1 pin no type

-	 * 

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallTrue_MultipleTrigger_TimeEvent() {

-		// Set isUnmarshall to true

-		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);

-		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);

-		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));

-

-		// Assign triggerTimerEvent

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerTimerEvent);

-		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);

-		if (!baseEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));

-

-		// Add a trigger

-		Trigger trigger = UMLFactory.eINSTANCE.createTrigger();

-		trigger.setEvent(UMLFactory.eINSTANCE.createTimeEvent());

-		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), trigger);

-		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);

-		if (!extendedEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);

-		Assert.assertTrue("AcceptEventAction shall have a result pin no type",

-				this.acceptEventAction.getResults().get(0).getType() == null);

-		if (!baseEditAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having triggers, ensure that if the SignalEvent associate to a trigger changes then pins are inferred when is unmarshall is true.

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'isUmnarshall' feature is set to true

-	 * - 2] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'

-	 * - 3] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 2 pin

-	 * - 1 for the property p1 of baseSignal type with integer (type of p1)

-	 * - 1 for the property p2 of baseSignal type with boolean (type of p2)

-	 * - 3] Add attribute (String) to the signal 'baseSignal'

-	 * - AcceptEventAction has now 3 pin

-	 * - 1 for the property p1 of baseSignal type with integer (type of p1)

-	 * - 1 for the property p2 of baseSignal type with boolean (type of p2)

-	 * - 1 for the property p2 of baseSignal type with string

-	 * 

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallTrue_SingleTrigger_SignalEvent_SignalChange() {

-		// Set isUnmarshall to true

-		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);

-		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);

-		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));

-

-		// Assign baseTrigger to acceptEventAction

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.baseTrigger);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);

-		if (!editAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));

-

-		// Add attribute to baseSignal

-		Property p4 = UMLFactory.eINSTANCE.createProperty();

-		p4.setName("p4");

-		p4.setUpper(1);

-		p4.setLower(-1);

-		p4.setType(this.getPrimitiveType("String"));

-		SetRequest changeSignalRequest = new SetRequest(this.editingDomain, this.baseSignal, UMLPackage.eINSTANCE.getSignal_OwnedAttribute(), p4);

-		IElementEditService changeSignalElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand changeSignalEditAcceptEventActionCommand = changeSignalElementEditService.getEditCommand(changeSignalRequest);

-		if (!changeSignalEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(changeSignalEditAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have 3 result pins", this.acceptEventAction.getResults().size() == 3);

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p1",

-				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Integer"));

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p2",

-				this.acceptEventAction.getResults().get(1).getType() == this.getPrimitiveType("Boolean"));

-		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p4",

-				this.acceptEventAction.getResults().get(2).getType() == this.getPrimitiveType("String"));

-		if (!editAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a AcceptEventAction having already been synchronized with 'extendedTrigger1' specification,

-	 * ensure that if a new trigger is add pin evolves accordingly

-	 * 

-	 * Scenario:

-	 * - 1] AcceptEventAction 'isUmnarshall' feature is set to true

-	 * - 2] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'

-	 * - 3] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 1 pin

-	 * - 1 pin typed by the extendedSignal1

-	 * - 4] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1' and 'triggerTimerEvent'

-	 * - 5] Synchronization is performed via the advice

-	 * - AcceptEventAction has now 0 pin

-	 * 

-	 */

-	@Test

-	public void testPinDerivation_IsUnmarshallTrue_MultipleTrigger_MixedEvents() {

-		// Set isUnmarshall to true

-		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);

-		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);

-		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));

-

-		// Assign extendedTrigger1 to acceptEventAction

-		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);

-		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);

-		if (!baseEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));

-

-		// Assign extendedTrigger1 to acceptEventAction

-		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), triggerTimerEvent);

-		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);

-		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);

-		if (!extendedEditAcceptEventActionCommand.canExecute()) {

-			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));

-

-		// Assert result derivation

-		Assert.assertTrue("AcceptEventAction shall have 0 result pin", this.acceptEventAction.getResults().size() == 0);

-

-		if (!baseEditAcceptEventActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-

-		// Define base trigger N1

-		this.baseTrigger = UMLFactory.eINSTANCE.createTrigger();

-		Property p1 = UMLFactory.eINSTANCE.createProperty();

-		p1.setName("p1");

-		p1.setUpper(1);

-		p1.setLower(1);

-		p1.setType(this.getPrimitiveType("Integer"));

-		Property p2 = UMLFactory.eINSTANCE.createProperty();

-		p2.setName("p2");

-		p2.setUpper(1);

-		p2.setLower(1);

-		p2.setType(this.getPrimitiveType("Boolean"));

-		this.baseSignal = UMLFactory.eINSTANCE.createSignal();

-		this.baseSignal.getOwnedAttributes().add(p1);

-		this.baseSignal.getOwnedAttributes().add(p2);

-		SignalEvent se1 = UMLFactory.eINSTANCE.createSignalEvent();

-		se1.setSignal(this.baseSignal);

-		this.baseTrigger.setEvent(se1);

-

-		// Define extended trigger N2

-		this.extendedTrigger1 = UMLFactory.eINSTANCE.createTrigger();

-		Property p3 = UMLFactory.eINSTANCE.createProperty();

-		p3.setName("p3");

-		p3.setUpper(1);

-		p3.setLower(-1);

-		p3.setType(this.getPrimitiveType("String"));

-		this.extendedSignal1 = UMLFactory.eINSTANCE.createSignal();

-		this.extendedSignal1.getOwnedAttributes().add(p3);

-		SignalEvent se2 = UMLFactory.eINSTANCE.createSignalEvent();

-		se2.setSignal(this.extendedSignal1);

-		this.extendedTrigger1.setEvent(se2);

-

-		// Define extended trigger N3

-		this.extendedTrigger2 = UMLFactory.eINSTANCE.createTrigger();

-		Property p4 = UMLFactory.eINSTANCE.createProperty();

-		p4.setName("p4");

-		p4.setUpper(1);

-		p4.setLower(-1);

-		p4.setType(this.getPrimitiveType("String"));

-		this.extendedSignal2 = UMLFactory.eINSTANCE.createSignal();

-		this.extendedSignal2.getOwnedAttributes().add(p4);

-		SignalEvent se3 = UMLFactory.eINSTANCE.createSignalEvent();

-		se3.setSignal(this.extendedSignal2);

-		this.extendedTrigger2.setEvent(se3);

-

-		// Define extended trigger N4

-		this.trigger3 = UMLFactory.eINSTANCE.createTrigger();

-		this.Signal3 = UMLFactory.eINSTANCE.createSignal();

-		SignalEvent se4 = UMLFactory.eINSTANCE.createSignalEvent();

-		se4.setSignal(this.Signal3);

-		this.trigger3.setEvent(se4);

-

-		// Define extended trigger N5 time event

-		this.triggerTimerEvent = UMLFactory.eINSTANCE.createTrigger();

-		TimeEvent te1 = UMLFactory.eINSTANCE.createTimeEvent();

-		this.triggerTimerEvent.setEvent(te1);

-

-		// Define extended trigger N6 change event

-		this.triggerChangeEvent = UMLFactory.eINSTANCE.createTrigger();

-		ChangeEvent ce1 = UMLFactory.eINSTANCE.createChangeEvent();

-		this.triggerChangeEvent.setEvent(ce1);

-

-		// Define extended trigger N7 call event

-		this.triggerCallEvent = UMLFactory.eINSTANCE.createTrigger();

-		CallEvent ce2 = UMLFactory.eINSTANCE.createCallEvent();

-		this.triggerCallEvent.setEvent(ce2);

-

-		// Create generalization between the three signals

-		Generalization generalization1 = UMLFactory.eINSTANCE.createGeneralization();

-		generalization1.setGeneral(this.baseSignal);

-		generalization1.setSpecific(this.extendedSignal1);

-		this.extendedSignal1.getGeneralizations().add(generalization1);

-		Generalization generalization2 = UMLFactory.eINSTANCE.createGeneralization();

-		generalization2.setGeneral(this.baseSignal);

-		generalization2.setSpecific(this.extendedSignal2);

-		this.extendedSignal2.getGeneralizations().add(generalization2);

-

-		// Create the activity containing the accept event action

-		Activity activity = UMLFactory.eINSTANCE.createActivity();

-		this.acceptEventAction = UMLFactory.eINSTANCE.createAcceptEventAction();

-		this.acceptEventAction.setIsUnmarshall(false);

-		activity.getOwnedNodes().add(this.acceptEventAction);

-

-		// Add the different elements to the model

-		this.umlTestModel.getPackagedElements().add(activity);

-		this.umlTestModel.getPackagedElements().add(this.baseSignal);

-		this.umlTestModel.getPackagedElements().add(this.extendedSignal1);

-		this.umlTestModel.getPackagedElements().add(this.extendedSignal2);

-		this.umlTestModel.getPackagedElements().add(this.Signal3);

-

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.derivation.pins;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.AcceptEventAction;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.CallEvent;
+import org.eclipse.uml2.uml.ChangeEvent;
+import org.eclipse.uml2.uml.Generalization;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Signal;
+import org.eclipse.uml2.uml.SignalEvent;
+import org.eclipse.uml2.uml.TimeEvent;
+import org.eclipse.uml2.uml.Trigger;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * Test for automated pin derivation for AcceptEventAction and AcceptCallAction
+ *
+ */
+public class TestAcceptEventActionPinDerivation extends AbstractTestPinDerivation {
+
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.AcceptEventActionEditHelperAdvice";
+
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_SIGNAL = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEditHelperAdvice";
+
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_SIGNALEVENT = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEventEditHelperAdvice";
+
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice";
+
+	private AcceptEventAction acceptEventAction;
+
+	private Trigger baseTrigger;
+
+	private Signal baseSignal;
+
+	private Trigger extendedTrigger1;
+
+	private Signal extendedSignal1;
+
+	private Trigger extendedTrigger2;
+
+	private Signal extendedSignal2;
+
+	private Trigger trigger3;
+
+	private Signal Signal3;
+
+	private Trigger triggerTimerEvent;
+
+	private Trigger triggerChangeEvent;
+
+	private Trigger triggerCallEvent;
+
+	/**
+	 * Constructor.
+	 */
+	public TestAcceptEventActionPinDerivation() {
+		this.populateBaseTestModel();
+		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION
+		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
+		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.ACCEPTE_EVENT_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the AcceptEventAction is available
+	 */
+	@Test
+	public void testAdviceForAcceptEventActionExists() {
+		Assert.assertNotNull("AcceptEventAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+		Assert.assertNotNull("SignalEvent advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_SIGNALEVENT));
+		Assert.assertNotNull("Signal advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_SIGNAL));
+		Assert.assertNotNull("Property advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY));
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having already been synchronized with 'baseTrigger', ensure that if the isUnmarshall property is set to true
+	 * the action evolves then pins are updated accordingly.
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin typed by the signal
+	 * - 3] AcceptEventAction 'isUmnarshall' feature is set to true
+	 * - AcceptEventAction has now 2 pin
+	 * - 1 for the property p1 of baseSignal type with integer (type of p1)
+	 * - 1 for the property p2 of baseSignal type with boolean (type of p2)
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallFalse_ToIsUnmarshallTrue() {
+		// Assign baseTrigger to acceptEventAction
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.baseTrigger);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);
+		if (!editAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));
+
+		// Set isUnmarshall to true
+		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);
+		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);
+		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have 2 result pins", this.acceptEventAction.getResults().size() == 2);
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p1",
+				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Integer"));
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p2",
+				this.acceptEventAction.getResults().get(1).getType() == this.getPrimitiveType("Boolean"));
+		if (!editAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is false.
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin typed by the signal
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallFalse_SingleTrigger_SignalEvent() {
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.baseTrigger);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);
+		if (!editAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the baseSignal", this.acceptEventAction.getResults().get(0).getType() == baseSignal);
+
+		if (!editAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is false.
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with the 'TriggerTimeEvent'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin typed by Real
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallFalse_SingleTrigger_TimeEvent() {
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerTimerEvent);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);
+		if (!editAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the real", this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Real"));
+
+		if (!editAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is false.
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with the 'TriggerChangeEvent'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 0 pin
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallFalse_SingleTrigger_ChangeEvent() {
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerChangeEvent);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);
+		if (!editAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have no result pin", this.acceptEventAction.getResults().size() == 0);
+
+		if (!editAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is false.
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with the 'TriggerCallEvent'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 0 pin
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallFalse_SingleTrigger_CallEvent() {
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerCallEvent);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);
+		if (!editAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have no result pin", this.acceptEventAction.getResults().size() == 0);
+
+		if (!editAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having already been synchronized with 'extendedTrigger1' specification,
+	 * ensure that if a new trigger is add pin evolves accordingly
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin
+	 * - 1 pin typed by the extendedSignal1
+	 * - 3] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1' and 'extendedTrigger2'
+	 * - 4] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin
+	 * - 1 pin typed by the baseSignal (common ancestor)
+	 * 
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallFalse_MultipleTrigger_SignalEvent_CommonAncestor() {
+		// Assign extendedTrigger1 to acceptEventAction
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);
+		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);
+		if (!baseEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));
+
+		// Assign extendedTrigger1 to acceptEventAction
+		List<Trigger> triggers = new ArrayList<Trigger>();
+		triggers.add(this.extendedTrigger1);
+		triggers.add(this.extendedTrigger2);
+		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), triggers);
+		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);
+		if (!extendedEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by BaseSignal",
+				this.acceptEventAction.getResults().get(0).getType() == this.baseSignal);
+		if (!baseEditAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having already been synchronized with 'extendedTrigger1' specification,
+	 * ensure that if a new trigger is add pin evolves accordingly
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin
+	 * - 1 pin typed by the extendedSignal1
+	 * - 3] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1' and 'triggerTimerEvent'
+	 * - 4] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 0 pin
+	 * 
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallFalse_MultipleTrigger_MixedEvents() {
+		// Assign extendedTrigger1 to acceptEventAction
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);
+		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);
+		if (!baseEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));
+
+		// Assign extendedTrigger1 to acceptEventAction
+		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), triggerTimerEvent);
+		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);
+		if (!extendedEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);
+		Assert.assertTrue("AcceptEventAction shall have a result not type",
+				this.acceptEventAction.getResults().get(0).getType() == null);
+		if (!baseEditAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is true.
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'isUmnarshall' feature is set to true
+	 * - 2] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'
+	 * - 3] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 2 pin
+	 * - 1 for the property p1 of baseSignal type with integer (type of p1)
+	 * - 1 for the property p2 of baseSignal type with boolean (type of p2)
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallTrue_SingleTrigger_SignalEvent() {
+		// Set isUnmarshall to true
+		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);
+		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);
+		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));
+
+		// Assign baseTrigger to acceptEventAction
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.baseTrigger);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);
+		if (!editAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have 2 result pins", this.acceptEventAction.getResults().size() == 2);
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p1",
+				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Integer"));
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p2",
+				this.acceptEventAction.getResults().get(1).getType() == this.getPrimitiveType("Boolean"));
+		if (!editAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having no referenced trigger, ensure that if a trigger gets referenced then pins are inferred when isUnmarshall is true.
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'isUmnarshall' feature is set to true
+	 * - 2] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'
+	 * - 3] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin
+	 * - 1 pin type by real
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallTrue_SingleTrigger_TimeEvent() {
+		// Set isUnmarshall to true
+		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);
+		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);
+		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));
+
+		// Assign baseTrigger to acceptEventAction
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerTimerEvent);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);
+		if (!editAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have a result pins", this.acceptEventAction.getResults().size() == 1);
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by real",
+				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Real"));
+		if (!editAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having already been synchronized with 'baseTrigger' specification, ensure that if the the 'trigger' feature
+	 * of the action evolves then pins are updated accordingly
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 3 pins
+	 * - 3 argument pins (p1, p2 and p3).
+	 * - 3] AcceptEventAction 'trigger' feature is set an other trigger 'extendedTrigger2'
+	 * - 4] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 2 pins
+	 * - 2 pins for parameter of the common signal (baseSignal)
+	 * 
+	 * Note: along the synchronization process pins p1 and p2 are not deleted. This makes sure that user edges can be preserved.
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallTrue_MultipleTrigger_SignalEvent_CommonAncestor() {
+		// Set isUnmarshall to true
+		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);
+		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);
+		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));
+
+		// Assign extendedTrigger1 to acceptEventAction
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);
+		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);
+		if (!baseEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));
+
+		// Assign extendedTrigger2 to acceptEventAction
+		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger2);
+		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);
+		if (!extendedEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have 2 result pins", this.acceptEventAction.getResults().size() == 2);
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p1",
+				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Integer"));
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p2",
+				this.acceptEventAction.getResults().get(1).getType() == this.getPrimitiveType("Boolean"));
+		if (!baseEditAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having already been synchronized with 'baseTrigger' specification, ensure that if the the 'trigger' feature
+	 * of the action evolves then pins are updated accordingly
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 3 pins
+	 * - 3 argument pins (p1, p2 and p3).
+	 * - 3] AcceptEventAction 'trigger' feature is set an other trigger 'extendedTrigger2'
+	 * - 4] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 0 pins because there is no common ancestor
+	 * 
+	 * Note: along the synchronization process pins p1 and p2 are not deleted. This makes sure that user edges can be preserved.
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallTrue_MultipleTrigger_SignalEvent_NoCommonAncestor() {
+		// Set isUnmarshall to true
+		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);
+		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);
+		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));
+
+		// Assign extendedTrigger1 to acceptEventAction
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);
+		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);
+		if (!baseEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));
+
+		// Assign trigger3 to acceptEventAction
+		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.trigger3);
+		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);
+		if (!extendedEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have no result pins", this.acceptEventAction.getResults().size() == 0);
+
+		if (!baseEditAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having already been synchronized with 'extendedTrigger1' specification,
+	 * ensure that if a new trigger is add pin evolves accordingly
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'
+	 * - 2] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin
+	 * - 1 pin typed by the extendedSignal1
+	 * - 3] Ass a trigger associate to a timeEvent
+	 * - 4] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin
+	 * - 1 pin no type
+	 * 
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallTrue_MultipleTrigger_TimeEvent() {
+		// Set isUnmarshall to true
+		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);
+		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);
+		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));
+
+		// Assign triggerTimerEvent
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.triggerTimerEvent);
+		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);
+		if (!baseEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));
+
+		// Add a trigger
+		Trigger trigger = UMLFactory.eINSTANCE.createTrigger();
+		trigger.setEvent(UMLFactory.eINSTANCE.createTimeEvent());
+		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), trigger);
+		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);
+		if (!extendedEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have a result pin", this.acceptEventAction.getResults().size() == 1);
+		Assert.assertTrue("AcceptEventAction shall have a result pin no type",
+				this.acceptEventAction.getResults().get(0).getType() == null);
+		if (!baseEditAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having triggers, ensure that if the SignalEvent associate to a trigger changes then pins are inferred when is unmarshall is true.
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'isUmnarshall' feature is set to true
+	 * - 2] AcceptEventAction 'trigger' feature is set with the 'baseTrigger'
+	 * - 3] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 2 pin
+	 * - 1 for the property p1 of baseSignal type with integer (type of p1)
+	 * - 1 for the property p2 of baseSignal type with boolean (type of p2)
+	 * - 3] Add attribute (String) to the signal 'baseSignal'
+	 * - AcceptEventAction has now 3 pin
+	 * - 1 for the property p1 of baseSignal type with integer (type of p1)
+	 * - 1 for the property p2 of baseSignal type with boolean (type of p2)
+	 * - 1 for the property p2 of baseSignal type with string
+	 * 
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallTrue_SingleTrigger_SignalEvent_SignalChange() {
+		// Set isUnmarshall to true
+		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);
+		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);
+		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));
+
+		// Assign baseTrigger to acceptEventAction
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.baseTrigger);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand editAcceptEventActionCommand = elementEditService.getEditCommand(request);
+		if (!editAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAcceptEventActionCommand));
+
+		// Add attribute to baseSignal
+		Property p4 = UMLFactory.eINSTANCE.createProperty();
+		p4.setName("p4");
+		p4.setUpper(1);
+		p4.setLower(-1);
+		p4.setType(this.getPrimitiveType("String"));
+		SetRequest changeSignalRequest = new SetRequest(this.editingDomain, this.baseSignal, UMLPackage.eINSTANCE.getSignal_OwnedAttribute(), p4);
+		IElementEditService changeSignalElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand changeSignalEditAcceptEventActionCommand = changeSignalElementEditService.getEditCommand(changeSignalRequest);
+		if (!changeSignalEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(changeSignalEditAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have 3 result pins", this.acceptEventAction.getResults().size() == 3);
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p1",
+				this.acceptEventAction.getResults().get(0).getType() == this.getPrimitiveType("Integer"));
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p2",
+				this.acceptEventAction.getResults().get(1).getType() == this.getPrimitiveType("Boolean"));
+		Assert.assertTrue("AcceptEventAction shall have a result pin typed by the type of the property p4",
+				this.acceptEventAction.getResults().get(2).getType() == this.getPrimitiveType("String"));
+		if (!editAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a AcceptEventAction having already been synchronized with 'extendedTrigger1' specification,
+	 * ensure that if a new trigger is add pin evolves accordingly
+	 * 
+	 * Scenario:
+	 * - 1] AcceptEventAction 'isUmnarshall' feature is set to true
+	 * - 2] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1'
+	 * - 3] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 1 pin
+	 * - 1 pin typed by the extendedSignal1
+	 * - 4] AcceptEventAction 'trigger' feature is set with 'extendedTrigger1' and 'triggerTimerEvent'
+	 * - 5] Synchronization is performed via the advice
+	 * - AcceptEventAction has now 0 pin
+	 * 
+	 */
+	@Test
+	public void testPinDerivation_IsUnmarshallTrue_MultipleTrigger_MixedEvents() {
+		// Set isUnmarshall to true
+		SetRequest isUnmarshallRequest = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_IsUnmarshall(), true);
+		IElementEditService isUnmarshallElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand isUnmarshallEditAcceptEventActionCommand = isUnmarshallElementEditService.getEditCommand(isUnmarshallRequest);
+		if (!isUnmarshallEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The attribut isUnmarshall of AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(isUnmarshallEditAcceptEventActionCommand));
+
+		// Assign extendedTrigger1 to acceptEventAction
+		SetRequest request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), this.extendedTrigger1);
+		IElementEditService baseElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand baseEditAcceptEventActionCommand = baseElementEditService.getEditCommand(request);
+		if (!baseEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(baseEditAcceptEventActionCommand));
+
+		// Assign extendedTrigger1 to acceptEventAction
+		request = new SetRequest(this.editingDomain, this.acceptEventAction, UMLPackage.eINSTANCE.getAcceptEventAction_Trigger(), triggerTimerEvent);
+		IElementEditService extendedElementEditService = ElementEditServiceUtils.getCommandProvider(this.acceptEventAction);
+		ICommand extendedEditAcceptEventActionCommand = extendedElementEditService.getEditCommand(request);
+		if (!extendedEditAcceptEventActionCommand.canExecute()) {
+			Assert.fail("The AcceptEventAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(extendedEditAcceptEventActionCommand));
+
+		// Assert result derivation
+		Assert.assertTrue("AcceptEventAction shall have 0 result pin", this.acceptEventAction.getResults().size() == 0);
+
+		if (!baseEditAcceptEventActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+
+		// Define base trigger N1
+		this.baseTrigger = UMLFactory.eINSTANCE.createTrigger();
+		Property p1 = UMLFactory.eINSTANCE.createProperty();
+		p1.setName("p1");
+		p1.setUpper(1);
+		p1.setLower(1);
+		p1.setType(this.getPrimitiveType("Integer"));
+		Property p2 = UMLFactory.eINSTANCE.createProperty();
+		p2.setName("p2");
+		p2.setUpper(1);
+		p2.setLower(1);
+		p2.setType(this.getPrimitiveType("Boolean"));
+		this.baseSignal = UMLFactory.eINSTANCE.createSignal();
+		this.baseSignal.getOwnedAttributes().add(p1);
+		this.baseSignal.getOwnedAttributes().add(p2);
+		SignalEvent se1 = UMLFactory.eINSTANCE.createSignalEvent();
+		se1.setSignal(this.baseSignal);
+		this.baseTrigger.setEvent(se1);
+
+		// Define extended trigger N2
+		this.extendedTrigger1 = UMLFactory.eINSTANCE.createTrigger();
+		Property p3 = UMLFactory.eINSTANCE.createProperty();
+		p3.setName("p3");
+		p3.setUpper(1);
+		p3.setLower(-1);
+		p3.setType(this.getPrimitiveType("String"));
+		this.extendedSignal1 = UMLFactory.eINSTANCE.createSignal();
+		this.extendedSignal1.getOwnedAttributes().add(p3);
+		SignalEvent se2 = UMLFactory.eINSTANCE.createSignalEvent();
+		se2.setSignal(this.extendedSignal1);
+		this.extendedTrigger1.setEvent(se2);
+
+		// Define extended trigger N3
+		this.extendedTrigger2 = UMLFactory.eINSTANCE.createTrigger();
+		Property p4 = UMLFactory.eINSTANCE.createProperty();
+		p4.setName("p4");
+		p4.setUpper(1);
+		p4.setLower(-1);
+		p4.setType(this.getPrimitiveType("String"));
+		this.extendedSignal2 = UMLFactory.eINSTANCE.createSignal();
+		this.extendedSignal2.getOwnedAttributes().add(p4);
+		SignalEvent se3 = UMLFactory.eINSTANCE.createSignalEvent();
+		se3.setSignal(this.extendedSignal2);
+		this.extendedTrigger2.setEvent(se3);
+
+		// Define extended trigger N4
+		this.trigger3 = UMLFactory.eINSTANCE.createTrigger();
+		this.Signal3 = UMLFactory.eINSTANCE.createSignal();
+		SignalEvent se4 = UMLFactory.eINSTANCE.createSignalEvent();
+		se4.setSignal(this.Signal3);
+		this.trigger3.setEvent(se4);
+
+		// Define extended trigger N5 time event
+		this.triggerTimerEvent = UMLFactory.eINSTANCE.createTrigger();
+		TimeEvent te1 = UMLFactory.eINSTANCE.createTimeEvent();
+		this.triggerTimerEvent.setEvent(te1);
+
+		// Define extended trigger N6 change event
+		this.triggerChangeEvent = UMLFactory.eINSTANCE.createTrigger();
+		ChangeEvent ce1 = UMLFactory.eINSTANCE.createChangeEvent();
+		this.triggerChangeEvent.setEvent(ce1);
+
+		// Define extended trigger N7 call event
+		this.triggerCallEvent = UMLFactory.eINSTANCE.createTrigger();
+		CallEvent ce2 = UMLFactory.eINSTANCE.createCallEvent();
+		this.triggerCallEvent.setEvent(ce2);
+
+		// Create generalization between the three signals
+		Generalization generalization1 = UMLFactory.eINSTANCE.createGeneralization();
+		generalization1.setGeneral(this.baseSignal);
+		generalization1.setSpecific(this.extendedSignal1);
+		this.extendedSignal1.getGeneralizations().add(generalization1);
+		Generalization generalization2 = UMLFactory.eINSTANCE.createGeneralization();
+		generalization2.setGeneral(this.baseSignal);
+		generalization2.setSpecific(this.extendedSignal2);
+		this.extendedSignal2.getGeneralizations().add(generalization2);
+
+		// Create the activity containing the accept event action
+		Activity activity = UMLFactory.eINSTANCE.createActivity();
+		this.acceptEventAction = UMLFactory.eINSTANCE.createAcceptEventAction();
+		this.acceptEventAction.setIsUnmarshall(false);
+		activity.getOwnedNodes().add(this.acceptEventAction);
+
+		// Add the different elements to the model
+		this.umlTestModel.getPackagedElements().add(activity);
+		this.umlTestModel.getPackagedElements().add(this.baseSignal);
+		this.umlTestModel.getPackagedElements().add(this.extendedSignal1);
+		this.umlTestModel.getPackagedElements().add(this.extendedSignal2);
+		this.umlTestModel.getPackagedElements().add(this.Signal3);
+
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestAddStructuralFeatureValueActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestAddStructuralFeatureValueActionPinDerivation.java
index 9b8aa8fa6ae..2eb4cc3926b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestAddStructuralFeatureValueActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestAddStructuralFeatureValueActionPinDerivation.java
@@ -1,315 +1,315 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.AddStructuralFeatureValueAction;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * 

- * Pins of AddStructuralFeatureValueAction should be create and update automatically

- * 

- */

-public class TestAddStructuralFeatureValueActionPinDerivation extends AbstractTestPinDerivation {

-

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.AddStructuralFeatureValueActionEditHelperAdvice";

-

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice";

-

-	private AddStructuralFeatureValueAction addStructuralFeatureValueAction;

-

-	private Class portClass;

-	

-	private Port port;

-	

-	private Class propertyClass;

-	

-	private Property property;

-	/**

-	 * Constructor.

-	 */

-	public TestAddStructuralFeatureValueActionPinDerivation() {

-		this.portClass = null;

-		this.port = null;

-		this.propertyClass = null;

-		this.property = null;

-		this.populateBaseTestModel();

-		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION

-		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();

-		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.ADD_STRUCTURAL_FEATURE_VALUE_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the AddStructuralFeatureValueAction is available

-	 */

-	@Test

-	public void testAdviceForAddStructuraFeatureActionExists() {

-		Assert.assertNotNull("AddStructuralFeatureValueAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-		Assert.assertNotNull("Property advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY));

-	}

-

-	/**

-	 * Role:

-	 * - For a AddStructuralFeatureValueAction having no structural feature, ensure that if a structural feature is referenced then the pins corresponding to the

-	 * structural feature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] AddStructuralFeatureValueAction 'structuralFeature' feature is set with the Property 'property'

-	 * - 2] Synchronization is performed via the advice

-	 * - AddStructuralFeatureValueAction has now 4 pins

-	 * - 1 object ([in] typed by propertyClass)

-	 * - 1 result ([out] typed by propertyClass)

-	 * - 1 value ([in] typed by Integer)

-	 * - 1 insertAt ([in] typed by UnlimitedNatural)

-	 */

-	@Test

-	public void testPinDerivation_NoStructuralFeature_To_PropertyStructuralFeature() {

-		SetRequest request = new SetRequest(this.editingDomain, this.addStructuralFeatureValueAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.property);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);

-		ICommand editAddStructuralFeatureValueActionCommand = elementEditService.getEditCommand(request);

-		if (!editAddStructuralFeatureValueActionCommand.canExecute()) {

-			Assert.fail("The AddStructuralFeatureValueAction cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAddStructuralFeatureValueActionCommand));

-

-		// Assert object pin

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have a object", this.addStructuralFeatureValueAction.getObject() != null);

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have an object pin typed by propertyClass", this.addStructuralFeatureValueAction.getObject().getType() == propertyClass);

-		

-		// Assert result pin

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have one result pin", this.addStructuralFeatureValueAction.getResult() != null);

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have a result pin typed by propertyClass", this.addStructuralFeatureValueAction.getResult().getType() == propertyClass);

-		

-		// Assert value pin

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have one value pin", this.addStructuralFeatureValueAction.getValue() != null);

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have a value pin typed by integer", this.addStructuralFeatureValueAction.getValue().getType() == this.getPrimitiveType("Integer"));

-		

-		// Assert insertAt pin

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have one insertAt pin", this.addStructuralFeatureValueAction.getInsertAt() != null);

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have an insertAt pin typed by UnlimitedNatural", this.addStructuralFeatureValueAction.getInsertAt().getType() == this.getPrimitiveType("UnlimitedNatural"));

-		

-		if (!editAddStructuralFeatureValueActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For a AddStructuralFeatureValueAction having no structural feature, ensure that if a structural feature is referenced then the pins corresponding to the

-	 * structural feature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] AddStructuralFeatureValueAction 'structuralFeature' feature is set with the Port 'port'

-	 * - 2] Synchronization is performed via the advice

-	 * - AddStructuralFeatureValueAction has now 3 pins

-	 * - 1 object ([in] typed by portClass)

-	 * - 1 result ([out] typed by portClass)

-	 * - 1 value ([in] typed by String)

-	 */

-	@Test

-	public void testPinDerivation_NoStructuralFeature_To_PortStructuralFeature() {

-		SetRequest request = new SetRequest(this.editingDomain, this.addStructuralFeatureValueAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.port);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);

-		ICommand editAddStructuralFeatureValueActionCommand = elementEditService.getEditCommand(request);

-		if (!editAddStructuralFeatureValueActionCommand.canExecute()) {

-			Assert.fail("The AddStructuralFeatureValueAction cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAddStructuralFeatureValueActionCommand));

-

-		// Assert object pin

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have a object", this.addStructuralFeatureValueAction.getObject() != null);

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have an object pin typed by portClass", this.addStructuralFeatureValueAction.getObject().getType() == portClass);

-		

-		// Assert result pin

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have one result pin", this.addStructuralFeatureValueAction.getResult() != null);

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have a result pin typed by portClass", this.addStructuralFeatureValueAction.getResult().getType() == portClass);

-		

-		// Assert value pin

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have one value pin", this.addStructuralFeatureValueAction.getValue() != null);

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have a value pin typed by integer", this.addStructuralFeatureValueAction.getValue().getType() == this.getPrimitiveType("String"));

-		

-		// Assert insertAt pin

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have not insertAt pin", this.addStructuralFeatureValueAction.getInsertAt() == null);

-		

-		if (!editAddStructuralFeatureValueActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For a AddStructuralFeatureValueAction having structural feature, ensure that if the structural feature  type is change then the pins corresponding to the

-	 * structural feature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] AddStructuralFeatureValueAction 'structuralFeature' feature is set with the Port 'port'

-	 * - 2] Synchronization is performed via the advice

-	 * - AddStructuralFeatureValueAction has now 4 pins

-	 * - 1 object ([in] typed by propertyClass)

-	 * - 1 result ([out] typed by propertyClass)

-	 * - 1 value ([in] typed by Integer)

-	 * - 1 insertAt ([in] typed by UnlimitedNatural)

-	 * - 3] property type is set to "Boolean"

-	 * - AddStructuralFeatureValueAction has now 4 pins

-	 * - 1 object ([in] typed by propertyClass)

-	 * - 1 result ([out] typed by propertyClass)

-	 * - 1 value ([in] typed by Boolean)

-	 * - 1 insertAt ([in] typed by UnlimitedNatural)

-	 */

-	@Test

-	public void testPinDerivation_changePropertyStructuralFeatureType() {

-		SetRequest request = new SetRequest(this.editingDomain, this.addStructuralFeatureValueAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.property);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);

-		ICommand editAddStructuralFeatureValueActionCommand = elementEditService.getEditCommand(request);

-		if (!editAddStructuralFeatureValueActionCommand.canExecute()) {

-			Assert.fail("The AddStructuralFeatureValueAction cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAddStructuralFeatureValueActionCommand));

-		

-		// Change property type

-		SetRequest changePropertyRequest = new SetRequest(this.editingDomain, this.property, UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Boolean")); 

-		IElementEditService changePropertyElementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);

-		ICommand changePropertyEditAddStructuralFeatureValueActionCommand = changePropertyElementEditService.getEditCommand(changePropertyRequest);

-		if (!changePropertyEditAddStructuralFeatureValueActionCommand.canExecute()) {

-			Assert.fail("The attribut type of property cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(changePropertyEditAddStructuralFeatureValueActionCommand));

-		

-		// Assert result pins

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have one result pin", this.addStructuralFeatureValueAction.getValue() != null);

-		Assert.assertTrue("AddStructuralFeatureValueAction result pins shall typed by Integer", this.addStructuralFeatureValueAction.getValue().getType() == this.getPrimitiveType("Boolean"));

-		

-		if (!changePropertyEditAddStructuralFeatureValueActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For a AddStructuralFeatureValueAction having structural feature, ensure that if the structural feature  type is change then the pins corresponding to the

-	 * structural feature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] AddStructuralFeatureValueAction 'structuralFeature' feature is set with the Port 'port'

-	 * - 2] Synchronization is performed via the advice

-	 * - AddStructuralFeatureValueAction has now 3 pins

-	 * - 1 object ([in] typed by portClass)

-	 * - 1 result ([out] typed by portClass)

-	 * - 1 value ([in] typed by String)

-	 * - 3] port type is set to "Boolean"

-	 * - AddStructuralFeatureValueAction has now 3 pins

-	 * - 1 object ([in] typed by portClass)

-	 * - 1 result ([out] typed by portClass)

-	 * - 1 value ([in] typed by Boolean)

-	 */

-	@Test

-	public void testPinDerivation_changePortStructuralFeatureType() {

-		SetRequest request = new SetRequest(this.editingDomain, this.addStructuralFeatureValueAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.port);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);

-		ICommand editAddStructuralFeatureValueActionCommand = elementEditService.getEditCommand(request);

-		if (!editAddStructuralFeatureValueActionCommand.canExecute()) {

-			Assert.fail("The AddStructuralFeatureValueAction cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAddStructuralFeatureValueActionCommand));

-		

-		// Change port type

-		SetRequest changePortRequest = new SetRequest(this.editingDomain, this.port, UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Boolean")); 

-		IElementEditService changePortElementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);

-		ICommand changePortEditAddStructuralFeatureValueActionCommand = changePortElementEditService.getEditCommand(changePortRequest);

-		if (!changePortEditAddStructuralFeatureValueActionCommand.canExecute()) {

-			Assert.fail("The attribut type of port cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(changePortEditAddStructuralFeatureValueActionCommand));

-		

-		// Assert result pins

-		Assert.assertTrue("AddStructuralFeatureValueAction shall have one result pin", this.addStructuralFeatureValueAction.getValue() != null);

-		Assert.assertTrue("AddStructuralFeatureValueAction result pins shall typed by Integer", this.addStructuralFeatureValueAction.getValue().getType() == this.getPrimitiveType("Boolean"));

-		

-		if (!changePortEditAddStructuralFeatureValueActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-		// Define the property

-		this.property = UMLFactory.eINSTANCE.createProperty();

-		this.property.setName("p1");

-		this.property.setUpper(10);

-		this.property.setLower(1);

-		this.property.setType(this.getPrimitiveType("Integer"));

-		

-		// Define the port

-		this.port = UMLFactory.eINSTANCE.createPort();

-		this.port.setUpper(1);

-		this.port.setLower(0);

-		this.port.setType(this.getPrimitiveType("String"));

-

-		// Create propertyClass with a property

-		propertyClass = UMLFactory.eINSTANCE.createClass();

-		propertyClass.setName("C1");

-		propertyClass.getOwnedAttributes().add(property);

-		

-		// Create portClass with a port

-		portClass = UMLFactory.eINSTANCE.createClass();

-		portClass.setName("C2");

-		portClass.getOwnedPorts().add(port);

-		

-		// Create the activity containing the AddStructuralFeatureValueAction

-		Activity activity = UMLFactory.eINSTANCE.createActivity();

-		this.addStructuralFeatureValueAction = UMLFactory.eINSTANCE.createAddStructuralFeatureValueAction();

-		this.addStructuralFeatureValueAction.setStructuralFeature(port);

-		activity.getOwnedNodes().add(this.addStructuralFeatureValueAction);

-		

-		// Add the different elements to the model

-		this.umlTestModel.getPackagedElements().add(propertyClass);

-		this.umlTestModel.getPackagedElements().add(portClass);

-		this.umlTestModel.getPackagedElements().add(activity);

-		

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.AddStructuralFeatureValueAction;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * Pins of AddStructuralFeatureValueAction should be create and update automatically
+ * 
+ */
+public class TestAddStructuralFeatureValueActionPinDerivation extends AbstractTestPinDerivation {
+
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.AddStructuralFeatureValueActionEditHelperAdvice";
+
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice";
+
+	private AddStructuralFeatureValueAction addStructuralFeatureValueAction;
+
+	private Class portClass;
+	
+	private Port port;
+	
+	private Class propertyClass;
+	
+	private Property property;
+	/**
+	 * Constructor.
+	 */
+	public TestAddStructuralFeatureValueActionPinDerivation() {
+		this.portClass = null;
+		this.port = null;
+		this.propertyClass = null;
+		this.property = null;
+		this.populateBaseTestModel();
+		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION
+		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
+		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.ADD_STRUCTURAL_FEATURE_VALUE_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the AddStructuralFeatureValueAction is available
+	 */
+	@Test
+	public void testAdviceForAddStructuraFeatureActionExists() {
+		Assert.assertNotNull("AddStructuralFeatureValueAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+		Assert.assertNotNull("Property advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY));
+	}
+
+	/**
+	 * Role:
+	 * - For a AddStructuralFeatureValueAction having no structural feature, ensure that if a structural feature is referenced then the pins corresponding to the
+	 * structural feature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] AddStructuralFeatureValueAction 'structuralFeature' feature is set with the Property 'property'
+	 * - 2] Synchronization is performed via the advice
+	 * - AddStructuralFeatureValueAction has now 4 pins
+	 * - 1 object ([in] typed by propertyClass)
+	 * - 1 result ([out] typed by propertyClass)
+	 * - 1 value ([in] typed by Integer)
+	 * - 1 insertAt ([in] typed by UnlimitedNatural)
+	 */
+	@Test
+	public void testPinDerivation_NoStructuralFeature_To_PropertyStructuralFeature() {
+		SetRequest request = new SetRequest(this.editingDomain, this.addStructuralFeatureValueAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.property);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);
+		ICommand editAddStructuralFeatureValueActionCommand = elementEditService.getEditCommand(request);
+		if (!editAddStructuralFeatureValueActionCommand.canExecute()) {
+			Assert.fail("The AddStructuralFeatureValueAction cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAddStructuralFeatureValueActionCommand));
+
+		// Assert object pin
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have a object", this.addStructuralFeatureValueAction.getObject() != null);
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have an object pin typed by propertyClass", this.addStructuralFeatureValueAction.getObject().getType() == propertyClass);
+		
+		// Assert result pin
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have one result pin", this.addStructuralFeatureValueAction.getResult() != null);
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have a result pin typed by propertyClass", this.addStructuralFeatureValueAction.getResult().getType() == propertyClass);
+		
+		// Assert value pin
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have one value pin", this.addStructuralFeatureValueAction.getValue() != null);
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have a value pin typed by integer", this.addStructuralFeatureValueAction.getValue().getType() == this.getPrimitiveType("Integer"));
+		
+		// Assert insertAt pin
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have one insertAt pin", this.addStructuralFeatureValueAction.getInsertAt() != null);
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have an insertAt pin typed by UnlimitedNatural", this.addStructuralFeatureValueAction.getInsertAt().getType() == this.getPrimitiveType("UnlimitedNatural"));
+		
+		if (!editAddStructuralFeatureValueActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For a AddStructuralFeatureValueAction having no structural feature, ensure that if a structural feature is referenced then the pins corresponding to the
+	 * structural feature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] AddStructuralFeatureValueAction 'structuralFeature' feature is set with the Port 'port'
+	 * - 2] Synchronization is performed via the advice
+	 * - AddStructuralFeatureValueAction has now 3 pins
+	 * - 1 object ([in] typed by portClass)
+	 * - 1 result ([out] typed by portClass)
+	 * - 1 value ([in] typed by String)
+	 */
+	@Test
+	public void testPinDerivation_NoStructuralFeature_To_PortStructuralFeature() {
+		SetRequest request = new SetRequest(this.editingDomain, this.addStructuralFeatureValueAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.port);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);
+		ICommand editAddStructuralFeatureValueActionCommand = elementEditService.getEditCommand(request);
+		if (!editAddStructuralFeatureValueActionCommand.canExecute()) {
+			Assert.fail("The AddStructuralFeatureValueAction cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAddStructuralFeatureValueActionCommand));
+
+		// Assert object pin
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have a object", this.addStructuralFeatureValueAction.getObject() != null);
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have an object pin typed by portClass", this.addStructuralFeatureValueAction.getObject().getType() == portClass);
+		
+		// Assert result pin
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have one result pin", this.addStructuralFeatureValueAction.getResult() != null);
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have a result pin typed by portClass", this.addStructuralFeatureValueAction.getResult().getType() == portClass);
+		
+		// Assert value pin
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have one value pin", this.addStructuralFeatureValueAction.getValue() != null);
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have a value pin typed by integer", this.addStructuralFeatureValueAction.getValue().getType() == this.getPrimitiveType("String"));
+		
+		// Assert insertAt pin
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have not insertAt pin", this.addStructuralFeatureValueAction.getInsertAt() == null);
+		
+		if (!editAddStructuralFeatureValueActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For a AddStructuralFeatureValueAction having structural feature, ensure that if the structural feature  type is change then the pins corresponding to the
+	 * structural feature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] AddStructuralFeatureValueAction 'structuralFeature' feature is set with the Port 'port'
+	 * - 2] Synchronization is performed via the advice
+	 * - AddStructuralFeatureValueAction has now 4 pins
+	 * - 1 object ([in] typed by propertyClass)
+	 * - 1 result ([out] typed by propertyClass)
+	 * - 1 value ([in] typed by Integer)
+	 * - 1 insertAt ([in] typed by UnlimitedNatural)
+	 * - 3] property type is set to "Boolean"
+	 * - AddStructuralFeatureValueAction has now 4 pins
+	 * - 1 object ([in] typed by propertyClass)
+	 * - 1 result ([out] typed by propertyClass)
+	 * - 1 value ([in] typed by Boolean)
+	 * - 1 insertAt ([in] typed by UnlimitedNatural)
+	 */
+	@Test
+	public void testPinDerivation_changePropertyStructuralFeatureType() {
+		SetRequest request = new SetRequest(this.editingDomain, this.addStructuralFeatureValueAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.property);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);
+		ICommand editAddStructuralFeatureValueActionCommand = elementEditService.getEditCommand(request);
+		if (!editAddStructuralFeatureValueActionCommand.canExecute()) {
+			Assert.fail("The AddStructuralFeatureValueAction cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAddStructuralFeatureValueActionCommand));
+		
+		// Change property type
+		SetRequest changePropertyRequest = new SetRequest(this.editingDomain, this.property, UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Boolean")); 
+		IElementEditService changePropertyElementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);
+		ICommand changePropertyEditAddStructuralFeatureValueActionCommand = changePropertyElementEditService.getEditCommand(changePropertyRequest);
+		if (!changePropertyEditAddStructuralFeatureValueActionCommand.canExecute()) {
+			Assert.fail("The attribut type of property cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(changePropertyEditAddStructuralFeatureValueActionCommand));
+		
+		// Assert result pins
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have one result pin", this.addStructuralFeatureValueAction.getValue() != null);
+		Assert.assertTrue("AddStructuralFeatureValueAction result pins shall typed by Integer", this.addStructuralFeatureValueAction.getValue().getType() == this.getPrimitiveType("Boolean"));
+		
+		if (!changePropertyEditAddStructuralFeatureValueActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For a AddStructuralFeatureValueAction having structural feature, ensure that if the structural feature  type is change then the pins corresponding to the
+	 * structural feature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] AddStructuralFeatureValueAction 'structuralFeature' feature is set with the Port 'port'
+	 * - 2] Synchronization is performed via the advice
+	 * - AddStructuralFeatureValueAction has now 3 pins
+	 * - 1 object ([in] typed by portClass)
+	 * - 1 result ([out] typed by portClass)
+	 * - 1 value ([in] typed by String)
+	 * - 3] port type is set to "Boolean"
+	 * - AddStructuralFeatureValueAction has now 3 pins
+	 * - 1 object ([in] typed by portClass)
+	 * - 1 result ([out] typed by portClass)
+	 * - 1 value ([in] typed by Boolean)
+	 */
+	@Test
+	public void testPinDerivation_changePortStructuralFeatureType() {
+		SetRequest request = new SetRequest(this.editingDomain, this.addStructuralFeatureValueAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.port);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);
+		ICommand editAddStructuralFeatureValueActionCommand = elementEditService.getEditCommand(request);
+		if (!editAddStructuralFeatureValueActionCommand.canExecute()) {
+			Assert.fail("The AddStructuralFeatureValueAction cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editAddStructuralFeatureValueActionCommand));
+		
+		// Change port type
+		SetRequest changePortRequest = new SetRequest(this.editingDomain, this.port, UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Boolean")); 
+		IElementEditService changePortElementEditService = ElementEditServiceUtils.getCommandProvider(this.addStructuralFeatureValueAction);
+		ICommand changePortEditAddStructuralFeatureValueActionCommand = changePortElementEditService.getEditCommand(changePortRequest);
+		if (!changePortEditAddStructuralFeatureValueActionCommand.canExecute()) {
+			Assert.fail("The attribut type of port cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(changePortEditAddStructuralFeatureValueActionCommand));
+		
+		// Assert result pins
+		Assert.assertTrue("AddStructuralFeatureValueAction shall have one result pin", this.addStructuralFeatureValueAction.getValue() != null);
+		Assert.assertTrue("AddStructuralFeatureValueAction result pins shall typed by Integer", this.addStructuralFeatureValueAction.getValue().getType() == this.getPrimitiveType("Boolean"));
+		
+		if (!changePortEditAddStructuralFeatureValueActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+		// Define the property
+		this.property = UMLFactory.eINSTANCE.createProperty();
+		this.property.setName("p1");
+		this.property.setUpper(10);
+		this.property.setLower(1);
+		this.property.setType(this.getPrimitiveType("Integer"));
+		
+		// Define the port
+		this.port = UMLFactory.eINSTANCE.createPort();
+		this.port.setUpper(1);
+		this.port.setLower(0);
+		this.port.setType(this.getPrimitiveType("String"));
+
+		// Create propertyClass with a property
+		propertyClass = UMLFactory.eINSTANCE.createClass();
+		propertyClass.setName("C1");
+		propertyClass.getOwnedAttributes().add(property);
+		
+		// Create portClass with a port
+		portClass = UMLFactory.eINSTANCE.createClass();
+		portClass.setName("C2");
+		portClass.getOwnedPorts().add(port);
+		
+		// Create the activity containing the AddStructuralFeatureValueAction
+		Activity activity = UMLFactory.eINSTANCE.createActivity();
+		this.addStructuralFeatureValueAction = UMLFactory.eINSTANCE.createAddStructuralFeatureValueAction();
+		this.addStructuralFeatureValueAction.setStructuralFeature(port);
+		activity.getOwnedNodes().add(this.addStructuralFeatureValueAction);
+		
+		// Add the different elements to the model
+		this.umlTestModel.getPackagedElements().add(propertyClass);
+		this.umlTestModel.getPackagedElements().add(portClass);
+		this.umlTestModel.getPackagedElements().add(activity);
+		
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCallBehaviorActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCallBehaviorActionPinDerivation.java
index aad54cb1505..ce086a0a2e5 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCallBehaviorActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCallBehaviorActionPinDerivation.java
@@ -1,226 +1,226 @@
-/*****************************************************************************

- * 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:

- *   Jérémie TATIBOUET (CEA LIST) - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.Behavior;

-import org.eclipse.uml2.uml.CallBehaviorAction;

-import org.eclipse.uml2.uml.InputPin;

-import org.eclipse.uml2.uml.Parameter;

-import org.eclipse.uml2.uml.ParameterDirectionKind;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Test;

-

-public class TestCallBehaviorActionPinDerivation extends AbstractTestPinDerivation {

-

-	/**

-	 * CallBehaviorAction advice identifier

-	 */

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice";

-

-	/**

-	 * Function behavior specification N°1

-	 */

-	private Behavior behaviorSpecificationFirst;

-

-	/**

-	 * Function behavior specification N°2

-	 */

-	private Behavior behaviorSpecificationSecond;

-

-	/**

-	 * The action on which pin derivation is tested;

-	 */

-	private CallBehaviorAction callBehaviorAction;

-

-	/**

-	 * Constructor.

-	 */

-	public TestCallBehaviorActionPinDerivation() {

-		this.behaviorSpecificationFirst = null;

-		this.behaviorSpecificationSecond = null;

-		this.populateBaseTestModel();

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the CallBehaviorAction is available

-	 */

-	@Test

-	public void testAdviceForCallBehaviorActionExists() {

-		Assert.assertNotNull("CallBehaviorAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-	}

-

-	/**

-	 * Role:

-	 * - For a CallBehaviorAction having no behavior, ensure that if a behavior is referenced then the pins corresponding to the

-	 * the behavior signature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] CallBehaviorAction behavior feature is set with function behavior 'behaviorSpecificationFirst'

-	 * - 2] Synchronization is performed via the advice

-	 * - CallBehaviorAction has now 5 pins

-	 * - 2 inputs (p11, [in] p12)

-	 * - 3 outputs ([out] p12, P13, P14)

-	 */

-	@Test

-	public void testPinDerivation_NoBehavior_To_BehaviorWithParameters() {

-		SetRequest request = new SetRequest(this.editingDomain, this.callBehaviorAction, UMLPackage.eINSTANCE.getCallBehaviorAction_Behavior(), this.behaviorSpecificationFirst);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.callBehaviorAction);

-		ICommand editCallBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!editCallBehaviorActionCommand.canExecute()) {

-			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editCallBehaviorActionCommand));

-		Assert.assertTrue("The CallBehaviorAction shall have two input pins", this.callBehaviorAction.getArguments().size() == 2);

-		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.callBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));

-		Assert.assertTrue("The CallBehaviorAction shall have two output pins", this.callBehaviorAction.getResults().size() == 3);

-		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.callBehaviorAction.getResults(), this.behaviorSpecificationFirst.getOwnedParameters()));

-		if (!editCallBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-

-	/**

-	 * Role:

-	 * - For a CallBehaviorAction having already been synchronized with 'behaviorSpecificationFirst' signature, ensure that if the behavior

-	 * feature of the action evolves then pins are updated accordingly.

-	 * 

-	 * Scenario:

-	 * - 1] CallBehaviorAction behavior feature is set with function behavior 'behaviorSpecificationFirst'

-	 * - 2] Synchronization is performed via the advice

-	 * - CallBehaviorAction has now 5 pins

-	 * - 2 inputs (p11, [in] p12)

-	 * - 3 outputs ([out] p12, P13, P14)

-	 * - 3] CallBehaviorAction behavior feature is set with function behavior 'behaviorSpecificationSecond'

-	 * - 4] Synchronization is performed via the advice

-	 * - CallBehaviorAction has now 3 pins

-	 * - 2 inputs ([in] p21, p22)

-	 * - 1 output ([out] p21)

-	 * 

-	 * Note: along the synchronization process pin '[in] p12' is not deleted but updated with '[in P21]'. This was made possible

-	 * because of type conformance existing between the two pins

-	 */

-	@Test

-	public void testPinDerivation_BehaviorWithParameters_To_BehaviorWithParameters() {

-		// Prepare test model

-		SetRequest request = new SetRequest(this.editingDomain, this.callBehaviorAction, UMLPackage.eINSTANCE.getCallBehaviorAction_Behavior(), this.behaviorSpecificationFirst);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.callBehaviorAction);

-		ICommand firstEditCallBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!firstEditCallBehaviorActionCommand.canExecute()) {

-			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditCallBehaviorActionCommand));

-		InputPin preservedPin = this.callBehaviorAction.getArguments().get(1);

-		// Change behavior for 'behaviorSpecificationSecond'

-		request = new SetRequest(this.editingDomain, this.callBehaviorAction, UMLPackage.eINSTANCE.getCallBehaviorAction_Behavior(), this.behaviorSpecificationSecond);

-		ICommand secondEditCallBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!secondEditCallBehaviorActionCommand.canExecute()) {

-			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditCallBehaviorActionCommand));

-		Assert.assertTrue("The CallBehaviorAction shall have two input pins", this.callBehaviorAction.getArguments().size() == 2);

-		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.callBehaviorAction.getArguments(), this.behaviorSpecificationSecond.getOwnedParameters()));

-		Assert.assertTrue("This pin shall have been preserved during update", preservedPin == this.callBehaviorAction.getArguments().get(0));

-		Assert.assertTrue("The CallBehaviorAction shall have one output pins", this.callBehaviorAction.getResults().size() == 1);

-		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.callBehaviorAction.getResults(), this.behaviorSpecificationSecond.getOwnedParameters()));

-		if (!secondEditCallBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-		if (!firstEditCallBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#createBaseTestModel()

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-		// Define and attach the first behavior specification to the model

-		this.behaviorSpecificationFirst = UMLFactory.eINSTANCE.createFunctionBehavior();

-		Parameter p11 = UMLFactory.eINSTANCE.createParameter();

-		p11.setName("p11");

-		p11.setDirection(ParameterDirectionKind.IN_LITERAL);

-		p11.setLower(1);

-		p11.setUpper(1);

-		p11.setType(this.getPrimitiveType("UnlimitedNatural"));

-		Parameter p12 = UMLFactory.eINSTANCE.createParameter();

-		p12.setName("p12");

-		p12.setDirection(ParameterDirectionKind.INOUT_LITERAL);

-		p12.setLower(1);

-		p12.setUpper(1);

-		p12.setType(this.getPrimitiveType("String"));

-		Parameter p13 = UMLFactory.eINSTANCE.createParameter();

-		p13.setName("p13");

-		p13.setDirection(ParameterDirectionKind.OUT_LITERAL);

-		p13.setLower(1);

-		p13.setUpper(1);

-		p13.setType(this.getPrimitiveType("String"));

-		Parameter p14 = UMLFactory.eINSTANCE.createParameter();

-		p14.setName("p14");

-		p14.setDirection(ParameterDirectionKind.RETURN_LITERAL);

-		p14.setLower(1);

-		p14.setUpper(1);

-		p14.setType(this.getPrimitiveType("Boolean"));

-		this.behaviorSpecificationFirst.getOwnedParameters().add(p11);

-		this.behaviorSpecificationFirst.getOwnedParameters().add(p12);

-		this.behaviorSpecificationFirst.getOwnedParameters().add(p13);

-		this.behaviorSpecificationFirst.getOwnedParameters().add(p14);

-		// Define and attach the second behavior specification to the model

-		this.behaviorSpecificationSecond = UMLFactory.eINSTANCE.createFunctionBehavior();

-		Parameter p21 = UMLFactory.eINSTANCE.createParameter();

-		p21.setName("p21");

-		p21.setDirection(ParameterDirectionKind.INOUT_LITERAL);

-		p21.setLower(1);

-		p21.setUpper(1);

-		p21.setType(this.getPrimitiveType("String"));

-		Parameter p22 = UMLFactory.eINSTANCE.createParameter();

-		p22.setName("p22");

-		p22.setDirection(ParameterDirectionKind.IN_LITERAL);

-		p22.setLower(1);

-		p22.setUpper(1);

-		p22.setType(this.getPrimitiveType("Integer"));

-		this.behaviorSpecificationSecond.getOwnedParameters().add(p21);

-		this.behaviorSpecificationSecond.getOwnedParameters().add(p22);

-		// Add both behaviors in the model

-		this.umlTestModel.getPackagedElements().add(this.behaviorSpecificationFirst);

-		this.umlTestModel.getPackagedElements().add(this.behaviorSpecificationSecond);

-		// Add the activity which will contain the call behavior action

-		Activity activity = UMLFactory.eINSTANCE.createActivity();

-		this.callBehaviorAction = UMLFactory.eINSTANCE.createCallBehaviorAction();

-		activity.getNodes().add(this.callBehaviorAction);

-		this.umlTestModel.getPackagedElements().add(activity);

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *   Jérémie TATIBOUET (CEA LIST) - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.CallBehaviorAction;
+import org.eclipse.uml2.uml.InputPin;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestCallBehaviorActionPinDerivation extends AbstractTestPinDerivation {
+
+	/**
+	 * CallBehaviorAction advice identifier
+	 */
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice";
+
+	/**
+	 * Function behavior specification N°1
+	 */
+	private Behavior behaviorSpecificationFirst;
+
+	/**
+	 * Function behavior specification N°2
+	 */
+	private Behavior behaviorSpecificationSecond;
+
+	/**
+	 * The action on which pin derivation is tested;
+	 */
+	private CallBehaviorAction callBehaviorAction;
+
+	/**
+	 * Constructor.
+	 */
+	public TestCallBehaviorActionPinDerivation() {
+		this.behaviorSpecificationFirst = null;
+		this.behaviorSpecificationSecond = null;
+		this.populateBaseTestModel();
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the CallBehaviorAction is available
+	 */
+	@Test
+	public void testAdviceForCallBehaviorActionExists() {
+		Assert.assertNotNull("CallBehaviorAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+	}
+
+	/**
+	 * Role:
+	 * - For a CallBehaviorAction having no behavior, ensure that if a behavior is referenced then the pins corresponding to the
+	 * the behavior signature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] CallBehaviorAction behavior feature is set with function behavior 'behaviorSpecificationFirst'
+	 * - 2] Synchronization is performed via the advice
+	 * - CallBehaviorAction has now 5 pins
+	 * - 2 inputs (p11, [in] p12)
+	 * - 3 outputs ([out] p12, P13, P14)
+	 */
+	@Test
+	public void testPinDerivation_NoBehavior_To_BehaviorWithParameters() {
+		SetRequest request = new SetRequest(this.editingDomain, this.callBehaviorAction, UMLPackage.eINSTANCE.getCallBehaviorAction_Behavior(), this.behaviorSpecificationFirst);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.callBehaviorAction);
+		ICommand editCallBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!editCallBehaviorActionCommand.canExecute()) {
+			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editCallBehaviorActionCommand));
+		Assert.assertTrue("The CallBehaviorAction shall have two input pins", this.callBehaviorAction.getArguments().size() == 2);
+		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.callBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));
+		Assert.assertTrue("The CallBehaviorAction shall have two output pins", this.callBehaviorAction.getResults().size() == 3);
+		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.callBehaviorAction.getResults(), this.behaviorSpecificationFirst.getOwnedParameters()));
+		if (!editCallBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+
+	/**
+	 * Role:
+	 * - For a CallBehaviorAction having already been synchronized with 'behaviorSpecificationFirst' signature, ensure that if the behavior
+	 * feature of the action evolves then pins are updated accordingly.
+	 * 
+	 * Scenario:
+	 * - 1] CallBehaviorAction behavior feature is set with function behavior 'behaviorSpecificationFirst'
+	 * - 2] Synchronization is performed via the advice
+	 * - CallBehaviorAction has now 5 pins
+	 * - 2 inputs (p11, [in] p12)
+	 * - 3 outputs ([out] p12, P13, P14)
+	 * - 3] CallBehaviorAction behavior feature is set with function behavior 'behaviorSpecificationSecond'
+	 * - 4] Synchronization is performed via the advice
+	 * - CallBehaviorAction has now 3 pins
+	 * - 2 inputs ([in] p21, p22)
+	 * - 1 output ([out] p21)
+	 * 
+	 * Note: along the synchronization process pin '[in] p12' is not deleted but updated with '[in P21]'. This was made possible
+	 * because of type conformance existing between the two pins
+	 */
+	@Test
+	public void testPinDerivation_BehaviorWithParameters_To_BehaviorWithParameters() {
+		// Prepare test model
+		SetRequest request = new SetRequest(this.editingDomain, this.callBehaviorAction, UMLPackage.eINSTANCE.getCallBehaviorAction_Behavior(), this.behaviorSpecificationFirst);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.callBehaviorAction);
+		ICommand firstEditCallBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!firstEditCallBehaviorActionCommand.canExecute()) {
+			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditCallBehaviorActionCommand));
+		InputPin preservedPin = this.callBehaviorAction.getArguments().get(1);
+		// Change behavior for 'behaviorSpecificationSecond'
+		request = new SetRequest(this.editingDomain, this.callBehaviorAction, UMLPackage.eINSTANCE.getCallBehaviorAction_Behavior(), this.behaviorSpecificationSecond);
+		ICommand secondEditCallBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!secondEditCallBehaviorActionCommand.canExecute()) {
+			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditCallBehaviorActionCommand));
+		Assert.assertTrue("The CallBehaviorAction shall have two input pins", this.callBehaviorAction.getArguments().size() == 2);
+		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.callBehaviorAction.getArguments(), this.behaviorSpecificationSecond.getOwnedParameters()));
+		Assert.assertTrue("This pin shall have been preserved during update", preservedPin == this.callBehaviorAction.getArguments().get(0));
+		Assert.assertTrue("The CallBehaviorAction shall have one output pins", this.callBehaviorAction.getResults().size() == 1);
+		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.callBehaviorAction.getResults(), this.behaviorSpecificationSecond.getOwnedParameters()));
+		if (!secondEditCallBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+		if (!firstEditCallBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#createBaseTestModel()
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+		// Define and attach the first behavior specification to the model
+		this.behaviorSpecificationFirst = UMLFactory.eINSTANCE.createFunctionBehavior();
+		Parameter p11 = UMLFactory.eINSTANCE.createParameter();
+		p11.setName("p11");
+		p11.setDirection(ParameterDirectionKind.IN_LITERAL);
+		p11.setLower(1);
+		p11.setUpper(1);
+		p11.setType(this.getPrimitiveType("UnlimitedNatural"));
+		Parameter p12 = UMLFactory.eINSTANCE.createParameter();
+		p12.setName("p12");
+		p12.setDirection(ParameterDirectionKind.INOUT_LITERAL);
+		p12.setLower(1);
+		p12.setUpper(1);
+		p12.setType(this.getPrimitiveType("String"));
+		Parameter p13 = UMLFactory.eINSTANCE.createParameter();
+		p13.setName("p13");
+		p13.setDirection(ParameterDirectionKind.OUT_LITERAL);
+		p13.setLower(1);
+		p13.setUpper(1);
+		p13.setType(this.getPrimitiveType("String"));
+		Parameter p14 = UMLFactory.eINSTANCE.createParameter();
+		p14.setName("p14");
+		p14.setDirection(ParameterDirectionKind.RETURN_LITERAL);
+		p14.setLower(1);
+		p14.setUpper(1);
+		p14.setType(this.getPrimitiveType("Boolean"));
+		this.behaviorSpecificationFirst.getOwnedParameters().add(p11);
+		this.behaviorSpecificationFirst.getOwnedParameters().add(p12);
+		this.behaviorSpecificationFirst.getOwnedParameters().add(p13);
+		this.behaviorSpecificationFirst.getOwnedParameters().add(p14);
+		// Define and attach the second behavior specification to the model
+		this.behaviorSpecificationSecond = UMLFactory.eINSTANCE.createFunctionBehavior();
+		Parameter p21 = UMLFactory.eINSTANCE.createParameter();
+		p21.setName("p21");
+		p21.setDirection(ParameterDirectionKind.INOUT_LITERAL);
+		p21.setLower(1);
+		p21.setUpper(1);
+		p21.setType(this.getPrimitiveType("String"));
+		Parameter p22 = UMLFactory.eINSTANCE.createParameter();
+		p22.setName("p22");
+		p22.setDirection(ParameterDirectionKind.IN_LITERAL);
+		p22.setLower(1);
+		p22.setUpper(1);
+		p22.setType(this.getPrimitiveType("Integer"));
+		this.behaviorSpecificationSecond.getOwnedParameters().add(p21);
+		this.behaviorSpecificationSecond.getOwnedParameters().add(p22);
+		// Add both behaviors in the model
+		this.umlTestModel.getPackagedElements().add(this.behaviorSpecificationFirst);
+		this.umlTestModel.getPackagedElements().add(this.behaviorSpecificationSecond);
+		// Add the activity which will contain the call behavior action
+		Activity activity = UMLFactory.eINSTANCE.createActivity();
+		this.callBehaviorAction = UMLFactory.eINSTANCE.createCallBehaviorAction();
+		activity.getNodes().add(this.callBehaviorAction);
+		this.umlTestModel.getPackagedElements().add(activity);
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCallOperationActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCallOperationActionPinDerivation.java
index 79757fcf6dd..6567cb3c150 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCallOperationActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCallOperationActionPinDerivation.java
@@ -1,241 +1,241 @@
-/*****************************************************************************

- * 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:

- *   Jérémie TATIBOUET (CEA LIST) - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.CallOperationAction;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.Parameter;

-import org.eclipse.uml2.uml.ParameterDirectionKind;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Test;

-

-public class TestCallOperationActionPinDerivation extends AbstractTestPinDerivation {

-

-	/**

-	 * CallBehaviorAction advice identifier

-	 */

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice";

-

-	/**

-	 * Operation signature N°1

-	 */

-	private Operation operationSignatureFirst;

-

-	/**

-	 * Operation signature N°2

-	 */

-	private Operation operationSignatureSecond;

-

-	/**

-	 * The action on which pin derivation is tested

-	 */

-	private CallOperationAction callOperationAction;

-

-	/**

-	 * Constructor.

-	 */

-	public TestCallOperationActionPinDerivation() {

-		this.operationSignatureFirst = null;

-		this.operationSignatureSecond = null;

-		this.populateBaseTestModel();

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the CallOperationAction is available

-	 */

-	@Test

-	public void testAdviceForCallOperationActionExists() {

-		Assert.assertNotNull("CallOperationAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-	}

-

-	/**

-	 * Role:

-	 * - For a CallOperationAction having no behavior, ensure that if an operation is referenced then the pins corresponding to the

-	 * the operation signature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] CallOperationAction 'operation' feature is set with operation 'operationSignatureFirst'

-	 * - 2] Synchronization is performed via the advice

-	 * - CallOperationAction has now 4 pins

-	 * - 1 target (typed by C)

-	 * - 2 inputs ([in] p21, p22)

-	 * - 1 output ([out] p21)

-	 */

-	@Test

-	public void testPinDerivation_NoOperation_To_OperationWithParameters() {

-		SetRequest request = new SetRequest(this.editingDomain, this.callOperationAction, UMLPackage.eINSTANCE.getCallOperationAction_Operation(), this.operationSignatureFirst);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.callOperationAction);

-		ICommand editCallOperationActionCommand = elementEditService.getEditCommand(request);

-		if (!editCallOperationActionCommand.canExecute()) {

-			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editCallOperationActionCommand));

-		// Assert target

-		Assert.assertTrue("CallOperationAction shall have a target", this.callOperationAction.getTarget() != null);

-		Assert.assertTrue("CallOperationAction shall have a target and this target shall have a type", this.callOperationAction.getTarget().getType() != null);

-		// Assert argument pins

-		Assert.assertTrue("CallOperationAction shall have two input pins", this.callOperationAction.getArguments().size() == 2);

-		Assert.assertTrue("CallOperationAction arguments pins shall be cohesive with operation parameters",

-				PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.callOperationAction.getArguments(), this.operationSignatureFirst.getOwnedParameters()));

-		// Assert result pins

-		Assert.assertTrue("CallOperationAction shall have one result pin", this.callOperationAction.getResults().size() == 1);

-		Assert.assertTrue("CallOperation result pins shall be cohesive with operation parameters", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.callOperationAction.getResults(), this.operationSignatureFirst.getOwnedParameters()));

-		if (!editCallOperationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a CallOperationAction having already been synchronized with 'operationSignatureFirst' signature, ensure that if the 'operation'

-	 * feature of the action evolves then pins are updated accordingly.

-	 * 

-	 * Scenario:

-	 * - 1] CallOperationAction 'operation' feature is set with operation 'operationSignatureFirst'

-	 * - 2] Synchronization is performed via the advice

-	 * - CallOperationAction has now 4 pins

-	 * - 1 target (typed by C)

-	 * - 2 inputs ([in] p21, p22)

-	 * - 1 output ([out] p21)

-	 * - 3] CallOperationAction 'operation' feature is set with operation 'operationSignatureSecond'

-	 * - 4] Synchronization is performed via the advice

-	 * - CallOperationAction has now 6 pins

-	 * - 1 target (typed by C)

-	 * - 2 inputs (p11, [in] p12)

-	 * - 3 outputs ([out] p12, p13, P14)

-	 */

-	@Test

-	public void testPinDerivation_OperationWithParameters_To_OperationWithParameters() {

-		// Initial modification of the model

-		SetRequest request = new SetRequest(this.editingDomain, this.callOperationAction, UMLPackage.eINSTANCE.getCallOperationAction_Operation(), this.operationSignatureFirst);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.callOperationAction);

-		ICommand firstEditCallOperationActionCommand = elementEditService.getEditCommand(request);

-		if (!firstEditCallOperationActionCommand.canExecute()) {

-			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditCallOperationActionCommand));

-		// Set the 'operation' feature with another Operation

-		request = new SetRequest(this.editingDomain, this.callOperationAction, UMLPackage.eINSTANCE.getCallOperationAction_Operation(), this.operationSignatureSecond);

-		ICommand secondEditCallOperationActionCommand = elementEditService.getEditCommand(request);

-		if (!secondEditCallOperationActionCommand.canExecute()) {

-			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditCallOperationActionCommand));

-		// Assert target

-		Assert.assertTrue("CallOperationAction shall have a target", this.callOperationAction.getTarget() != null);

-		Assert.assertTrue("CallOperationAction shall have a target and this target shall have a type", this.callOperationAction.getTarget().getType() != null);

-		// Assert argument pins

-		Assert.assertTrue("CallOperationAction shall have three input pins", this.callOperationAction.getArguments().size() == 2);

-		Assert.assertTrue("CallOperationAction arguments pins shall be cohesive with operation parameters",

-				PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.callOperationAction.getArguments(), this.operationSignatureSecond.getOwnedParameters()));

-		// Assert result pins

-		Assert.assertTrue("CallOperationAction shall have one result pin", this.callOperationAction.getResults().size() == 3);

-		Assert.assertTrue("CallOperation result pins shall be cohesive with operation parameters", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.callOperationAction.getResults(), this.operationSignatureSecond.getOwnedParameters()));

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditCallOperationActionCommand));

-		if (!secondEditCallOperationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-		if (!firstEditCallOperationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-		// Create first operation signature

-		this.operationSignatureFirst = UMLFactory.eINSTANCE.createOperation();

-		Parameter p21 = UMLFactory.eINSTANCE.createParameter();

-		p21.setName("p21");

-		p21.setDirection(ParameterDirectionKind.INOUT_LITERAL);

-		p21.setLower(1);

-		p21.setUpper(1);

-		p21.setType(this.getPrimitiveType("String"));

-		Parameter p22 = UMLFactory.eINSTANCE.createParameter();

-		p22.setName("p22");

-		p22.setDirection(ParameterDirectionKind.IN_LITERAL);

-		p22.setLower(1);

-		p22.setUpper(1);

-		p22.setType(this.getPrimitiveType("Integer"));

-		this.operationSignatureFirst.getOwnedParameters().add(p21);

-		this.operationSignatureFirst.getOwnedParameters().add(p22);

-		// Create second operation signature

-		this.operationSignatureSecond = UMLFactory.eINSTANCE.createOperation();

-		Parameter p11 = UMLFactory.eINSTANCE.createParameter();

-		p11.setName("p11");

-		p11.setDirection(ParameterDirectionKind.IN_LITERAL);

-		p11.setLower(1);

-		p11.setUpper(1);

-		p11.setType(this.getPrimitiveType("UnlimitedNatural"));

-		Parameter p12 = UMLFactory.eINSTANCE.createParameter();

-		p12.setName("p12");

-		p12.setDirection(ParameterDirectionKind.INOUT_LITERAL);

-		p12.setLower(1);

-		p12.setUpper(1);

-		p12.setType(this.getPrimitiveType("String"));

-		Parameter p13 = UMLFactory.eINSTANCE.createParameter();

-		p13.setName("p13");

-		p13.setDirection(ParameterDirectionKind.OUT_LITERAL);

-		p13.setLower(1);

-		p13.setUpper(1);

-		p13.setType(this.getPrimitiveType("String"));

-		Parameter p14 = UMLFactory.eINSTANCE.createParameter();

-		p14.setName("p14");

-		p14.setDirection(ParameterDirectionKind.RETURN_LITERAL);

-		p14.setLower(1);

-		p14.setUpper(1);

-		p14.setType(this.getPrimitiveType("Boolean"));

-		this.operationSignatureSecond.getOwnedParameters().add(p11);

-		this.operationSignatureSecond.getOwnedParameters().add(p12);

-		this.operationSignatureSecond.getOwnedParameters().add(p13);

-		this.operationSignatureSecond.getOwnedParameters().add(p14);

-		// Create class containing operation

-		Class class_ = UMLFactory.eINSTANCE.createClass();

-		class_.setName("C");

-		class_.getOwnedOperations().add(this.operationSignatureFirst);

-		class_.getOwnedOperations().add(this.operationSignatureSecond);

-		// Create activity containing the call operation action

-		Activity activity = UMLFactory.eINSTANCE.createActivity();

-		this.callOperationAction = UMLFactory.eINSTANCE.createCallOperationAction();

-		activity.getOwnedNodes().add(this.callOperationAction);

-		// Add the different elements in the model

-		this.umlTestModel.getPackagedElements().add(class_);

-		this.umlTestModel.getPackagedElements().add(activity);

-		// Add test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *   Jérémie TATIBOUET (CEA LIST) - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.CallOperationAction;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestCallOperationActionPinDerivation extends AbstractTestPinDerivation {
+
+	/**
+	 * CallBehaviorAction advice identifier
+	 */
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice";
+
+	/**
+	 * Operation signature N°1
+	 */
+	private Operation operationSignatureFirst;
+
+	/**
+	 * Operation signature N°2
+	 */
+	private Operation operationSignatureSecond;
+
+	/**
+	 * The action on which pin derivation is tested
+	 */
+	private CallOperationAction callOperationAction;
+
+	/**
+	 * Constructor.
+	 */
+	public TestCallOperationActionPinDerivation() {
+		this.operationSignatureFirst = null;
+		this.operationSignatureSecond = null;
+		this.populateBaseTestModel();
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the CallOperationAction is available
+	 */
+	@Test
+	public void testAdviceForCallOperationActionExists() {
+		Assert.assertNotNull("CallOperationAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+	}
+
+	/**
+	 * Role:
+	 * - For a CallOperationAction having no behavior, ensure that if an operation is referenced then the pins corresponding to the
+	 * the operation signature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] CallOperationAction 'operation' feature is set with operation 'operationSignatureFirst'
+	 * - 2] Synchronization is performed via the advice
+	 * - CallOperationAction has now 4 pins
+	 * - 1 target (typed by C)
+	 * - 2 inputs ([in] p21, p22)
+	 * - 1 output ([out] p21)
+	 */
+	@Test
+	public void testPinDerivation_NoOperation_To_OperationWithParameters() {
+		SetRequest request = new SetRequest(this.editingDomain, this.callOperationAction, UMLPackage.eINSTANCE.getCallOperationAction_Operation(), this.operationSignatureFirst);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.callOperationAction);
+		ICommand editCallOperationActionCommand = elementEditService.getEditCommand(request);
+		if (!editCallOperationActionCommand.canExecute()) {
+			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editCallOperationActionCommand));
+		// Assert target
+		Assert.assertTrue("CallOperationAction shall have a target", this.callOperationAction.getTarget() != null);
+		Assert.assertTrue("CallOperationAction shall have a target and this target shall have a type", this.callOperationAction.getTarget().getType() != null);
+		// Assert argument pins
+		Assert.assertTrue("CallOperationAction shall have two input pins", this.callOperationAction.getArguments().size() == 2);
+		Assert.assertTrue("CallOperationAction arguments pins shall be cohesive with operation parameters",
+				PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.callOperationAction.getArguments(), this.operationSignatureFirst.getOwnedParameters()));
+		// Assert result pins
+		Assert.assertTrue("CallOperationAction shall have one result pin", this.callOperationAction.getResults().size() == 1);
+		Assert.assertTrue("CallOperation result pins shall be cohesive with operation parameters", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.callOperationAction.getResults(), this.operationSignatureFirst.getOwnedParameters()));
+		if (!editCallOperationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a CallOperationAction having already been synchronized with 'operationSignatureFirst' signature, ensure that if the 'operation'
+	 * feature of the action evolves then pins are updated accordingly.
+	 * 
+	 * Scenario:
+	 * - 1] CallOperationAction 'operation' feature is set with operation 'operationSignatureFirst'
+	 * - 2] Synchronization is performed via the advice
+	 * - CallOperationAction has now 4 pins
+	 * - 1 target (typed by C)
+	 * - 2 inputs ([in] p21, p22)
+	 * - 1 output ([out] p21)
+	 * - 3] CallOperationAction 'operation' feature is set with operation 'operationSignatureSecond'
+	 * - 4] Synchronization is performed via the advice
+	 * - CallOperationAction has now 6 pins
+	 * - 1 target (typed by C)
+	 * - 2 inputs (p11, [in] p12)
+	 * - 3 outputs ([out] p12, p13, P14)
+	 */
+	@Test
+	public void testPinDerivation_OperationWithParameters_To_OperationWithParameters() {
+		// Initial modification of the model
+		SetRequest request = new SetRequest(this.editingDomain, this.callOperationAction, UMLPackage.eINSTANCE.getCallOperationAction_Operation(), this.operationSignatureFirst);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.callOperationAction);
+		ICommand firstEditCallOperationActionCommand = elementEditService.getEditCommand(request);
+		if (!firstEditCallOperationActionCommand.canExecute()) {
+			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditCallOperationActionCommand));
+		// Set the 'operation' feature with another Operation
+		request = new SetRequest(this.editingDomain, this.callOperationAction, UMLPackage.eINSTANCE.getCallOperationAction_Operation(), this.operationSignatureSecond);
+		ICommand secondEditCallOperationActionCommand = elementEditService.getEditCommand(request);
+		if (!secondEditCallOperationActionCommand.canExecute()) {
+			Assert.fail("The CallBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditCallOperationActionCommand));
+		// Assert target
+		Assert.assertTrue("CallOperationAction shall have a target", this.callOperationAction.getTarget() != null);
+		Assert.assertTrue("CallOperationAction shall have a target and this target shall have a type", this.callOperationAction.getTarget().getType() != null);
+		// Assert argument pins
+		Assert.assertTrue("CallOperationAction shall have three input pins", this.callOperationAction.getArguments().size() == 2);
+		Assert.assertTrue("CallOperationAction arguments pins shall be cohesive with operation parameters",
+				PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.callOperationAction.getArguments(), this.operationSignatureSecond.getOwnedParameters()));
+		// Assert result pins
+		Assert.assertTrue("CallOperationAction shall have one result pin", this.callOperationAction.getResults().size() == 3);
+		Assert.assertTrue("CallOperation result pins shall be cohesive with operation parameters", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.callOperationAction.getResults(), this.operationSignatureSecond.getOwnedParameters()));
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditCallOperationActionCommand));
+		if (!secondEditCallOperationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+		if (!firstEditCallOperationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+		// Create first operation signature
+		this.operationSignatureFirst = UMLFactory.eINSTANCE.createOperation();
+		Parameter p21 = UMLFactory.eINSTANCE.createParameter();
+		p21.setName("p21");
+		p21.setDirection(ParameterDirectionKind.INOUT_LITERAL);
+		p21.setLower(1);
+		p21.setUpper(1);
+		p21.setType(this.getPrimitiveType("String"));
+		Parameter p22 = UMLFactory.eINSTANCE.createParameter();
+		p22.setName("p22");
+		p22.setDirection(ParameterDirectionKind.IN_LITERAL);
+		p22.setLower(1);
+		p22.setUpper(1);
+		p22.setType(this.getPrimitiveType("Integer"));
+		this.operationSignatureFirst.getOwnedParameters().add(p21);
+		this.operationSignatureFirst.getOwnedParameters().add(p22);
+		// Create second operation signature
+		this.operationSignatureSecond = UMLFactory.eINSTANCE.createOperation();
+		Parameter p11 = UMLFactory.eINSTANCE.createParameter();
+		p11.setName("p11");
+		p11.setDirection(ParameterDirectionKind.IN_LITERAL);
+		p11.setLower(1);
+		p11.setUpper(1);
+		p11.setType(this.getPrimitiveType("UnlimitedNatural"));
+		Parameter p12 = UMLFactory.eINSTANCE.createParameter();
+		p12.setName("p12");
+		p12.setDirection(ParameterDirectionKind.INOUT_LITERAL);
+		p12.setLower(1);
+		p12.setUpper(1);
+		p12.setType(this.getPrimitiveType("String"));
+		Parameter p13 = UMLFactory.eINSTANCE.createParameter();
+		p13.setName("p13");
+		p13.setDirection(ParameterDirectionKind.OUT_LITERAL);
+		p13.setLower(1);
+		p13.setUpper(1);
+		p13.setType(this.getPrimitiveType("String"));
+		Parameter p14 = UMLFactory.eINSTANCE.createParameter();
+		p14.setName("p14");
+		p14.setDirection(ParameterDirectionKind.RETURN_LITERAL);
+		p14.setLower(1);
+		p14.setUpper(1);
+		p14.setType(this.getPrimitiveType("Boolean"));
+		this.operationSignatureSecond.getOwnedParameters().add(p11);
+		this.operationSignatureSecond.getOwnedParameters().add(p12);
+		this.operationSignatureSecond.getOwnedParameters().add(p13);
+		this.operationSignatureSecond.getOwnedParameters().add(p14);
+		// Create class containing operation
+		Class class_ = UMLFactory.eINSTANCE.createClass();
+		class_.setName("C");
+		class_.getOwnedOperations().add(this.operationSignatureFirst);
+		class_.getOwnedOperations().add(this.operationSignatureSecond);
+		// Create activity containing the call operation action
+		Activity activity = UMLFactory.eINSTANCE.createActivity();
+		this.callOperationAction = UMLFactory.eINSTANCE.createCallOperationAction();
+		activity.getOwnedNodes().add(this.callOperationAction);
+		// Add the different elements in the model
+		this.umlTestModel.getPackagedElements().add(class_);
+		this.umlTestModel.getPackagedElements().add(activity);
+		// Add test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCreateObjectActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCreateObjectActionPinDerivation.java
index 87bb57a6087..7ce88178c32 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCreateObjectActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestCreateObjectActionPinDerivation.java
@@ -1,172 +1,172 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.CreateObjectAction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * 

- * Pins of CreateObjectAction should be create and update automatically

- * 

- */

-public class TestCreateObjectActionPinDerivation extends AbstractTestPinDerivation {

-

-	/**

-	 * CallBehaviorAction advice identifier

-	 */

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateObjectActionEditHelperAdvice";

-

-	/**

-	 * SendSignalAction on which pin derivation is tested

-	 */

-	private CreateObjectAction createObjectAction;

-

-	private Class classClassifier;

-

-	private Activity activityClassifier;

-

-	/**

-	 * Constructor.

-	 */

-	public TestCreateObjectActionPinDerivation() {

-		this.classClassifier = null;

-		this.activityClassifier = null;

-		this.populateBaseTestModel();

-		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION

-		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();

-		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.CREATE_OBJECT_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the CreateObjectAction is available

-	 */

-	@Test

-	public void testAdviceForCreateObjectActionExists() {

-		Assert.assertNotNull("createObjectAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-	}

-

-	/**

-	 * Role:

-	 * - For a CreateObjectAction having no referenced classifier, ensure that if a class gets referenced then pins

-	 * are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] CreateObjectAction 'classifier' feature is set with the 'classClassifier'

-	 * - 2] Synchronization is performed via the advice

-	 * - SendSignalAction has now 1 pin

-	 * - 1 result type by classClassifier

-	 */

-	@Test

-	public void testPinDerivation_NoClassifier_ToClassClassifier() {

-		SetRequest request = new SetRequest(this.editingDomain, this.createObjectAction, UMLPackage.eINSTANCE.getCreateObjectAction_Classifier(), this.classClassifier);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.createObjectAction);

-		ICommand editCreateObjectActionCommand = elementEditService.getEditCommand(request);

-		if (!editCreateObjectActionCommand.canExecute()) {

-			Assert.fail("The CreateObjectAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editCreateObjectActionCommand));

-

-		// Assert target derivation

-		Assert.assertTrue("CreateObjectAction shall have a result pin", this.createObjectAction.getResult() != null);

-		Assert.assertTrue("CreateObjectAction shall have a result pin typed by classClassifier", this.createObjectAction.getResult().getType() == classClassifier);

-

-		if (!editCreateObjectActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a CreateObjectAction having no referenced classifier, ensure that if a activity gets referenced then pins

-	 * are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] CreateObjectAction 'classifier' feature is set with the 'activityClassifier'

-	 * - 2] Synchronization is performed via the advice

-	 * - SendSignalAction has now 1 pin

-	 * - 1 result type by activityClassifier

-	 */

-	@Test

-	public void testPinDerivation_NoClassifier_ToActivityClassifier() {

-		SetRequest request = new SetRequest(this.editingDomain, this.createObjectAction, UMLPackage.eINSTANCE.getCreateObjectAction_Classifier(), this.activityClassifier);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.createObjectAction);

-		ICommand editCreateObjectActionCommand = elementEditService.getEditCommand(request);

-		if (!editCreateObjectActionCommand.canExecute()) {

-			Assert.fail("The CreateObjectAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editCreateObjectActionCommand));

-

-		// Assert target derivation

-		Assert.assertTrue("CreateObjectAction shall have a result pin", this.createObjectAction.getResult() != null);

-		Assert.assertTrue("CreateObjectAction shall have a result pin typed by activityClassifer", this.createObjectAction.getResult().getType() == activityClassifier);

-

-		if (!editCreateObjectActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-

-		// Create classClassifier

-		this.classClassifier = UMLFactory.eINSTANCE.createClass();

-		classClassifier.setName("C");

-

-		// Create class

-		this.activityClassifier = UMLFactory.eINSTANCE.createActivity();

-		activityClassifier.setName("A");

-

-		// Create the activity containing the create object action

-		Activity activity = UMLFactory.eINSTANCE.createActivity();

-		this.createObjectAction = UMLFactory.eINSTANCE.createCreateObjectAction();

-		activity.getOwnedNodes().add(this.createObjectAction);

-

-		// Add the different elements to the model

-		this.umlTestModel.getPackagedElements().add(activity);

-		this.umlTestModel.getPackagedElements().add(this.classClassifier);

-		this.umlTestModel.getPackagedElements().add(this.activityClassifier);

-

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.CreateObjectAction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * Pins of CreateObjectAction should be create and update automatically
+ * 
+ */
+public class TestCreateObjectActionPinDerivation extends AbstractTestPinDerivation {
+
+	/**
+	 * CallBehaviorAction advice identifier
+	 */
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateObjectActionEditHelperAdvice";
+
+	/**
+	 * SendSignalAction on which pin derivation is tested
+	 */
+	private CreateObjectAction createObjectAction;
+
+	private Class classClassifier;
+
+	private Activity activityClassifier;
+
+	/**
+	 * Constructor.
+	 */
+	public TestCreateObjectActionPinDerivation() {
+		this.classClassifier = null;
+		this.activityClassifier = null;
+		this.populateBaseTestModel();
+		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION
+		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
+		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.CREATE_OBJECT_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the CreateObjectAction is available
+	 */
+	@Test
+	public void testAdviceForCreateObjectActionExists() {
+		Assert.assertNotNull("createObjectAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+	}
+
+	/**
+	 * Role:
+	 * - For a CreateObjectAction having no referenced classifier, ensure that if a class gets referenced then pins
+	 * are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] CreateObjectAction 'classifier' feature is set with the 'classClassifier'
+	 * - 2] Synchronization is performed via the advice
+	 * - SendSignalAction has now 1 pin
+	 * - 1 result type by classClassifier
+	 */
+	@Test
+	public void testPinDerivation_NoClassifier_ToClassClassifier() {
+		SetRequest request = new SetRequest(this.editingDomain, this.createObjectAction, UMLPackage.eINSTANCE.getCreateObjectAction_Classifier(), this.classClassifier);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.createObjectAction);
+		ICommand editCreateObjectActionCommand = elementEditService.getEditCommand(request);
+		if (!editCreateObjectActionCommand.canExecute()) {
+			Assert.fail("The CreateObjectAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editCreateObjectActionCommand));
+
+		// Assert target derivation
+		Assert.assertTrue("CreateObjectAction shall have a result pin", this.createObjectAction.getResult() != null);
+		Assert.assertTrue("CreateObjectAction shall have a result pin typed by classClassifier", this.createObjectAction.getResult().getType() == classClassifier);
+
+		if (!editCreateObjectActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a CreateObjectAction having no referenced classifier, ensure that if a activity gets referenced then pins
+	 * are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] CreateObjectAction 'classifier' feature is set with the 'activityClassifier'
+	 * - 2] Synchronization is performed via the advice
+	 * - SendSignalAction has now 1 pin
+	 * - 1 result type by activityClassifier
+	 */
+	@Test
+	public void testPinDerivation_NoClassifier_ToActivityClassifier() {
+		SetRequest request = new SetRequest(this.editingDomain, this.createObjectAction, UMLPackage.eINSTANCE.getCreateObjectAction_Classifier(), this.activityClassifier);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.createObjectAction);
+		ICommand editCreateObjectActionCommand = elementEditService.getEditCommand(request);
+		if (!editCreateObjectActionCommand.canExecute()) {
+			Assert.fail("The CreateObjectAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editCreateObjectActionCommand));
+
+		// Assert target derivation
+		Assert.assertTrue("CreateObjectAction shall have a result pin", this.createObjectAction.getResult() != null);
+		Assert.assertTrue("CreateObjectAction shall have a result pin typed by activityClassifer", this.createObjectAction.getResult().getType() == activityClassifier);
+
+		if (!editCreateObjectActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+
+		// Create classClassifier
+		this.classClassifier = UMLFactory.eINSTANCE.createClass();
+		classClassifier.setName("C");
+
+		// Create class
+		this.activityClassifier = UMLFactory.eINSTANCE.createActivity();
+		activityClassifier.setName("A");
+
+		// Create the activity containing the create object action
+		Activity activity = UMLFactory.eINSTANCE.createActivity();
+		this.createObjectAction = UMLFactory.eINSTANCE.createCreateObjectAction();
+		activity.getOwnedNodes().add(this.createObjectAction);
+
+		// Add the different elements to the model
+		this.umlTestModel.getPackagedElements().add(activity);
+		this.umlTestModel.getPackagedElements().add(this.classClassifier);
+		this.umlTestModel.getPackagedElements().add(this.activityClassifier);
+
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestReadSelfActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestReadSelfActionPinDerivation.java
index a2284967f06..030c5db7be6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestReadSelfActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestReadSelfActionPinDerivation.java
@@ -1,307 +1,307 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ReadSelfActionEditPart;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;

-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.ReadSelfAction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * 

- * Pin of ReadSelfAction should be create and update automatically

- * 

- */

-public class TestReadSelfActionPinDerivation extends AbstractTestPinDerivation {

-

-	/**

-	 * CallBehaviorAction advice identifier

-	 */

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadSelfActionEditHelperAdvice";

-

-	private Class classA;

-

-	private Class classB;

-

-	private Class classC;

-

-	private Activity activityA_SpecifiedOperation;

-

-	private Activity activityB_ownedBehavior;

-

-	private Activity activityB_nestedClassifier;

-

-	private Activity activityC_classiferBahaviour;

-

-	private Activity activityD_InRootElement;

-

-	private ReadSelfAction readSelfActionA;

-

-	private ReadSelfAction readSelfActionB1;

-

-	private ReadSelfAction readSelfActionB2;

-

-	private ReadSelfAction readSelfActionC;

-

-	private ReadSelfAction readSelfActionD;

-

-	/**

-	 * Constructor.

-	 */

-	public TestReadSelfActionPinDerivation() {

-		this.populateBaseTestModel();

-		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION

-		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();

-		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.READ_SELF_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the ReadSelfAction is available

-	 */

-	@Test

-	public void testAdviceForReadSelfActionExists() {

-		Assert.assertNotNull("ReadSelfAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-	}

-

-	/**

-	 * Role:

-	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 

-	 * ActivityA is owned by the rootElement

-	 * ActivityA specified an operation of the classA

-	 * 

-	 * Scenario:

-	 * - 1] ReadSelfAction is add to the activity

-	 * - 2] Synchronization is performed via the advice

-	 * - ReadSelfAction has now 1 pin

-	 * - 1 result typed by the activity

-	 */

-	@Test

-	public void testPinDerivation_ActivitySpecifiedOperation() {

-		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionA, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionA);

-		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);

-		if (!editReadSelfActionCommand.canExecute()) {

-			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));

-		

-		// Assert result

-		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionA.getResult() != null);

-		Assert.assertTrue("ReadSelfAction shall have a result pin typed by classA", this.readSelfActionA.getResult().getType() == null);

-

-		if (!editReadSelfActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 

-	 * ActivityB is an ownedBehavior of the classB

-	 * 

-	 * Scenario:

-	 * - 1] ReadSelfAction is add to the activity

-	 * - 2] Synchronization is performed via the advice

-	 * - ReadSelfAction has now 1 pin

-	 * - 1 result typed by classB

-	 */

-	@Test

-	public void testPinDerivation_ActivityOwnedBeahaviour() {

-		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionB1, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionB1);

-		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);

-		if (!editReadSelfActionCommand.canExecute()) {

-			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));

-		

-		// Assert result

-		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionB1.getResult() != null);

-		Assert.assertTrue("ReadSelfAction shall have a result pin typed by classB", this.readSelfActionB1.getResult().getType() == classB);

-

-		if (!editReadSelfActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 

-	 * ActivityB is an nestedClassifier of the classB

-	 * 

-	 * Scenario:

-	 * - 1] ReadSelfAction is add to the activity

-	 * - 2] Synchronization is performed via the advice

-	 * - ReadSelfAction has now 1 pin

-	 * - 1 result typed by activityB_nestedClassifer

-	 */

-	@Test

-	public void testPinDerivation_ActivityNestedClassifer() {

-		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionB2, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionB2);

-		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);

-		if (!editReadSelfActionCommand.canExecute()) {

-			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));

-		

-		// Assert result

-		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionB2.getResult() != null);

-		Assert.assertTrue("ReadSelfAction shall have a result pin typed by classB", this.readSelfActionB2.getResult().getType() == null);

-

-		if (!editReadSelfActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 

-	 * ActivityC is owned by classC

-	 * ActivityC is classifierBehaviour of classC

-	 * 

-	 * Scenario:

-	 * - 1] ReadSelfAction is add to the activity

-	 * - 2] Synchronization is performed via the advice

-	 * - ReadSelfAction has now 1 pin

-	 * - 1 result typed by classC

-	 */

-	@Test

-	public void testPinDerivation_ActivityAsClassifierBehaviour() {

-		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionC, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionC);

-		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);

-		if (!editReadSelfActionCommand.canExecute()) {

-			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));

-		

-		// Assert result

-		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionC.getResult() != null);

-		Assert.assertTrue("ReadSelfAction shall have a result pin typed by classB", this.readSelfActionC.getResult().getType() == classC);

-

-		if (!editReadSelfActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 

-	 * ActivityC is owned by the rootElement

-	 * 

-	 * Scenario:

-	 * - 1] ReadSelfAction is add to the activity

-	 * - 2] Synchronization is performed via the advice

-	 * - ReadSelfAction has now 1 pin

-	 * - 1 result typed by activityD

-	 */

-	@Test

-	public void testPinDerivation_ActivityInRootElement() {

-		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionD, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionD);

-		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);

-		if (!editReadSelfActionCommand.canExecute()) {

-			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));

-		

-		// Assert result

-		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionD.getResult() != null);

-		Assert.assertTrue("ReadSelfAction shall have a result pin not typed", this.readSelfActionD.getResult().getType() == null);

-

-		if (!editReadSelfActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-		

-		// Create Activity A => specification

-		this.readSelfActionA = UMLFactory.eINSTANCE.createReadSelfAction();

-		classA = UMLFactory.eINSTANCE.createClass();

-		classA.setName("a");

-		classA.getOwnedOperations().add(UMLFactory.eINSTANCE.createOperation());

-		activityA_SpecifiedOperation = UMLFactory.eINSTANCE.createActivity();

-		activityA_SpecifiedOperation.setSpecification(classA.getOwnedOperations().get(0));

-		activityA_SpecifiedOperation.getOwnedNodes().add(readSelfActionA);

-		

-		// Create Activity B => OwnedBehaviour and NestedClassifier

-		this.readSelfActionB1 = UMLFactory.eINSTANCE.createReadSelfAction();

-		this.readSelfActionB2 = UMLFactory.eINSTANCE.createReadSelfAction();

-		classB = UMLFactory.eINSTANCE.createClass();

-		classB.setName("b");

-		activityB_ownedBehavior = UMLFactory.eINSTANCE.createActivity();

-		activityB_ownedBehavior.getOwnedNodes().add(readSelfActionB1);

-		classB.getOwnedBehaviors().add(activityB_ownedBehavior);

-		activityB_nestedClassifier = UMLFactory.eINSTANCE.createActivity();

-		activityB_nestedClassifier.getOwnedNodes().add(readSelfActionB2);

-		classB.getNestedClassifiers().add(activityB_nestedClassifier);

-		

-		// Create Activity C => classifierBehaviour

-		this.readSelfActionC = UMLFactory.eINSTANCE.createReadSelfAction();

-		classC = UMLFactory.eINSTANCE.createClass();

-		classC.setName("c");

-		activityC_classiferBahaviour = UMLFactory.eINSTANCE.createActivity();

-		activityC_classiferBahaviour.getOwnedNodes().add(readSelfActionC);

-		classC.getOwnedBehaviors().add(activityC_classiferBahaviour);

-		classC.setClassifierBehavior(activityC_classiferBahaviour);

-		

-		// Create Activity D => rootElement

-		this.readSelfActionD = UMLFactory.eINSTANCE.createReadSelfAction();

-		activityD_InRootElement = UMLFactory.eINSTANCE.createActivity();

-		activityD_InRootElement.getOwnedNodes().add(readSelfActionD);

-

-		// Add the different elements to the model

-		this.umlTestModel.getPackagedElements().add(activityA_SpecifiedOperation);

-		this.umlTestModel.getPackagedElements().add(this.classA);

-		this.umlTestModel.getPackagedElements().add(this.classB);

-		this.umlTestModel.getPackagedElements().add(this.classC);

-		this.umlTestModel.getPackagedElements().add(this.activityD_InRootElement);

-		

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ReadSelfActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.ReadSelfAction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * Pin of ReadSelfAction should be create and update automatically
+ * 
+ */
+public class TestReadSelfActionPinDerivation extends AbstractTestPinDerivation {
+
+	/**
+	 * CallBehaviorAction advice identifier
+	 */
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadSelfActionEditHelperAdvice";
+
+	private Class classA;
+
+	private Class classB;
+
+	private Class classC;
+
+	private Activity activityA_SpecifiedOperation;
+
+	private Activity activityB_ownedBehavior;
+
+	private Activity activityB_nestedClassifier;
+
+	private Activity activityC_classiferBahaviour;
+
+	private Activity activityD_InRootElement;
+
+	private ReadSelfAction readSelfActionA;
+
+	private ReadSelfAction readSelfActionB1;
+
+	private ReadSelfAction readSelfActionB2;
+
+	private ReadSelfAction readSelfActionC;
+
+	private ReadSelfAction readSelfActionD;
+
+	/**
+	 * Constructor.
+	 */
+	public TestReadSelfActionPinDerivation() {
+		this.populateBaseTestModel();
+		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION
+		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
+		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.READ_SELF_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the ReadSelfAction is available
+	 */
+	@Test
+	public void testAdviceForReadSelfActionExists() {
+		Assert.assertNotNull("ReadSelfAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+	}
+
+	/**
+	 * Role:
+	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 
+	 * ActivityA is owned by the rootElement
+	 * ActivityA specified an operation of the classA
+	 * 
+	 * Scenario:
+	 * - 1] ReadSelfAction is add to the activity
+	 * - 2] Synchronization is performed via the advice
+	 * - ReadSelfAction has now 1 pin
+	 * - 1 result typed by the activity
+	 */
+	@Test
+	public void testPinDerivation_ActivitySpecifiedOperation() {
+		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionA, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionA);
+		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);
+		if (!editReadSelfActionCommand.canExecute()) {
+			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));
+		
+		// Assert result
+		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionA.getResult() != null);
+		Assert.assertTrue("ReadSelfAction shall have a result pin typed by classA", this.readSelfActionA.getResult().getType() == null);
+
+		if (!editReadSelfActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 
+	 * ActivityB is an ownedBehavior of the classB
+	 * 
+	 * Scenario:
+	 * - 1] ReadSelfAction is add to the activity
+	 * - 2] Synchronization is performed via the advice
+	 * - ReadSelfAction has now 1 pin
+	 * - 1 result typed by classB
+	 */
+	@Test
+	public void testPinDerivation_ActivityOwnedBeahaviour() {
+		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionB1, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionB1);
+		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);
+		if (!editReadSelfActionCommand.canExecute()) {
+			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));
+		
+		// Assert result
+		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionB1.getResult() != null);
+		Assert.assertTrue("ReadSelfAction shall have a result pin typed by classB", this.readSelfActionB1.getResult().getType() == classB);
+
+		if (!editReadSelfActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 
+	 * ActivityB is an nestedClassifier of the classB
+	 * 
+	 * Scenario:
+	 * - 1] ReadSelfAction is add to the activity
+	 * - 2] Synchronization is performed via the advice
+	 * - ReadSelfAction has now 1 pin
+	 * - 1 result typed by activityB_nestedClassifer
+	 */
+	@Test
+	public void testPinDerivation_ActivityNestedClassifer() {
+		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionB2, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionB2);
+		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);
+		if (!editReadSelfActionCommand.canExecute()) {
+			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));
+		
+		// Assert result
+		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionB2.getResult() != null);
+		Assert.assertTrue("ReadSelfAction shall have a result pin typed by classB", this.readSelfActionB2.getResult().getType() == null);
+
+		if (!editReadSelfActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 
+	 * ActivityC is owned by classC
+	 * ActivityC is classifierBehaviour of classC
+	 * 
+	 * Scenario:
+	 * - 1] ReadSelfAction is add to the activity
+	 * - 2] Synchronization is performed via the advice
+	 * - ReadSelfAction has now 1 pin
+	 * - 1 result typed by classC
+	 */
+	@Test
+	public void testPinDerivation_ActivityAsClassifierBehaviour() {
+		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionC, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionC);
+		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);
+		if (!editReadSelfActionCommand.canExecute()) {
+			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));
+		
+		// Assert result
+		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionC.getResult() != null);
+		Assert.assertTrue("ReadSelfAction shall have a result pin typed by classB", this.readSelfActionC.getResult().getType() == classC);
+
+		if (!editReadSelfActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For adding a ReadSelfAction to the activity, insure that the pin is correctly typed. 
+	 * ActivityC is owned by the rootElement
+	 * 
+	 * Scenario:
+	 * - 1] ReadSelfAction is add to the activity
+	 * - 2] Synchronization is performed via the advice
+	 * - ReadSelfAction has now 1 pin
+	 * - 1 result typed by activityD
+	 */
+	@Test
+	public void testPinDerivation_ActivityInRootElement() {
+		ConfigureRequest request = new ConfigureRequest(this.editingDomain, this.readSelfActionD, UMLElementTypes.getElementType(ReadSelfActionEditPart.VISUAL_ID));
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readSelfActionD);
+		ICommand editReadSelfActionCommand = elementEditService.getEditCommand(request);
+		if (!editReadSelfActionCommand.canExecute()) {
+			Assert.fail("The ReadSelfAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadSelfActionCommand));
+		
+		// Assert result
+		Assert.assertTrue("ReadSelfAction shall have a result pin", this.readSelfActionD.getResult() != null);
+		Assert.assertTrue("ReadSelfAction shall have a result pin not typed", this.readSelfActionD.getResult().getType() == null);
+
+		if (!editReadSelfActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+		
+		// Create Activity A => specification
+		this.readSelfActionA = UMLFactory.eINSTANCE.createReadSelfAction();
+		classA = UMLFactory.eINSTANCE.createClass();
+		classA.setName("a");
+		classA.getOwnedOperations().add(UMLFactory.eINSTANCE.createOperation());
+		activityA_SpecifiedOperation = UMLFactory.eINSTANCE.createActivity();
+		activityA_SpecifiedOperation.setSpecification(classA.getOwnedOperations().get(0));
+		activityA_SpecifiedOperation.getOwnedNodes().add(readSelfActionA);
+		
+		// Create Activity B => OwnedBehaviour and NestedClassifier
+		this.readSelfActionB1 = UMLFactory.eINSTANCE.createReadSelfAction();
+		this.readSelfActionB2 = UMLFactory.eINSTANCE.createReadSelfAction();
+		classB = UMLFactory.eINSTANCE.createClass();
+		classB.setName("b");
+		activityB_ownedBehavior = UMLFactory.eINSTANCE.createActivity();
+		activityB_ownedBehavior.getOwnedNodes().add(readSelfActionB1);
+		classB.getOwnedBehaviors().add(activityB_ownedBehavior);
+		activityB_nestedClassifier = UMLFactory.eINSTANCE.createActivity();
+		activityB_nestedClassifier.getOwnedNodes().add(readSelfActionB2);
+		classB.getNestedClassifiers().add(activityB_nestedClassifier);
+		
+		// Create Activity C => classifierBehaviour
+		this.readSelfActionC = UMLFactory.eINSTANCE.createReadSelfAction();
+		classC = UMLFactory.eINSTANCE.createClass();
+		classC.setName("c");
+		activityC_classiferBahaviour = UMLFactory.eINSTANCE.createActivity();
+		activityC_classiferBahaviour.getOwnedNodes().add(readSelfActionC);
+		classC.getOwnedBehaviors().add(activityC_classiferBahaviour);
+		classC.setClassifierBehavior(activityC_classiferBahaviour);
+		
+		// Create Activity D => rootElement
+		this.readSelfActionD = UMLFactory.eINSTANCE.createReadSelfAction();
+		activityD_InRootElement = UMLFactory.eINSTANCE.createActivity();
+		activityD_InRootElement.getOwnedNodes().add(readSelfActionD);
+
+		// Add the different elements to the model
+		this.umlTestModel.getPackagedElements().add(activityA_SpecifiedOperation);
+		this.umlTestModel.getPackagedElements().add(this.classA);
+		this.umlTestModel.getPackagedElements().add(this.classB);
+		this.umlTestModel.getPackagedElements().add(this.classC);
+		this.umlTestModel.getPackagedElements().add(this.activityD_InRootElement);
+		
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestReadStructuralFeatureActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestReadStructuralFeatureActionPinDerivation.java
index d2dba656ebe..7fb376afdd2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestReadStructuralFeatureActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestReadStructuralFeatureActionPinDerivation.java
@@ -1,308 +1,308 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.ReadStructuralFeatureAction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * 

- * Pins of ReadStructuralFeatureAction should be create and update automatically

- * 

- */

-public class TestReadStructuralFeatureActionPinDerivation extends AbstractTestPinDerivation {

-

-	/**

-	 * ReadStructuralFeatureAction advice identifier

-	 */

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadStructuralFeatureActionEditHelperAdvice";

-

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice";

-	

-	private ReadStructuralFeatureAction readStructuralFeatureAction;

-

-	private Class portClass;

-	

-	private Port port; 

-	

-	private Class propertyClass;

-	

-	private Property property; 

-

-

-	/**

-	 * Constructor.

-	 */

-	public TestReadStructuralFeatureActionPinDerivation() {

-		this.port = null;

-		this.property = null;

-		this.populateBaseTestModel();

-		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION

-		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();

-		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.READ_STRUCTURAL_FEATURE_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the ReadStructuralFeatureAction is available

-	 */

-	@Test

-	public void testAdviceForCallOperationActionExists() {

-		Assert.assertNotNull("ReadStructuralFeatureAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-		Assert.assertNotNull("Property advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY));

-	}

-	

-	/**

-	 * Role:

-	 * - For a ReadStructuralFeatureAction having no structural feature, ensure that if a structural feature is referenced then the pins corresponding to the

-	 * structural feature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] readStructuralFeatureAction 'structuralFeature' feature is set with the Property 'property'

-	 * - 2] Synchronization is performed via the advice

-	 * - readStructuralFeatureAction has now 2 pins

-	 * - 1 object ([in] typed by propertyClass)

-	 * - 1 result ([out] typed by Integer, with multiplicity of P1)

-	 */

-	@Test

-	public void testPinDerivation_NoStructuralFeature_To_PropertyStructuralFeature() {

-		SetRequest request = new SetRequest(this.editingDomain, this.readStructuralFeatureAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.property);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);

-		ICommand editReadStructuralFeatureActionCommand = elementEditService.getEditCommand(request);

-		if (!editReadStructuralFeatureActionCommand.canExecute()) {

-			Assert.fail("The ReadStructuralFeatureAction cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadStructuralFeatureActionCommand));

-		

-		// Assert object

-		Assert.assertTrue("ReadStructuralFeatureAction shall have a object", this.readStructuralFeatureAction.getObject() != null);

-		Assert.assertTrue("ReadStructuralFeatureAction shall have an object pin and this pin shall have a type", this.readStructuralFeatureAction.getObject().getType() == propertyClass);

-		

-		// Assert result pins

-		Assert.assertTrue("ReadStructuralFeatureAction shall have one result pin", this.readStructuralFeatureAction.getResult() != null);

-		Assert.assertTrue("ReadStructuralFeatureAction result pins shall typed by Integer", this.readStructuralFeatureAction.getResult().getType() == this.getPrimitiveType("Integer"));

-		Assert.assertTrue("ReadStructuralFeatureAction result pins shall with upper multiplicity of 10", this.readStructuralFeatureAction.getResult().getUpper() == 10);

-		Assert.assertTrue("ReadStructuralFeatureAction result pins shall with lower multiplicity of 1", this.readStructuralFeatureAction.getResult().getLower() == 1);

-		

-		if (!editReadStructuralFeatureActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For a ReadStructuralFeatureAction having no structural feature, ensure that if a structural feature is referenced then the pins corresponding to the

-	 * structural feature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] readStructuralFeatureAction 'structuralFeature' feature is set with the Port 'port'

-	 * - 2] Synchronization is performed via the advice

-	 * - readStructuralFeatureAction has now 2 pins

-	 * - 1 object ([in] typed by portClass)

-	 * - 1 result ([out] typed by String)

-	 */

-	@Test

-	public void testPinDerivation_NoStructuralFeature_To_PortStructuralFeature() {

-		SetRequest request = new SetRequest(this.editingDomain, this.readStructuralFeatureAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.port);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);

-		ICommand editReadStructuralFeatureActionCommand = elementEditService.getEditCommand(request);

-		if (!editReadStructuralFeatureActionCommand.canExecute()) {

-			Assert.fail("The ReadStructuralFeatureAction cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadStructuralFeatureActionCommand));

-		

-		// Assert object

-		Assert.assertTrue("ReadStructuralFeatureAction shall have a object", this.readStructuralFeatureAction.getObject() != null);

-		Assert.assertTrue("ReadStructuralFeatureAction shall have an object pin and this pin shall have a type", this.readStructuralFeatureAction.getObject().getType() == portClass);

-		

-		// Assert result pins

-		Assert.assertTrue("ReadStructuralFeatureAction shall have one result pin", this.readStructuralFeatureAction.getResult() != null);

-		Assert.assertTrue("ReadStructuralFeatureAction result pins shall typed by Integer", this.readStructuralFeatureAction.getResult().getType() == this.getPrimitiveType("String"));

-		Assert.assertTrue("ReadStructuralFeatureAction result pins shall with upper multiplicity of 2", this.readStructuralFeatureAction.getResult().getUpper() == 2);

-		Assert.assertTrue("ReadStructuralFeatureAction result pins shall with lower multiplicity of 0", this.readStructuralFeatureAction.getResult().getLower() == 0);

-		

-		if (!editReadStructuralFeatureActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For a ReadStructuralFeatureAction having structural feature, ensure that if the structural feature  type is change then the pins corresponding to the

-	 * structural feature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] readStructuralFeatureAction 'structuralFeature' feature is set with the Property 'property'

-	 * - 2] Synchronization is performed via the advice

-	 * - readStructuralFeatureAction has now 2 pins

-	 * - 1 object ([in] typed by portClass)

-	 * - 1 result ([out] typed by String)

-	 * - 3] property type is set to "Boolean"

-	 * - readStructuralFeatureAction has now 2 pins

-	 * - 1 object ([in] typed by propertyClass)

-	 * - 1 result ([out] typed by Boolean)

-	 */

-	@Test

-	public void testPinDerivation_changePropertyStructuralFeatureType() {

-		SetRequest request = new SetRequest(this.editingDomain, this.readStructuralFeatureAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.property);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);

-		ICommand editReadStructuralFeatureActionCommand = elementEditService.getEditCommand(request);

-		if (!editReadStructuralFeatureActionCommand.canExecute()) {

-			Assert.fail("The ReadStructuralFeatureAction cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadStructuralFeatureActionCommand));

-		

-		// Change port type

-		SetRequest editPropertyRequest = new SetRequest(this.editingDomain, this.property, UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Boolean")); 

-		IElementEditService editPropertyElementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);

-		ICommand editPropertyCommand = editPropertyElementEditService.getEditCommand(editPropertyRequest);

-		if (!editPropertyCommand.canExecute()) {

-			Assert.fail("The attribut type of property cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editPropertyCommand));

-		

-		// Assert result pins

-		Assert.assertTrue("ReadStructuralFeatureAction shall have one result pin", this.readStructuralFeatureAction.getResult() != null);

-		Assert.assertTrue("ReadStructuralFeatureAction result pins shall typed by Integer", this.readStructuralFeatureAction.getResult().getType() == this.getPrimitiveType("Boolean"));

-		

-		if (!editPropertyCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-		if (!editReadStructuralFeatureActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For a ReadStructuralFeatureAction having structural feature, ensure that if the structural feature  type is change then the pins corresponding to the

-	 * structural feature are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] readStructuralFeatureAction 'structuralFeature' feature is set with the Port 'port'

-	 * - 2] Synchronization is performed via the advice

-	 * - readStructuralFeatureAction has now 2 pins

-	 * - 1 object ([in] typed by portClass)

-	 * - 1 result ([out] typed by String)

-	 * - 3] port type is set to "Boolean"

-	 * - readStructuralFeatureAction has now 2 pins

-	 * - 1 object ([in] typed by portClass)

-	 * - 1 result ([out] typed by Boolean)

-	 */

-	@Test

-	public void testPinDerivation_changePortStructuralFeatureType() {

-		SetRequest request = new SetRequest(this.editingDomain, this.readStructuralFeatureAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.port);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);

-		ICommand editReadStructuralFeatureActionCommand = elementEditService.getEditCommand(request);

-		if (!editReadStructuralFeatureActionCommand.canExecute()) {

-			Assert.fail("The ReadStructuralFeatureAction cannot be edited (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadStructuralFeatureActionCommand));

-

-		// Change port type

-		SetRequest editPortRequest = new SetRequest(this.editingDomain, this.port, UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Boolean")); 

-		IElementEditService editPortElementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);

-		ICommand editPortCommand = editPortElementEditService.getEditCommand(editPortRequest);

-		if (!editPortCommand.canExecute()) {

-			Assert.fail("The attribut type of port cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editPortCommand));

-		

-		// Assert result pins

-		Assert.assertTrue("ReadStructuralFeatureAction shall have one result pin", this.readStructuralFeatureAction.getResult() != null);

-		Assert.assertTrue("ReadStructuralFeatureAction result pins shall typed by Integer", this.readStructuralFeatureAction.getResult().getType() == this.getPrimitiveType("Boolean"));

-		

-		if (!editPortCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-		if (!editReadStructuralFeatureActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-

-	

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-		// Define the property

-		this.property = UMLFactory.eINSTANCE.createProperty();

-		this.property.setName("p1");

-		this.property.setUpper(10);

-		this.property.setLower(1);

-		this.property.setType(this.getPrimitiveType("Integer"));

-		

-		// Define the port

-		this.port = UMLFactory.eINSTANCE.createPort();

-		this.port.setUpper(2);

-		this.port.setLower(0);

-		this.port.setType(this.getPrimitiveType("String"));

-

-		// Create propertyClass with a property

-		propertyClass = UMLFactory.eINSTANCE.createClass();

-		propertyClass.setName("C1");

-		propertyClass.getOwnedAttributes().add(property);

-		

-		// Create portClass with a port

-		portClass = UMLFactory.eINSTANCE.createClass();

-		portClass.setName("C2");

-		portClass.getOwnedPorts().add(port);

-		

-		// Create the activity containing the readStructuralFeatureAction

-		Activity activity = UMLFactory.eINSTANCE.createActivity();

-		this.readStructuralFeatureAction = UMLFactory.eINSTANCE.createReadStructuralFeatureAction();

-		this.readStructuralFeatureAction.setStructuralFeature(port);

-		activity.getOwnedNodes().add(this.readStructuralFeatureAction);

-		

-		// Add the different elements to the model

-		this.umlTestModel.getPackagedElements().add(propertyClass);

-		this.umlTestModel.getPackagedElements().add(portClass);

-		this.umlTestModel.getPackagedElements().add(activity);

-		

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.ReadStructuralFeatureAction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * Pins of ReadStructuralFeatureAction should be create and update automatically
+ * 
+ */
+public class TestReadStructuralFeatureActionPinDerivation extends AbstractTestPinDerivation {
+
+	/**
+	 * ReadStructuralFeatureAction advice identifier
+	 */
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadStructuralFeatureActionEditHelperAdvice";
+
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice";
+	
+	private ReadStructuralFeatureAction readStructuralFeatureAction;
+
+	private Class portClass;
+	
+	private Port port; 
+	
+	private Class propertyClass;
+	
+	private Property property; 
+
+
+	/**
+	 * Constructor.
+	 */
+	public TestReadStructuralFeatureActionPinDerivation() {
+		this.port = null;
+		this.property = null;
+		this.populateBaseTestModel();
+		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION
+		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
+		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.READ_STRUCTURAL_FEATURE_ACTION_ACCELERATOR, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the ReadStructuralFeatureAction is available
+	 */
+	@Test
+	public void testAdviceForCallOperationActionExists() {
+		Assert.assertNotNull("ReadStructuralFeatureAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+		Assert.assertNotNull("Property advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_PROPERTY));
+	}
+	
+	/**
+	 * Role:
+	 * - For a ReadStructuralFeatureAction having no structural feature, ensure that if a structural feature is referenced then the pins corresponding to the
+	 * structural feature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] readStructuralFeatureAction 'structuralFeature' feature is set with the Property 'property'
+	 * - 2] Synchronization is performed via the advice
+	 * - readStructuralFeatureAction has now 2 pins
+	 * - 1 object ([in] typed by propertyClass)
+	 * - 1 result ([out] typed by Integer, with multiplicity of P1)
+	 */
+	@Test
+	public void testPinDerivation_NoStructuralFeature_To_PropertyStructuralFeature() {
+		SetRequest request = new SetRequest(this.editingDomain, this.readStructuralFeatureAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.property);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);
+		ICommand editReadStructuralFeatureActionCommand = elementEditService.getEditCommand(request);
+		if (!editReadStructuralFeatureActionCommand.canExecute()) {
+			Assert.fail("The ReadStructuralFeatureAction cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadStructuralFeatureActionCommand));
+		
+		// Assert object
+		Assert.assertTrue("ReadStructuralFeatureAction shall have a object", this.readStructuralFeatureAction.getObject() != null);
+		Assert.assertTrue("ReadStructuralFeatureAction shall have an object pin and this pin shall have a type", this.readStructuralFeatureAction.getObject().getType() == propertyClass);
+		
+		// Assert result pins
+		Assert.assertTrue("ReadStructuralFeatureAction shall have one result pin", this.readStructuralFeatureAction.getResult() != null);
+		Assert.assertTrue("ReadStructuralFeatureAction result pins shall typed by Integer", this.readStructuralFeatureAction.getResult().getType() == this.getPrimitiveType("Integer"));
+		Assert.assertTrue("ReadStructuralFeatureAction result pins shall with upper multiplicity of 10", this.readStructuralFeatureAction.getResult().getUpper() == 10);
+		Assert.assertTrue("ReadStructuralFeatureAction result pins shall with lower multiplicity of 1", this.readStructuralFeatureAction.getResult().getLower() == 1);
+		
+		if (!editReadStructuralFeatureActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For a ReadStructuralFeatureAction having no structural feature, ensure that if a structural feature is referenced then the pins corresponding to the
+	 * structural feature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] readStructuralFeatureAction 'structuralFeature' feature is set with the Port 'port'
+	 * - 2] Synchronization is performed via the advice
+	 * - readStructuralFeatureAction has now 2 pins
+	 * - 1 object ([in] typed by portClass)
+	 * - 1 result ([out] typed by String)
+	 */
+	@Test
+	public void testPinDerivation_NoStructuralFeature_To_PortStructuralFeature() {
+		SetRequest request = new SetRequest(this.editingDomain, this.readStructuralFeatureAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.port);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);
+		ICommand editReadStructuralFeatureActionCommand = elementEditService.getEditCommand(request);
+		if (!editReadStructuralFeatureActionCommand.canExecute()) {
+			Assert.fail("The ReadStructuralFeatureAction cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadStructuralFeatureActionCommand));
+		
+		// Assert object
+		Assert.assertTrue("ReadStructuralFeatureAction shall have a object", this.readStructuralFeatureAction.getObject() != null);
+		Assert.assertTrue("ReadStructuralFeatureAction shall have an object pin and this pin shall have a type", this.readStructuralFeatureAction.getObject().getType() == portClass);
+		
+		// Assert result pins
+		Assert.assertTrue("ReadStructuralFeatureAction shall have one result pin", this.readStructuralFeatureAction.getResult() != null);
+		Assert.assertTrue("ReadStructuralFeatureAction result pins shall typed by Integer", this.readStructuralFeatureAction.getResult().getType() == this.getPrimitiveType("String"));
+		Assert.assertTrue("ReadStructuralFeatureAction result pins shall with upper multiplicity of 2", this.readStructuralFeatureAction.getResult().getUpper() == 2);
+		Assert.assertTrue("ReadStructuralFeatureAction result pins shall with lower multiplicity of 0", this.readStructuralFeatureAction.getResult().getLower() == 0);
+		
+		if (!editReadStructuralFeatureActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For a ReadStructuralFeatureAction having structural feature, ensure that if the structural feature  type is change then the pins corresponding to the
+	 * structural feature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] readStructuralFeatureAction 'structuralFeature' feature is set with the Property 'property'
+	 * - 2] Synchronization is performed via the advice
+	 * - readStructuralFeatureAction has now 2 pins
+	 * - 1 object ([in] typed by portClass)
+	 * - 1 result ([out] typed by String)
+	 * - 3] property type is set to "Boolean"
+	 * - readStructuralFeatureAction has now 2 pins
+	 * - 1 object ([in] typed by propertyClass)
+	 * - 1 result ([out] typed by Boolean)
+	 */
+	@Test
+	public void testPinDerivation_changePropertyStructuralFeatureType() {
+		SetRequest request = new SetRequest(this.editingDomain, this.readStructuralFeatureAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.property);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);
+		ICommand editReadStructuralFeatureActionCommand = elementEditService.getEditCommand(request);
+		if (!editReadStructuralFeatureActionCommand.canExecute()) {
+			Assert.fail("The ReadStructuralFeatureAction cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadStructuralFeatureActionCommand));
+		
+		// Change port type
+		SetRequest editPropertyRequest = new SetRequest(this.editingDomain, this.property, UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Boolean")); 
+		IElementEditService editPropertyElementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);
+		ICommand editPropertyCommand = editPropertyElementEditService.getEditCommand(editPropertyRequest);
+		if (!editPropertyCommand.canExecute()) {
+			Assert.fail("The attribut type of property cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editPropertyCommand));
+		
+		// Assert result pins
+		Assert.assertTrue("ReadStructuralFeatureAction shall have one result pin", this.readStructuralFeatureAction.getResult() != null);
+		Assert.assertTrue("ReadStructuralFeatureAction result pins shall typed by Integer", this.readStructuralFeatureAction.getResult().getType() == this.getPrimitiveType("Boolean"));
+		
+		if (!editPropertyCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+		if (!editReadStructuralFeatureActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For a ReadStructuralFeatureAction having structural feature, ensure that if the structural feature  type is change then the pins corresponding to the
+	 * structural feature are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] readStructuralFeatureAction 'structuralFeature' feature is set with the Port 'port'
+	 * - 2] Synchronization is performed via the advice
+	 * - readStructuralFeatureAction has now 2 pins
+	 * - 1 object ([in] typed by portClass)
+	 * - 1 result ([out] typed by String)
+	 * - 3] port type is set to "Boolean"
+	 * - readStructuralFeatureAction has now 2 pins
+	 * - 1 object ([in] typed by portClass)
+	 * - 1 result ([out] typed by Boolean)
+	 */
+	@Test
+	public void testPinDerivation_changePortStructuralFeatureType() {
+		SetRequest request = new SetRequest(this.editingDomain, this.readStructuralFeatureAction, UMLPackage.eINSTANCE.getStructuralFeatureAction_StructuralFeature(), this.port);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);
+		ICommand editReadStructuralFeatureActionCommand = elementEditService.getEditCommand(request);
+		if (!editReadStructuralFeatureActionCommand.canExecute()) {
+			Assert.fail("The ReadStructuralFeatureAction cannot be edited (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editReadStructuralFeatureActionCommand));
+
+		// Change port type
+		SetRequest editPortRequest = new SetRequest(this.editingDomain, this.port, UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Boolean")); 
+		IElementEditService editPortElementEditService = ElementEditServiceUtils.getCommandProvider(this.readStructuralFeatureAction);
+		ICommand editPortCommand = editPortElementEditService.getEditCommand(editPortRequest);
+		if (!editPortCommand.canExecute()) {
+			Assert.fail("The attribut type of port cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editPortCommand));
+		
+		// Assert result pins
+		Assert.assertTrue("ReadStructuralFeatureAction shall have one result pin", this.readStructuralFeatureAction.getResult() != null);
+		Assert.assertTrue("ReadStructuralFeatureAction result pins shall typed by Integer", this.readStructuralFeatureAction.getResult().getType() == this.getPrimitiveType("Boolean"));
+		
+		if (!editPortCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+		if (!editReadStructuralFeatureActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+
+	
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+		// Define the property
+		this.property = UMLFactory.eINSTANCE.createProperty();
+		this.property.setName("p1");
+		this.property.setUpper(10);
+		this.property.setLower(1);
+		this.property.setType(this.getPrimitiveType("Integer"));
+		
+		// Define the port
+		this.port = UMLFactory.eINSTANCE.createPort();
+		this.port.setUpper(2);
+		this.port.setLower(0);
+		this.port.setType(this.getPrimitiveType("String"));
+
+		// Create propertyClass with a property
+		propertyClass = UMLFactory.eINSTANCE.createClass();
+		propertyClass.setName("C1");
+		propertyClass.getOwnedAttributes().add(property);
+		
+		// Create portClass with a port
+		portClass = UMLFactory.eINSTANCE.createClass();
+		portClass.setName("C2");
+		portClass.getOwnedPorts().add(port);
+		
+		// Create the activity containing the readStructuralFeatureAction
+		Activity activity = UMLFactory.eINSTANCE.createActivity();
+		this.readStructuralFeatureAction = UMLFactory.eINSTANCE.createReadStructuralFeatureAction();
+		this.readStructuralFeatureAction.setStructuralFeature(port);
+		activity.getOwnedNodes().add(this.readStructuralFeatureAction);
+		
+		// Add the different elements to the model
+		this.umlTestModel.getPackagedElements().add(propertyClass);
+		this.umlTestModel.getPackagedElements().add(portClass);
+		this.umlTestModel.getPackagedElements().add(activity);
+		
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestSendSignalActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestSendSignalActionPinDerivation.java
index 8d76a17246b..df01aafe566 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestSendSignalActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestSendSignalActionPinDerivation.java
@@ -1,220 +1,220 @@
-/*****************************************************************************

- * 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:

- *   Jérémie TATIBOUET (CEA LIST) - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.Generalization;

-import org.eclipse.uml2.uml.InputPin;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.SendSignalAction;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Test;

-

-public class TestSendSignalActionPinDerivation extends AbstractTestPinDerivation {

-

-	/**

-	 * CallBehaviorAction advice identifier

-	 */

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice";

-

-	/**

-	 * SendSignalAction on which pin derivation is tested

-	 */

-	private SendSignalAction sendSignalAction;

-

-	/**

-	 * Signal specification N°1

-	 */

-	private Signal baseSignal;

-

-	/**

-	 * Signal specification N°2

-	 */

-	private Signal extendedSignal;

-

-	/**

-	 * Constructor.

-	 */

-	public TestSendSignalActionPinDerivation() {

-		this.baseSignal = null;

-		this.extendedSignal = null;

-		this.populateBaseTestModel();

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the SendSignalAction is available

-	 */

-	@Test

-	public void testAdviceForSendSignalActionExists() {

-		Assert.assertNotNull("SendSignalAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-	}

-

-	/**

-	 * Role:

-	 * - For a SendSignalAction having no referenced signal, ensure that if a signal gets referenced then target and argument pins

-	 * are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] SendSignalAction 'signal' feature is set with the 'baseSignal'

-	 * - 2] Synchronization is performed via the advice

-	 * - SendSignalAction has now 3 pins

-	 * - 1 target (of type C)

-	 * - 2 argument pins (p1 and p2)

-	 */

-	@Test

-	public void testPinDerivation_NoSignal_ToSignalWithAttributes() {

-		SetRequest request = new SetRequest(this.editingDomain, this.sendSignalAction, UMLPackage.eINSTANCE.getSendSignalAction_Signal(), this.baseSignal);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.sendSignalAction);

-		ICommand editSendSignalActionCommand = elementEditService.getEditCommand(request);

-		if (!editSendSignalActionCommand.canExecute()) {

-			Assert.fail("The SendSignalAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editSendSignalActionCommand));

-		// Assert target derivation

-		Assert.assertTrue("SendSignalAction shall have a target", this.sendSignalAction.getTarget() != null);

-		Assert.assertTrue("SendSignalAction shall have a target with a type", this.sendSignalAction.getTarget().getType() != null);

-		// Assert arguments derivation

-		Assert.assertTrue("SendSignalAction shall have a two input pins", this.sendSignalAction.getArguments().size() == 2);

-		Assert.assertTrue("SendSignalAction pins shall be cohesive with signal attributes", PinDerivationAssertionUtils.assertArgumentsAndAttributesCohesion(this.sendSignalAction.getArguments(), this.baseSignal.getAttributes()));

-		if (!editSendSignalActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a SendSignalAction having already been synchronized with 'baseSignal' specification, ensure that if the the 'signal' feature

-	 * of the action evolves then pins are updated accordingly

-	 * 

-	 * Scenario:

-	 * - 1] SendSignalAction 'signal' feature is set with 'baseSignal'

-	 * - 2] Synchronization is performed via the advice

-	 * - SendSignalAction has now 3 pins

-	 * - 1 target (of type C)

-	 * - 2 argument pins (p1 and p2).

-	 * - 3] SendSignalAction 'signal' feature is set with 'extendedSignal'

-	 * - 4] Synchronization is performed via the advice

-	 * - SendSignalAction has now 4 pins

-	 * - 1 target (of type C)

-	 * - 3 argument pins (p1, p2 and p3)

-	 * 

-	 * Note: along the synchronization process pins p1 and p2 are not deleted. This makes sure that user edges can be preserved.

-	 */

-	@Test

-	public void testPinDerivation_SignalWithAttributes_To_SignalWithAttributes() {

-		SetRequest request = new SetRequest(this.editingDomain, this.sendSignalAction, UMLPackage.eINSTANCE.getSendSignalAction_Signal(), this.baseSignal);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.sendSignalAction);

-		ICommand firstEditSendSignalActionCommand = elementEditService.getEditCommand(request);

-		if (!firstEditSendSignalActionCommand.canExecute()) {

-			Assert.fail("The SendSignalAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditSendSignalActionCommand));

-		request = new SetRequest(this.editingDomain, this.sendSignalAction, UMLPackage.eINSTANCE.getSendSignalAction_Signal(), this.extendedSignal);

-		ICommand secondEditSendSignalActionCommand = elementEditService.getEditCommand(request);

-		if (!secondEditSendSignalActionCommand.canExecute()) {

-			Assert.fail("The SendSignalAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditSendSignalActionCommand));

-		InputPin p1 = this.sendSignalAction.getArguments().get(0);

-		InputPin p2 = this.sendSignalAction.getArguments().get(1);

-		// Assert target derivation

-		Assert.assertTrue("SendSignalAction shall have a target", this.sendSignalAction.getTarget() != null);

-		Assert.assertTrue("SendSignalAction shall have a target with a type", this.sendSignalAction.getTarget().getType() != null);

-		// Assert arguments derivation

-		Assert.assertTrue("SendSignalAction shall have a two input pins", this.sendSignalAction.getArguments().size() == 3);

-		Assert.assertTrue("SendSignalAction pins shall be cohesive with signal attributes", PinDerivationAssertionUtils.assertArgumentsAndAttributesCohesion(this.sendSignalAction.getArguments(), this.extendedSignal.getAllAttributes()));

-		// Assert pin preservation

-		Assert.assertTrue("Pin p1 shall be preserved", p1 == this.sendSignalAction.getArguments().get(0));

-		Assert.assertTrue("Pin p2 shall be preserved", p2 == this.sendSignalAction.getArguments().get(1));

-		if (!secondEditSendSignalActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-		if (!firstEditSendSignalActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-		// Define base signal

-		this.baseSignal = UMLFactory.eINSTANCE.createSignal();

-		Property p1 = UMLFactory.eINSTANCE.createProperty();

-		p1.setName("p1");

-		p1.setUpper(1);

-		p1.setLower(1);

-		p1.setType(this.getPrimitiveType("Integer"));

-		Property p2 = UMLFactory.eINSTANCE.createProperty();

-		p2.setName("p2");

-		p2.setUpper(1);

-		p2.setLower(1);

-		p2.setType(this.getPrimitiveType("Boolean"));

-		this.baseSignal.getOwnedAttributes().add(p1);

-		this.baseSignal.getOwnedAttributes().add(p2);

-		// Define extended signal

-		this.extendedSignal = UMLFactory.eINSTANCE.createSignal();

-		Property p3 = UMLFactory.eINSTANCE.createProperty();

-		p3.setName("p3");

-		p3.setUpper(1);

-		p3.setLower(-1);

-		p3.setType(this.getPrimitiveType("String"));

-		this.extendedSignal.getOwnedAttributes().add(p3);

-		// Create generalization between the two

-		Generalization generalization = UMLFactory.eINSTANCE.createGeneralization();

-		generalization.setGeneral(this.baseSignal);

-		generalization.setSpecific(this.extendedSignal);

-		this.extendedSignal.getGeneralizations().add(generalization);

-		// Create class with a port

-		Class class_ = UMLFactory.eINSTANCE.createClass();

-		class_.setName("C");

-		Port port = UMLFactory.eINSTANCE.createPort();

-		class_.getOwnedPorts().add(port);

-		// Create the activity containing the send signal action

-		Activity activity = UMLFactory.eINSTANCE.createActivity();

-		this.sendSignalAction = UMLFactory.eINSTANCE.createSendSignalAction();

-		this.sendSignalAction.setOnPort(port);

-		activity.getOwnedNodes().add(this.sendSignalAction);

-		// Add the different elements to the model

-		this.umlTestModel.getPackagedElements().add(class_);

-		this.umlTestModel.getPackagedElements().add(activity);

-		this.umlTestModel.getPackagedElements().add(this.baseSignal);

-		this.umlTestModel.getPackagedElements().add(this.extendedSignal);

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *   Jérémie TATIBOUET (CEA LIST) - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.Generalization;
+import org.eclipse.uml2.uml.InputPin;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.SendSignalAction;
+import org.eclipse.uml2.uml.Signal;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestSendSignalActionPinDerivation extends AbstractTestPinDerivation {
+
+	/**
+	 * CallBehaviorAction advice identifier
+	 */
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice";
+
+	/**
+	 * SendSignalAction on which pin derivation is tested
+	 */
+	private SendSignalAction sendSignalAction;
+
+	/**
+	 * Signal specification N°1
+	 */
+	private Signal baseSignal;
+
+	/**
+	 * Signal specification N°2
+	 */
+	private Signal extendedSignal;
+
+	/**
+	 * Constructor.
+	 */
+	public TestSendSignalActionPinDerivation() {
+		this.baseSignal = null;
+		this.extendedSignal = null;
+		this.populateBaseTestModel();
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the SendSignalAction is available
+	 */
+	@Test
+	public void testAdviceForSendSignalActionExists() {
+		Assert.assertNotNull("SendSignalAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+	}
+
+	/**
+	 * Role:
+	 * - For a SendSignalAction having no referenced signal, ensure that if a signal gets referenced then target and argument pins
+	 * are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] SendSignalAction 'signal' feature is set with the 'baseSignal'
+	 * - 2] Synchronization is performed via the advice
+	 * - SendSignalAction has now 3 pins
+	 * - 1 target (of type C)
+	 * - 2 argument pins (p1 and p2)
+	 */
+	@Test
+	public void testPinDerivation_NoSignal_ToSignalWithAttributes() {
+		SetRequest request = new SetRequest(this.editingDomain, this.sendSignalAction, UMLPackage.eINSTANCE.getSendSignalAction_Signal(), this.baseSignal);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.sendSignalAction);
+		ICommand editSendSignalActionCommand = elementEditService.getEditCommand(request);
+		if (!editSendSignalActionCommand.canExecute()) {
+			Assert.fail("The SendSignalAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editSendSignalActionCommand));
+		// Assert target derivation
+		Assert.assertTrue("SendSignalAction shall have a target", this.sendSignalAction.getTarget() != null);
+		Assert.assertTrue("SendSignalAction shall have a target with a type", this.sendSignalAction.getTarget().getType() != null);
+		// Assert arguments derivation
+		Assert.assertTrue("SendSignalAction shall have a two input pins", this.sendSignalAction.getArguments().size() == 2);
+		Assert.assertTrue("SendSignalAction pins shall be cohesive with signal attributes", PinDerivationAssertionUtils.assertArgumentsAndAttributesCohesion(this.sendSignalAction.getArguments(), this.baseSignal.getAttributes()));
+		if (!editSendSignalActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a SendSignalAction having already been synchronized with 'baseSignal' specification, ensure that if the the 'signal' feature
+	 * of the action evolves then pins are updated accordingly
+	 * 
+	 * Scenario:
+	 * - 1] SendSignalAction 'signal' feature is set with 'baseSignal'
+	 * - 2] Synchronization is performed via the advice
+	 * - SendSignalAction has now 3 pins
+	 * - 1 target (of type C)
+	 * - 2 argument pins (p1 and p2).
+	 * - 3] SendSignalAction 'signal' feature is set with 'extendedSignal'
+	 * - 4] Synchronization is performed via the advice
+	 * - SendSignalAction has now 4 pins
+	 * - 1 target (of type C)
+	 * - 3 argument pins (p1, p2 and p3)
+	 * 
+	 * Note: along the synchronization process pins p1 and p2 are not deleted. This makes sure that user edges can be preserved.
+	 */
+	@Test
+	public void testPinDerivation_SignalWithAttributes_To_SignalWithAttributes() {
+		SetRequest request = new SetRequest(this.editingDomain, this.sendSignalAction, UMLPackage.eINSTANCE.getSendSignalAction_Signal(), this.baseSignal);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.sendSignalAction);
+		ICommand firstEditSendSignalActionCommand = elementEditService.getEditCommand(request);
+		if (!firstEditSendSignalActionCommand.canExecute()) {
+			Assert.fail("The SendSignalAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditSendSignalActionCommand));
+		request = new SetRequest(this.editingDomain, this.sendSignalAction, UMLPackage.eINSTANCE.getSendSignalAction_Signal(), this.extendedSignal);
+		ICommand secondEditSendSignalActionCommand = elementEditService.getEditCommand(request);
+		if (!secondEditSendSignalActionCommand.canExecute()) {
+			Assert.fail("The SendSignalAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditSendSignalActionCommand));
+		InputPin p1 = this.sendSignalAction.getArguments().get(0);
+		InputPin p2 = this.sendSignalAction.getArguments().get(1);
+		// Assert target derivation
+		Assert.assertTrue("SendSignalAction shall have a target", this.sendSignalAction.getTarget() != null);
+		Assert.assertTrue("SendSignalAction shall have a target with a type", this.sendSignalAction.getTarget().getType() != null);
+		// Assert arguments derivation
+		Assert.assertTrue("SendSignalAction shall have a two input pins", this.sendSignalAction.getArguments().size() == 3);
+		Assert.assertTrue("SendSignalAction pins shall be cohesive with signal attributes", PinDerivationAssertionUtils.assertArgumentsAndAttributesCohesion(this.sendSignalAction.getArguments(), this.extendedSignal.getAllAttributes()));
+		// Assert pin preservation
+		Assert.assertTrue("Pin p1 shall be preserved", p1 == this.sendSignalAction.getArguments().get(0));
+		Assert.assertTrue("Pin p2 shall be preserved", p2 == this.sendSignalAction.getArguments().get(1));
+		if (!secondEditSendSignalActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+		if (!firstEditSendSignalActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+		// Define base signal
+		this.baseSignal = UMLFactory.eINSTANCE.createSignal();
+		Property p1 = UMLFactory.eINSTANCE.createProperty();
+		p1.setName("p1");
+		p1.setUpper(1);
+		p1.setLower(1);
+		p1.setType(this.getPrimitiveType("Integer"));
+		Property p2 = UMLFactory.eINSTANCE.createProperty();
+		p2.setName("p2");
+		p2.setUpper(1);
+		p2.setLower(1);
+		p2.setType(this.getPrimitiveType("Boolean"));
+		this.baseSignal.getOwnedAttributes().add(p1);
+		this.baseSignal.getOwnedAttributes().add(p2);
+		// Define extended signal
+		this.extendedSignal = UMLFactory.eINSTANCE.createSignal();
+		Property p3 = UMLFactory.eINSTANCE.createProperty();
+		p3.setName("p3");
+		p3.setUpper(1);
+		p3.setLower(-1);
+		p3.setType(this.getPrimitiveType("String"));
+		this.extendedSignal.getOwnedAttributes().add(p3);
+		// Create generalization between the two
+		Generalization generalization = UMLFactory.eINSTANCE.createGeneralization();
+		generalization.setGeneral(this.baseSignal);
+		generalization.setSpecific(this.extendedSignal);
+		this.extendedSignal.getGeneralizations().add(generalization);
+		// Create class with a port
+		Class class_ = UMLFactory.eINSTANCE.createClass();
+		class_.setName("C");
+		Port port = UMLFactory.eINSTANCE.createPort();
+		class_.getOwnedPorts().add(port);
+		// Create the activity containing the send signal action
+		Activity activity = UMLFactory.eINSTANCE.createActivity();
+		this.sendSignalAction = UMLFactory.eINSTANCE.createSendSignalAction();
+		this.sendSignalAction.setOnPort(port);
+		activity.getOwnedNodes().add(this.sendSignalAction);
+		// Add the different elements to the model
+		this.umlTestModel.getPackagedElements().add(class_);
+		this.umlTestModel.getPackagedElements().add(activity);
+		this.umlTestModel.getPackagedElements().add(this.baseSignal);
+		this.umlTestModel.getPackagedElements().add(this.extendedSignal);
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestStartClassifierBehaviorActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestStartClassifierBehaviorActionPinDerivation.java
index 78eab127be2..461e2085812 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestStartClassifierBehaviorActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestStartClassifierBehaviorActionPinDerivation.java
@@ -1,126 +1,126 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.StartClassifierBehaviorActionEditPart;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;

-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.StartClassifierBehaviorAction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * 

- * Pin of StartClassifierBehaviorAction should be create and update automatically

- * 

- */

-public class TestStartClassifierBehaviorActionPinDerivation extends AbstractTestPinDerivation {

-

-	/**

-	 * CallBehaviorAction advice identifier

-	 */

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartClassifierBehaviorActionEditHelperAdvice";

-	private StartClassifierBehaviorAction startClassifierBehaviorAction;

-	private Activity activity;

-

-	/**

-	 * Constructor.

-	 */

-	public TestStartClassifierBehaviorActionPinDerivation() {

-		this.activity = null;

-		this.startClassifierBehaviorAction = null;

-		this.populateBaseTestModel();

-		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION

-		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();

-		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.START_CLASSIFIER_BEHAVIOR_ACTION, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the StartClassifierBehaviorAction is available

-	 */

-	@Test

-	public void testAdviceForStartClassifierBehaviorActionExists() {

-		Assert.assertNotNull("StartClassifierBehaviorAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-	}

-

-	/**

-	 * Role:

-	 * - For a StartClassifierBehaviorAction having no referenced signal, ensure that if a signal gets referenced then target and argument pins

-	 * are inferred.

-	 * 

-	 * Scenario:

-	 * - 1] StartClassifierBehaviorAction 'signal' feature is set with the 'baseSignal'

-	 * - 2] Synchronization is performed via the advice

-	 * - StartClassifierBehaviorAction has now 3 pins

-	 * - 1 target (of type C)

-	 * - 2 argument pins (p1 and p2)

-	 */

-	@Test

-	public void testPinDerivation_StartClassifierBehaviorAction() {

-		ConfigureRequest request = new ConfigureRequest(editingDomain, this.startClassifierBehaviorAction, UMLElementTypes.getElementType(StartClassifierBehaviorActionEditPart.VISUAL_ID));

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.activity);

-		ICommand editStartClassifierBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!editStartClassifierBehaviorActionCommand.canExecute()) {

-			Assert.fail("The TestIdentityAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editStartClassifierBehaviorActionCommand));

-		

-		// Assert object

-		Assert.assertTrue("StartClassifierBehaviorAction shall have a target", this.startClassifierBehaviorAction.getObject() != null);

-

-		if (!editStartClassifierBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-		

-		// Create the startClassifierBehaviorAction

-		this.startClassifierBehaviorAction = UMLFactory.eINSTANCE.createStartClassifierBehaviorAction();

-		

-		// Create the activity containing the startClassifierBehaviorAction

-		activity = UMLFactory.eINSTANCE.createActivity();

-		activity.getOwnedNodes().add(this.startClassifierBehaviorAction);

-		

-		// Add the different elements to the model

-		this.umlTestModel.getPackagedElements().add(activity);

-		

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.StartClassifierBehaviorActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.StartClassifierBehaviorAction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * Pin of StartClassifierBehaviorAction should be create and update automatically
+ * 
+ */
+public class TestStartClassifierBehaviorActionPinDerivation extends AbstractTestPinDerivation {
+
+	/**
+	 * CallBehaviorAction advice identifier
+	 */
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartClassifierBehaviorActionEditHelperAdvice";
+	private StartClassifierBehaviorAction startClassifierBehaviorAction;
+	private Activity activity;
+
+	/**
+	 * Constructor.
+	 */
+	public TestStartClassifierBehaviorActionPinDerivation() {
+		this.activity = null;
+		this.startClassifierBehaviorAction = null;
+		this.populateBaseTestModel();
+		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION
+		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
+		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.START_CLASSIFIER_BEHAVIOR_ACTION, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the StartClassifierBehaviorAction is available
+	 */
+	@Test
+	public void testAdviceForStartClassifierBehaviorActionExists() {
+		Assert.assertNotNull("StartClassifierBehaviorAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+	}
+
+	/**
+	 * Role:
+	 * - For a StartClassifierBehaviorAction having no referenced signal, ensure that if a signal gets referenced then target and argument pins
+	 * are inferred.
+	 * 
+	 * Scenario:
+	 * - 1] StartClassifierBehaviorAction 'signal' feature is set with the 'baseSignal'
+	 * - 2] Synchronization is performed via the advice
+	 * - StartClassifierBehaviorAction has now 3 pins
+	 * - 1 target (of type C)
+	 * - 2 argument pins (p1 and p2)
+	 */
+	@Test
+	public void testPinDerivation_StartClassifierBehaviorAction() {
+		ConfigureRequest request = new ConfigureRequest(editingDomain, this.startClassifierBehaviorAction, UMLElementTypes.getElementType(StartClassifierBehaviorActionEditPart.VISUAL_ID));
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.activity);
+		ICommand editStartClassifierBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!editStartClassifierBehaviorActionCommand.canExecute()) {
+			Assert.fail("The TestIdentityAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editStartClassifierBehaviorActionCommand));
+		
+		// Assert object
+		Assert.assertTrue("StartClassifierBehaviorAction shall have a target", this.startClassifierBehaviorAction.getObject() != null);
+
+		if (!editStartClassifierBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+		
+		// Create the startClassifierBehaviorAction
+		this.startClassifierBehaviorAction = UMLFactory.eINSTANCE.createStartClassifierBehaviorAction();
+		
+		// Create the activity containing the startClassifierBehaviorAction
+		activity = UMLFactory.eINSTANCE.createActivity();
+		activity.getOwnedNodes().add(this.startClassifierBehaviorAction);
+		
+		// Add the different elements to the model
+		this.umlTestModel.getPackagedElements().add(activity);
+		
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestStartObjectBehaviorActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestStartObjectBehaviorActionPinDerivation.java
index 4301cea909b..784e361e0fe 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestStartObjectBehaviorActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestStartObjectBehaviorActionPinDerivation.java
@@ -1,426 +1,426 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.Behavior;

-import org.eclipse.uml2.uml.InputPin;

-import org.eclipse.uml2.uml.Parameter;

-import org.eclipse.uml2.uml.ParameterDirectionKind;

-import org.eclipse.uml2.uml.StartObjectBehaviorAction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * 

- * Pins of StartObjectBehaviorAction should be create and update automatically

- * 

- */

-public class TestStartObjectBehaviorActionPinDerivation extends AbstractTestPinDerivation {

-

-	/**

-	 * StartObjectBehaviorAction advice identifier

-	 */

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartObjectBehaviorActionEditHelperAdvice";

-

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_INPUTPIN = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.InputPinStartObjectBehaviorActionEditHelperAdvice";

-	

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_PARAMETER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.ParameterEditHelperAdvice";

-	

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_BEHAVIOR = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.BehaviorEditHelperAdvice";

-	/**

-	 * Function behavior specification N1

-	 */

-	private Behavior behaviorSpecificationFirst;

-

-	/**

-	 * Function behavior specification N2

-	 */

-	private Behavior behaviorSpecificationSecond;

-

-	/**

-	 * The action on which pin derivation is tested;

-	 */

-	private StartObjectBehaviorAction startObjectBehaviorAction;

-

-	/**

-	 * Constructor.

-	 */

-	public TestStartObjectBehaviorActionPinDerivation() {

-		this.behaviorSpecificationFirst = null;

-		this.behaviorSpecificationSecond = null;

-		this.populateBaseTestModel();

-		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION

-		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();

-		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.START_OBJECT_BEHAVIOR_ACTION, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the StartObjectBehaviorAction is available

-	 */

-	@Test

-	public void testAdviceForStartObjectBehaviorActionExists() {

-		Assert.assertNotNull("StartObjectBehaviorAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-		Assert.assertNotNull("InputPin advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_INPUTPIN));

-		Assert.assertNotNull("Parameter advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_PARAMETER));

-		Assert.assertNotNull("Behavior advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_BEHAVIOR));

-	}

-

-	/**

-	 * Role:

-	 * - For a StartObjectBehaviorAction having no behavior, ensure that if a behavior is referenced then the pins corresponding to the

-	 * the behavior signature are inferred. With Synchronous = true.

-	 * 

-	 * Scenario:

-	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'

-	 * - 2] Synchronization is performed via the advice

-	 * - StartObjectBehaviorAction has now 6 pins

-	 * - 1 input (object)

-	 * - 2 inputs (p11, [in] p12)

-	 * - 3 outputs ([out] p12, P13, P14)

-	 */

-	@Test

-	public void testPinDerivation_NoBehavior_To_BehaviorWithParameters_Synchronous() {

-		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);

-		ICommand editStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!editStartObjectBehaviorActionCommand.canExecute()) {

-			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editStartObjectBehaviorActionCommand));

-		

-		// Assert Arguments

-		Assert.assertTrue("The StartObjectBehaviorAction shall have two input pins", this.startObjectBehaviorAction.getArguments().size() == 2);

-		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));

-		

-		// Assert Result

-		Assert.assertTrue("The StartObjectBehaviorAction shall have two output pins", this.startObjectBehaviorAction.getResults().size() == 3);

-		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.startObjectBehaviorAction.getResults(), this.behaviorSpecificationFirst.getOwnedParameters()));

-		

-		if (!editStartObjectBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For a StartObjectBehaviorAction having no behavior, ensure that if a behavior is referenced then the pins corresponding to the

-	 * the behavior signature are inferred. With Synchronous = false.

-	 * 

-	 * Scenario:

-	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'

-	 * - 2] Synchronization is performed via the advice

-	 * - StartObjectBehaviorAction has now 6 pins

-	 * - 1 input (object)

-	 * - 2 inputs (p11, [in] p12)

-	 * - 3 outputs ([out] p12, P13, P14)

-	 * 

-	 * - 3] Synchronous is set to false

-	 * - 4] Synchronization is performed via the advice

-	 * - StartObjectBehaviorAction has now 3 pins

-	 * - 1 input (object)

-	 * - 2 inputs (p11, [in] p12)

-	 */

-	@Test

-	public void testPinDerivation_NoBehavior_To_BehaviorWithParameters_Asynchronous() {

-		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);

-		ICommand editStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!editStartObjectBehaviorActionCommand.canExecute()) {

-			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editStartObjectBehaviorActionCommand));

-		

-		// Set isSynchronous to false

-		request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction, UMLPackage.eINSTANCE.getCallAction_IsSynchronous(), false);

-		ICommand setIsSynchronousCommand = elementEditService.getEditCommand(request);

-		if (!setIsSynchronousCommand.canExecute()) {

-			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(setIsSynchronousCommand));

-		

-		// Assert Arguments

-		Assert.assertTrue("The StartObjectBehaviorAction shall have two input pins", this.startObjectBehaviorAction.getArguments().size() == 2);

-		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));

-		

-		// Assert Result

-		Assert.assertTrue("The StartObjectBehaviorAction shall have zero output pins", this.startObjectBehaviorAction.getResults().size() == 0);

-		

-		if (!setIsSynchronousCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-		if (!editStartObjectBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a StartObjectBehaviorAction having already been synchronized with 'behaviorSpecificationFirst' signature, ensure that if the behavior

-	 * feature of the action evolves then pins are updated accordingly. With Synchronous = true.

-	 * 

-	 * Scenario:

-	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'

-	 * - 2] Synchronization is performed via the advice

-	 * - StartObjectBehaviorAction has now 6 pins

-	 * - 1 input (object)

-	 * - 2 inputs (p11, [in] p12)

-	 * - 3 outputs ([out] p12, P13, P14)

-	 * - 3] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationSecond'

-	 * - 4] Synchronization is performed via the advice

-	 * - StartObjectBehaviorAction has now 3 pins

-	 * - 2 inputs ([in] p21, p22)

-	 * - 1 output ([out] p21)

-	 * 

-	 * Note: along the synchronization process pin '[in] p12' is not deleted but updated with '[in P21]'. This was made possible

-	 * because of type conformance existing between the two pins

-	 */

-	@Test

-	public void testPinDerivation_BehaviorWithParameters_To_OtherBehaviorWithParameters_Synchronous() {

-		// Prepare test model

-		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);

-		ICommand firstEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!firstEditStartObjectBehaviorActionCommand.canExecute()) {

-			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditStartObjectBehaviorActionCommand));

-		InputPin preservedPin = this.startObjectBehaviorAction.getArguments().get(1);

-		

-		// Change behavior for 'behaviorSpecificationSecond'

-		request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationSecond);

-		ICommand secondEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!secondEditStartObjectBehaviorActionCommand.canExecute()) {

-			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditStartObjectBehaviorActionCommand));

-		

-		Assert.assertTrue("The StartObjectBehaviorAction shall have two input pins", this.startObjectBehaviorAction.getArguments().size() == 2);

-		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationSecond.getOwnedParameters()));

-		Assert.assertTrue("This pin shall have been preserved during update", preservedPin == this.startObjectBehaviorAction.getArguments().get(0));

-		Assert.assertTrue("The StartObjectBehaviorAction shall have one output pins", this.startObjectBehaviorAction.getResults().size() == 1);

-		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.startObjectBehaviorAction.getResults(), this.behaviorSpecificationSecond.getOwnedParameters()));

-		

-		if (!secondEditStartObjectBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-		if (!firstEditStartObjectBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a StartObjectBehaviorAction having already been synchronized with 'behaviorSpecificationFirst' signature, ensure that if the behavior

-	 * feature of the action evolves then pins are updated accordingly. With Synchronous = true.

-	 * 

-	 * Scenario:

-	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'

-	 * - 2] Synchronization is performed via the advice

-	 * - StartObjectBehaviorAction has now 6 pins

-	 * - 1 input (object)

-	 * - 2 inputs (p11, [in] p12)

-	 * - 3 outputs ([out] p12, P13, P14)

-	 * - 3] Type of the parameter p11 of the 'behaviorSpecificationFirst' is change

-	 * - 4] Synchronization is performed via the advice

-	 * - StartObjectBehaviorAction has 6 pins

-	 * - 1 input (object)

-	 * - 2 inputs (p11, [in] p12)

-	 * - 3 outputs ([out] p12, P13, P14)

-	 * 

-	 */

-	@Test

-	public void testPinDerivation_BehaviorWithParameters_ChangeParameter_Synchronous() {

-		// Prepare test model

-		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);

-		ICommand firstEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!firstEditStartObjectBehaviorActionCommand.canExecute()) {

-			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditStartObjectBehaviorActionCommand));

-		

-		// Change Type of 'behaviorSpecificationFirst'

-		request = new SetRequest(this.editingDomain, this.behaviorSpecificationFirst.getOwnedParameter("p11", this.getPrimitiveType("UnlimitedNatural")), UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Integer"));

-		ICommand secondEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!secondEditStartObjectBehaviorActionCommand.canExecute()) {

-			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditStartObjectBehaviorActionCommand));

-		

-		Assert.assertTrue("The StartObjectBehaviorAction shall have two input pins", this.startObjectBehaviorAction.getArguments().size() == 2);

-		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));

-		Assert.assertTrue("The StartObjectBehaviorAction shall have one output pins", this.startObjectBehaviorAction.getResults().size() == 3);

-		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.startObjectBehaviorAction.getResults(), this.behaviorSpecificationFirst.getOwnedParameters()));

-		

-		if (!secondEditStartObjectBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-		if (!firstEditStartObjectBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * Role:

-	 * - For a StartObjectBehaviorAction having already been synchronized with 'behaviorSpecificationFirst' signature, ensure that if the behavior

-	 * feature of the action evolves then pins are updated accordingly. With Synchronous = true.

-	 * 

-	 * Scenario:

-	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'

-	 * - 2] Synchronization is performed via the advice

-	 * - StartObjectBehaviorAction has now 6 pins

-	 * - 1 input (object)

-	 * - 2 inputs (p11, [in] p12)

-	 * - 3 outputs ([out] p12, P13, P14)

-	 * - 3] A parameter (INOUT) is add to the Behavior

-	 * - 4] Synchronization is performed via the advice

-	 * - StartObjectBehaviorAction has 8 pins

-	 * - 1 input (object)

-	 * - 3 inputs (p11, [in] p12) + the new one

-	 * - 4 outputs ([out] p12, P13, P14) + the new one

-	 * 

-	 */

-	@Test

-	public void testPinDerivation_BehaviorWithParameters_AddParameter_Synchronous() {

-		// Prepare test model

-		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);

-		ICommand firstEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!firstEditStartObjectBehaviorActionCommand.canExecute()) {

-			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditStartObjectBehaviorActionCommand));

-		

-		// Add paramter to 'behaviorSpecificationFirst'

-		Parameter parameter = UMLFactory.eINSTANCE.createParameter();

-		parameter.setDirection(ParameterDirectionKind.INOUT_LITERAL);

-		request = new SetRequest(this.editingDomain, this.behaviorSpecificationFirst, UMLPackage.eINSTANCE.getBehavior_OwnedParameter(), parameter);

-		ICommand secondEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);

-		if (!secondEditStartObjectBehaviorActionCommand.canExecute()) {

-			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditStartObjectBehaviorActionCommand));

-		

-		Assert.assertTrue("The StartObjectBehaviorAction shall have 3 input pins", this.startObjectBehaviorAction.getArguments().size() == 3);

-		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));

-		Assert.assertTrue("The StartObjectBehaviorAction shall have one output pins", this.startObjectBehaviorAction.getResults().size() == 4);

-		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.startObjectBehaviorAction.getResults(), this.behaviorSpecificationFirst.getOwnedParameters()));

-		

-		if (!secondEditStartObjectBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-		if (!firstEditStartObjectBehaviorActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-	

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#createBaseTestModel()

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-		

-		// Define and attach the first behavior specification to the model

-		this.behaviorSpecificationFirst = UMLFactory.eINSTANCE.createFunctionBehavior();

-		Parameter p11 = UMLFactory.eINSTANCE.createParameter();

-		p11.setName("p11");

-		p11.setDirection(ParameterDirectionKind.IN_LITERAL);

-		p11.setLower(1);

-		p11.setUpper(1);

-		p11.setType(this.getPrimitiveType("UnlimitedNatural"));

-		Parameter p12 = UMLFactory.eINSTANCE.createParameter();

-		p12.setName("p12");

-		p12.setDirection(ParameterDirectionKind.INOUT_LITERAL);

-		p12.setLower(1);

-		p12.setUpper(1);

-		p12.setType(this.getPrimitiveType("String"));

-		Parameter p13 = UMLFactory.eINSTANCE.createParameter();

-		p13.setName("p13");

-		p13.setDirection(ParameterDirectionKind.OUT_LITERAL);

-		p13.setLower(1);

-		p13.setUpper(1);

-		p13.setType(this.getPrimitiveType("String"));

-		Parameter p14 = UMLFactory.eINSTANCE.createParameter();

-		p14.setName("p14");

-		p14.setDirection(ParameterDirectionKind.RETURN_LITERAL);

-		p14.setLower(1);

-		p14.setUpper(1);

-		p14.setType(this.getPrimitiveType("Boolean"));

-		this.behaviorSpecificationFirst.getOwnedParameters().add(p11);

-		this.behaviorSpecificationFirst.getOwnedParameters().add(p12);

-		this.behaviorSpecificationFirst.getOwnedParameters().add(p13);

-		this.behaviorSpecificationFirst.getOwnedParameters().add(p14);

-		

-		// Define and attach the second behavior specification to the model

-		this.behaviorSpecificationSecond = UMLFactory.eINSTANCE.createFunctionBehavior();

-		Parameter p21 = UMLFactory.eINSTANCE.createParameter();

-		p21.setName("p21");

-		p21.setDirection(ParameterDirectionKind.INOUT_LITERAL);

-		p21.setLower(1);

-		p21.setUpper(1);

-		p21.setType(this.getPrimitiveType("String"));

-		Parameter p22 = UMLFactory.eINSTANCE.createParameter();

-		p22.setName("p22");

-		p22.setDirection(ParameterDirectionKind.IN_LITERAL);

-		p22.setLower(1);

-		p22.setUpper(1);

-		p22.setType(this.getPrimitiveType("Integer"));

-		this.behaviorSpecificationSecond.getOwnedParameters().add(p21);

-		this.behaviorSpecificationSecond.getOwnedParameters().add(p22);

-		

-		// Add both behaviors in the model

-		this.umlTestModel.getPackagedElements().add(this.behaviorSpecificationFirst);

-		this.umlTestModel.getPackagedElements().add(this.behaviorSpecificationSecond);

-		

-		// Add the activity which will contain the call behavior action

-		Activity activity = UMLFactory.eINSTANCE.createActivity();

-		this.startObjectBehaviorAction = UMLFactory.eINSTANCE.createStartObjectBehaviorAction();

-		InputPin object = UMLFactory.eINSTANCE.createInputPin();

-		this.startObjectBehaviorAction.setObject(object);

-		activity.getOwnedNodes().add(this.startObjectBehaviorAction);

-		this.umlTestModel.getPackagedElements().add(activity);

-		

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.InputPin;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.StartObjectBehaviorAction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * Pins of StartObjectBehaviorAction should be create and update automatically
+ * 
+ */
+public class TestStartObjectBehaviorActionPinDerivation extends AbstractTestPinDerivation {
+
+	/**
+	 * StartObjectBehaviorAction advice identifier
+	 */
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartObjectBehaviorActionEditHelperAdvice";
+
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_INPUTPIN = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.InputPinStartObjectBehaviorActionEditHelperAdvice";
+	
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_PARAMETER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.ParameterEditHelperAdvice";
+	
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_BEHAVIOR = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.BehaviorEditHelperAdvice";
+	/**
+	 * Function behavior specification N1
+	 */
+	private Behavior behaviorSpecificationFirst;
+
+	/**
+	 * Function behavior specification N2
+	 */
+	private Behavior behaviorSpecificationSecond;
+
+	/**
+	 * The action on which pin derivation is tested;
+	 */
+	private StartObjectBehaviorAction startObjectBehaviorAction;
+
+	/**
+	 * Constructor.
+	 */
+	public TestStartObjectBehaviorActionPinDerivation() {
+		this.behaviorSpecificationFirst = null;
+		this.behaviorSpecificationSecond = null;
+		this.populateBaseTestModel();
+		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION
+		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
+		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.START_OBJECT_BEHAVIOR_ACTION, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the StartObjectBehaviorAction is available
+	 */
+	@Test
+	public void testAdviceForStartObjectBehaviorActionExists() {
+		Assert.assertNotNull("StartObjectBehaviorAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+		Assert.assertNotNull("InputPin advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_INPUTPIN));
+		Assert.assertNotNull("Parameter advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_PARAMETER));
+		Assert.assertNotNull("Behavior advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_BEHAVIOR));
+	}
+
+	/**
+	 * Role:
+	 * - For a StartObjectBehaviorAction having no behavior, ensure that if a behavior is referenced then the pins corresponding to the
+	 * the behavior signature are inferred. With Synchronous = true.
+	 * 
+	 * Scenario:
+	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'
+	 * - 2] Synchronization is performed via the advice
+	 * - StartObjectBehaviorAction has now 6 pins
+	 * - 1 input (object)
+	 * - 2 inputs (p11, [in] p12)
+	 * - 3 outputs ([out] p12, P13, P14)
+	 */
+	@Test
+	public void testPinDerivation_NoBehavior_To_BehaviorWithParameters_Synchronous() {
+		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);
+		ICommand editStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!editStartObjectBehaviorActionCommand.canExecute()) {
+			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editStartObjectBehaviorActionCommand));
+		
+		// Assert Arguments
+		Assert.assertTrue("The StartObjectBehaviorAction shall have two input pins", this.startObjectBehaviorAction.getArguments().size() == 2);
+		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));
+		
+		// Assert Result
+		Assert.assertTrue("The StartObjectBehaviorAction shall have two output pins", this.startObjectBehaviorAction.getResults().size() == 3);
+		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.startObjectBehaviorAction.getResults(), this.behaviorSpecificationFirst.getOwnedParameters()));
+		
+		if (!editStartObjectBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For a StartObjectBehaviorAction having no behavior, ensure that if a behavior is referenced then the pins corresponding to the
+	 * the behavior signature are inferred. With Synchronous = false.
+	 * 
+	 * Scenario:
+	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'
+	 * - 2] Synchronization is performed via the advice
+	 * - StartObjectBehaviorAction has now 6 pins
+	 * - 1 input (object)
+	 * - 2 inputs (p11, [in] p12)
+	 * - 3 outputs ([out] p12, P13, P14)
+	 * 
+	 * - 3] Synchronous is set to false
+	 * - 4] Synchronization is performed via the advice
+	 * - StartObjectBehaviorAction has now 3 pins
+	 * - 1 input (object)
+	 * - 2 inputs (p11, [in] p12)
+	 */
+	@Test
+	public void testPinDerivation_NoBehavior_To_BehaviorWithParameters_Asynchronous() {
+		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);
+		ICommand editStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!editStartObjectBehaviorActionCommand.canExecute()) {
+			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editStartObjectBehaviorActionCommand));
+		
+		// Set isSynchronous to false
+		request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction, UMLPackage.eINSTANCE.getCallAction_IsSynchronous(), false);
+		ICommand setIsSynchronousCommand = elementEditService.getEditCommand(request);
+		if (!setIsSynchronousCommand.canExecute()) {
+			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(setIsSynchronousCommand));
+		
+		// Assert Arguments
+		Assert.assertTrue("The StartObjectBehaviorAction shall have two input pins", this.startObjectBehaviorAction.getArguments().size() == 2);
+		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));
+		
+		// Assert Result
+		Assert.assertTrue("The StartObjectBehaviorAction shall have zero output pins", this.startObjectBehaviorAction.getResults().size() == 0);
+		
+		if (!setIsSynchronousCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+		if (!editStartObjectBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a StartObjectBehaviorAction having already been synchronized with 'behaviorSpecificationFirst' signature, ensure that if the behavior
+	 * feature of the action evolves then pins are updated accordingly. With Synchronous = true.
+	 * 
+	 * Scenario:
+	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'
+	 * - 2] Synchronization is performed via the advice
+	 * - StartObjectBehaviorAction has now 6 pins
+	 * - 1 input (object)
+	 * - 2 inputs (p11, [in] p12)
+	 * - 3 outputs ([out] p12, P13, P14)
+	 * - 3] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationSecond'
+	 * - 4] Synchronization is performed via the advice
+	 * - StartObjectBehaviorAction has now 3 pins
+	 * - 2 inputs ([in] p21, p22)
+	 * - 1 output ([out] p21)
+	 * 
+	 * Note: along the synchronization process pin '[in] p12' is not deleted but updated with '[in P21]'. This was made possible
+	 * because of type conformance existing between the two pins
+	 */
+	@Test
+	public void testPinDerivation_BehaviorWithParameters_To_OtherBehaviorWithParameters_Synchronous() {
+		// Prepare test model
+		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);
+		ICommand firstEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!firstEditStartObjectBehaviorActionCommand.canExecute()) {
+			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditStartObjectBehaviorActionCommand));
+		InputPin preservedPin = this.startObjectBehaviorAction.getArguments().get(1);
+		
+		// Change behavior for 'behaviorSpecificationSecond'
+		request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationSecond);
+		ICommand secondEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!secondEditStartObjectBehaviorActionCommand.canExecute()) {
+			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditStartObjectBehaviorActionCommand));
+		
+		Assert.assertTrue("The StartObjectBehaviorAction shall have two input pins", this.startObjectBehaviorAction.getArguments().size() == 2);
+		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationSecond.getOwnedParameters()));
+		Assert.assertTrue("This pin shall have been preserved during update", preservedPin == this.startObjectBehaviorAction.getArguments().get(0));
+		Assert.assertTrue("The StartObjectBehaviorAction shall have one output pins", this.startObjectBehaviorAction.getResults().size() == 1);
+		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.startObjectBehaviorAction.getResults(), this.behaviorSpecificationSecond.getOwnedParameters()));
+		
+		if (!secondEditStartObjectBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+		if (!firstEditStartObjectBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a StartObjectBehaviorAction having already been synchronized with 'behaviorSpecificationFirst' signature, ensure that if the behavior
+	 * feature of the action evolves then pins are updated accordingly. With Synchronous = true.
+	 * 
+	 * Scenario:
+	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'
+	 * - 2] Synchronization is performed via the advice
+	 * - StartObjectBehaviorAction has now 6 pins
+	 * - 1 input (object)
+	 * - 2 inputs (p11, [in] p12)
+	 * - 3 outputs ([out] p12, P13, P14)
+	 * - 3] Type of the parameter p11 of the 'behaviorSpecificationFirst' is change
+	 * - 4] Synchronization is performed via the advice
+	 * - StartObjectBehaviorAction has 6 pins
+	 * - 1 input (object)
+	 * - 2 inputs (p11, [in] p12)
+	 * - 3 outputs ([out] p12, P13, P14)
+	 * 
+	 */
+	@Test
+	public void testPinDerivation_BehaviorWithParameters_ChangeParameter_Synchronous() {
+		// Prepare test model
+		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);
+		ICommand firstEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!firstEditStartObjectBehaviorActionCommand.canExecute()) {
+			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditStartObjectBehaviorActionCommand));
+		
+		// Change Type of 'behaviorSpecificationFirst'
+		request = new SetRequest(this.editingDomain, this.behaviorSpecificationFirst.getOwnedParameter("p11", this.getPrimitiveType("UnlimitedNatural")), UMLPackage.eINSTANCE.getTypedElement_Type(), this.getPrimitiveType("Integer"));
+		ICommand secondEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!secondEditStartObjectBehaviorActionCommand.canExecute()) {
+			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditStartObjectBehaviorActionCommand));
+		
+		Assert.assertTrue("The StartObjectBehaviorAction shall have two input pins", this.startObjectBehaviorAction.getArguments().size() == 2);
+		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));
+		Assert.assertTrue("The StartObjectBehaviorAction shall have one output pins", this.startObjectBehaviorAction.getResults().size() == 3);
+		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.startObjectBehaviorAction.getResults(), this.behaviorSpecificationFirst.getOwnedParameters()));
+		
+		if (!secondEditStartObjectBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+		if (!firstEditStartObjectBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * Role:
+	 * - For a StartObjectBehaviorAction having already been synchronized with 'behaviorSpecificationFirst' signature, ensure that if the behavior
+	 * feature of the action evolves then pins are updated accordingly. With Synchronous = true.
+	 * 
+	 * Scenario:
+	 * - 1] StartObjectBehaviorAction object feature is set with as type the function behavior 'behaviorSpecificationFirst'
+	 * - 2] Synchronization is performed via the advice
+	 * - StartObjectBehaviorAction has now 6 pins
+	 * - 1 input (object)
+	 * - 2 inputs (p11, [in] p12)
+	 * - 3 outputs ([out] p12, P13, P14)
+	 * - 3] A parameter (INOUT) is add to the Behavior
+	 * - 4] Synchronization is performed via the advice
+	 * - StartObjectBehaviorAction has 8 pins
+	 * - 1 input (object)
+	 * - 3 inputs (p11, [in] p12) + the new one
+	 * - 4 outputs ([out] p12, P13, P14) + the new one
+	 * 
+	 */
+	@Test
+	public void testPinDerivation_BehaviorWithParameters_AddParameter_Synchronous() {
+		// Prepare test model
+		SetRequest request = new SetRequest(this.editingDomain, this.startObjectBehaviorAction.getObject(), UMLPackage.eINSTANCE.getTypedElement_Type(), this.behaviorSpecificationFirst);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.startObjectBehaviorAction);
+		ICommand firstEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!firstEditStartObjectBehaviorActionCommand.canExecute()) {
+			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(firstEditStartObjectBehaviorActionCommand));
+		
+		// Add paramter to 'behaviorSpecificationFirst'
+		Parameter parameter = UMLFactory.eINSTANCE.createParameter();
+		parameter.setDirection(ParameterDirectionKind.INOUT_LITERAL);
+		request = new SetRequest(this.editingDomain, this.behaviorSpecificationFirst, UMLPackage.eINSTANCE.getBehavior_OwnedParameter(), parameter);
+		ICommand secondEditStartObjectBehaviorActionCommand = elementEditService.getEditCommand(request);
+		if (!secondEditStartObjectBehaviorActionCommand.canExecute()) {
+			Assert.fail("The StartObjectBehaviorAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(secondEditStartObjectBehaviorActionCommand));
+		
+		Assert.assertTrue("The StartObjectBehaviorAction shall have 3 input pins", this.startObjectBehaviorAction.getArguments().size() == 3);
+		Assert.assertTrue("Input pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertArgumentsAndParametersCohesion(this.startObjectBehaviorAction.getArguments(), this.behaviorSpecificationFirst.getOwnedParameters()));
+		Assert.assertTrue("The StartObjectBehaviorAction shall have one output pins", this.startObjectBehaviorAction.getResults().size() == 4);
+		Assert.assertTrue("Output pins and behavior parameters are not cohesive", PinDerivationAssertionUtils.assertResultsAndParametersCohesion(this.startObjectBehaviorAction.getResults(), this.behaviorSpecificationFirst.getOwnedParameters()));
+		
+		if (!secondEditStartObjectBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+		if (!firstEditStartObjectBehaviorActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+	
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#createBaseTestModel()
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+		
+		// Define and attach the first behavior specification to the model
+		this.behaviorSpecificationFirst = UMLFactory.eINSTANCE.createFunctionBehavior();
+		Parameter p11 = UMLFactory.eINSTANCE.createParameter();
+		p11.setName("p11");
+		p11.setDirection(ParameterDirectionKind.IN_LITERAL);
+		p11.setLower(1);
+		p11.setUpper(1);
+		p11.setType(this.getPrimitiveType("UnlimitedNatural"));
+		Parameter p12 = UMLFactory.eINSTANCE.createParameter();
+		p12.setName("p12");
+		p12.setDirection(ParameterDirectionKind.INOUT_LITERAL);
+		p12.setLower(1);
+		p12.setUpper(1);
+		p12.setType(this.getPrimitiveType("String"));
+		Parameter p13 = UMLFactory.eINSTANCE.createParameter();
+		p13.setName("p13");
+		p13.setDirection(ParameterDirectionKind.OUT_LITERAL);
+		p13.setLower(1);
+		p13.setUpper(1);
+		p13.setType(this.getPrimitiveType("String"));
+		Parameter p14 = UMLFactory.eINSTANCE.createParameter();
+		p14.setName("p14");
+		p14.setDirection(ParameterDirectionKind.RETURN_LITERAL);
+		p14.setLower(1);
+		p14.setUpper(1);
+		p14.setType(this.getPrimitiveType("Boolean"));
+		this.behaviorSpecificationFirst.getOwnedParameters().add(p11);
+		this.behaviorSpecificationFirst.getOwnedParameters().add(p12);
+		this.behaviorSpecificationFirst.getOwnedParameters().add(p13);
+		this.behaviorSpecificationFirst.getOwnedParameters().add(p14);
+		
+		// Define and attach the second behavior specification to the model
+		this.behaviorSpecificationSecond = UMLFactory.eINSTANCE.createFunctionBehavior();
+		Parameter p21 = UMLFactory.eINSTANCE.createParameter();
+		p21.setName("p21");
+		p21.setDirection(ParameterDirectionKind.INOUT_LITERAL);
+		p21.setLower(1);
+		p21.setUpper(1);
+		p21.setType(this.getPrimitiveType("String"));
+		Parameter p22 = UMLFactory.eINSTANCE.createParameter();
+		p22.setName("p22");
+		p22.setDirection(ParameterDirectionKind.IN_LITERAL);
+		p22.setLower(1);
+		p22.setUpper(1);
+		p22.setType(this.getPrimitiveType("Integer"));
+		this.behaviorSpecificationSecond.getOwnedParameters().add(p21);
+		this.behaviorSpecificationSecond.getOwnedParameters().add(p22);
+		
+		// Add both behaviors in the model
+		this.umlTestModel.getPackagedElements().add(this.behaviorSpecificationFirst);
+		this.umlTestModel.getPackagedElements().add(this.behaviorSpecificationSecond);
+		
+		// Add the activity which will contain the call behavior action
+		Activity activity = UMLFactory.eINSTANCE.createActivity();
+		this.startObjectBehaviorAction = UMLFactory.eINSTANCE.createStartObjectBehaviorAction();
+		InputPin object = UMLFactory.eINSTANCE.createInputPin();
+		this.startObjectBehaviorAction.setObject(object);
+		activity.getOwnedNodes().add(this.startObjectBehaviorAction);
+		this.umlTestModel.getPackagedElements().add(activity);
+		
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestTestIdentityActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestTestIdentityActionPinDerivation.java
index 5ad63938c22..c69d5063141 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestTestIdentityActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestTestIdentityActionPinDerivation.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.TestIdentityActionEditPart;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.TestIdentityAction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * 

- * Pins of TestIdentityAction should be create automatically

- * 

- */

-public class TestTestIdentityActionPinDerivation extends AbstractTestPinDerivation {

-

-

-	/**

-	 * CallBehaviorAction advice identifier

-	 */

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.TestIdentityActionEditHelperAdvice";

-

-	private TestIdentityAction testIdentityAction;

-

-	private Activity activity;

-

-	/**

-	 * Constructor.

-	 */

-	public TestTestIdentityActionPinDerivation() {

-		this.testIdentityAction = null;

-		this.activity = null;

-		this.populateBaseTestModel();

-		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION

-		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();

-		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.TEST_IDENTITY_ACTION, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the TestIdentityAction is available

-	 */

-	@Test

-	public void testAdviceForTestIdentityActionExists() {

-		Assert.assertNotNull("TestIdentityAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-	}

-

-	/**

-	 * Role:

-	 * - For a TestIdentityAction insertion ensure that if the the 'signal' feature

-	 * of the action evolves then pins are updated accordingly

-	 * 

-	 * Scenario:

-	 * - 1] Insertion in the activity of testIdentityAction

-	 * - 2] Synchronization is performed via the advice

-	 * - testIdentityAction has now 3 pins

-	 * - 1 first untyped [in]

-	 * - 1 second untyped [in]

-	 * - 1 result typed by Boolean [out]

-	 *  

-	 */

-	@Test

-	public void testPinDerivation_Creation() {

-		ConfigureRequest request = new ConfigureRequest(editingDomain, testIdentityAction, org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes.getElementType(TestIdentityActionEditPart.VISUAL_ID));

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.activity);

-		ICommand testIdentityActionCommand = elementEditService.getEditCommand(request);

-		if (!testIdentityActionCommand.canExecute()) {

-			Assert.fail("The TestIdentityAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(testIdentityActionCommand));

-

-		// Assert first derivation

-		Assert.assertTrue("TestIdentityAction shall have a first", this.testIdentityAction.getFirst() != null);

-		Assert.assertTrue("TestIdentityAction shall have a first without a type", this.testIdentityAction.getFirst().getType() == null);

-		// Assert second derivation

-		Assert.assertTrue("TestIdentityAction shall have a second", this.testIdentityAction.getSecond() != null);

-		Assert.assertTrue("TestIdentityAction shall have a second without a type", this.testIdentityAction.getSecond().getType() == null);

-		// Assert result derivation

-		Assert.assertTrue("TestIdentityAction shall have a result", this.testIdentityAction.getResult() != null);

-		Assert.assertTrue("TestIdentityAction shall have a result typed by Boolean", this.testIdentityAction.getResult().getType() == this.getPrimitiveType("Boolean"));

-

-		if (!testIdentityActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-

-		// Create the activity containing the send signal action

-		activity = UMLFactory.eINSTANCE.createActivity();

-		this.testIdentityAction = UMLFactory.eINSTANCE.createTestIdentityAction();

-

-		// Add the different elements to the model

-		this.umlTestModel.getPackagedElements().add(activity);

-		activity.getOwnedNodes().add(testIdentityAction);

-

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.TestIdentityActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.TestIdentityAction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * Pins of TestIdentityAction should be create automatically
+ * 
+ */
+public class TestTestIdentityActionPinDerivation extends AbstractTestPinDerivation {
+
+
+	/**
+	 * CallBehaviorAction advice identifier
+	 */
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.TestIdentityActionEditHelperAdvice";
+
+	private TestIdentityAction testIdentityAction;
+
+	private Activity activity;
+
+	/**
+	 * Constructor.
+	 */
+	public TestTestIdentityActionPinDerivation() {
+		this.testIdentityAction = null;
+		this.activity = null;
+		this.populateBaseTestModel();
+		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION
+		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
+		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.TEST_IDENTITY_ACTION, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the TestIdentityAction is available
+	 */
+	@Test
+	public void testAdviceForTestIdentityActionExists() {
+		Assert.assertNotNull("TestIdentityAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+	}
+
+	/**
+	 * Role:
+	 * - For a TestIdentityAction insertion ensure that if the the 'signal' feature
+	 * of the action evolves then pins are updated accordingly
+	 * 
+	 * Scenario:
+	 * - 1] Insertion in the activity of testIdentityAction
+	 * - 2] Synchronization is performed via the advice
+	 * - testIdentityAction has now 3 pins
+	 * - 1 first untyped [in]
+	 * - 1 second untyped [in]
+	 * - 1 result typed by Boolean [out]
+	 *  
+	 */
+	@Test
+	public void testPinDerivation_Creation() {
+		ConfigureRequest request = new ConfigureRequest(editingDomain, testIdentityAction, org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes.getElementType(TestIdentityActionEditPart.VISUAL_ID));
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.activity);
+		ICommand testIdentityActionCommand = elementEditService.getEditCommand(request);
+		if (!testIdentityActionCommand.canExecute()) {
+			Assert.fail("The TestIdentityAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(testIdentityActionCommand));
+
+		// Assert first derivation
+		Assert.assertTrue("TestIdentityAction shall have a first", this.testIdentityAction.getFirst() != null);
+		Assert.assertTrue("TestIdentityAction shall have a first without a type", this.testIdentityAction.getFirst().getType() == null);
+		// Assert second derivation
+		Assert.assertTrue("TestIdentityAction shall have a second", this.testIdentityAction.getSecond() != null);
+		Assert.assertTrue("TestIdentityAction shall have a second without a type", this.testIdentityAction.getSecond().getType() == null);
+		// Assert result derivation
+		Assert.assertTrue("TestIdentityAction shall have a result", this.testIdentityAction.getResult() != null);
+		Assert.assertTrue("TestIdentityAction shall have a result typed by Boolean", this.testIdentityAction.getResult().getType() == this.getPrimitiveType("Boolean"));
+
+		if (!testIdentityActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+
+		// Create the activity containing the send signal action
+		activity = UMLFactory.eINSTANCE.createActivity();
+		this.testIdentityAction = UMLFactory.eINSTANCE.createTestIdentityAction();
+
+		// Add the different elements to the model
+		this.umlTestModel.getPackagedElements().add(activity);
+		activity.getOwnedNodes().add(testIdentityAction);
+
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestValueSpecificationActionPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestValueSpecificationActionPinDerivation.java
index e91e324e9a2..9f28db27e7e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestValueSpecificationActionPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/TestValueSpecificationActionPinDerivation.java
@@ -1,376 +1,376 @@
-/*****************************************************************************

- * 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.uml.diagram.activity.tests.derivation.pins;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;

-import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.Class;

-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.LiteralBoolean;

-import org.eclipse.uml2.uml.LiteralInteger;

-import org.eclipse.uml2.uml.LiteralReal;

-import org.eclipse.uml2.uml.LiteralString;

-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.ValueSpecificationAction;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * 

- * Pin of ValueSpecificationAction should be create and update automatically

- *

- */

-public class TestValueSpecificationActionPinDerivation extends AbstractTestPinDerivation {

-

-	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.ValueSpecificationActionEditHelperAdvice";

-

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_INSTANCE_SPECIFICATION = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceSpecificationEditHelperAdvice";

-

-	private final String TARGET_ADVICE_IDENTIFIER_FOR_INSTANCE_VALUE = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceValueEditHelperAdvice";

-

-	private ValueSpecificationAction valueSpecificationAction;

-

-	private LiteralInteger integer;

-

-	private LiteralBoolean bool;

-

-	private LiteralString string;

-

-	private LiteralUnlimitedNatural unlimitedNatural;

-

-	private LiteralReal real;

-

-	private InstanceValue enumerationInstanceValue;

-

-	private Enumeration enumeration;

-

-	private Class class1;

-

-	private InstanceValue instanceSpecInstanceValue;

-

-	/**

-	 * Constructor.

-	 */

-	public TestValueSpecificationActionPinDerivation() {

-		this.integer = null;

-		this.bool = null;

-		this.string = null;

-		this.unlimitedNatural = null;

-		this.real = null;

-		this.enumerationInstanceValue = null;

-		this.enumeration = null;

-		this.class1 = null;

-		this.instanceSpecInstanceValue = null;

-		this.populateBaseTestModel();

-		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION

-		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();

-		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.VALUE_SPECIFICATION_ACTION, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);

-	}

-

-	/**

-	 * Role:

-	 * - Ensure that the advice for the ValueSpecificationAction is available

-	 */

-	@Test

-	public void testAdviceForValueSpecificationActionExists() {

-		Assert.assertNotNull("ValueSpecificationAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));

-		Assert.assertNotNull("InstanceSpecification advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_INSTANCE_SPECIFICATION));

-		Assert.assertNotNull("InstanceValue advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_INSTANCE_VALUE));

-	}

-

-	/**

-	 * Role:

-	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin

-	 * is inferred.

-	 * 

-	 * Scenario:

-	 * - 1] ValueSpecificationAction 'value' feature is set with the 'integer'

-	 * - 2] Synchronization is performed via the advice

-	 * - ValueSpecificationAction has now 1 pin

-	 * - 1 result (typed by Integer)

-	 */

-	@Test

-	public void testPinDerivation_NoValue_ToLiteralIntegerValue() {

-		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.integer);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);

-		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);

-		if (!editValueSpecificationActionCommand.canExecute()) {

-			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));

-

-		// Assert target derivation

-		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null); 

-		Assert.assertTrue("ValueSpecificationAction shall have a result typed by Integer", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("Integer"));

-

-		if (!editValueSpecificationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin

-	 * is inferred.

-	 * 

-	 * Scenario:

-	 * - 1] ValueSpecificationAction 'value' feature is set with the 'boolean'

-	 * - 2] Synchronization is performed via the advice

-	 * - ValueSpecificationAction has now 1 pin

-	 * - 1 result (typed by Boolean)

-	 */

-	@Test

-	public void testPinDerivation_NoValue_ToLiteralBooleanValue() {

-		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.bool);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);

-		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);

-		if (!editValueSpecificationActionCommand.canExecute()) {

-			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));

-

-		// Assert target derivation

-		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null); 

-		Assert.assertTrue("ValueSpecificationAction shall have a result typed by Boolean", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("Boolean"));

-

-		if (!editValueSpecificationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin

-	 * is inferred.

-	 * 

-	 * Scenario:

-	 * - 1] ValueSpecificationAction 'value' feature is set with the 'string'

-	 * - 2] Synchronization is performed via the advice

-	 * - ValueSpecificationAction has now 1 pin

-	 * - 1 result (typed by String)

-	 */

-	@Test

-	public void testPinDerivation_NoValue_ToLiteralStringValue() {

-		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.string);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);

-		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);

-		if (!editValueSpecificationActionCommand.canExecute()) {

-			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));

-

-		// Assert target derivation

-		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);

-		Assert.assertTrue("ValueSpecificationAction shall have a result typed by String", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("String"));

-

-		if (!editValueSpecificationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin

-	 * is inferred.

-	 * 

-	 * Scenario:

-	 * - 1] ValueSpecificationAction 'value' feature is set with the 'string'

-	 * - 2] Synchronization is performed via the advice

-	 * - ValueSpecificationAction has now 1 pin

-	 * - 1 result (typed by String)

-	 */

-	@Test

-	public void testPinDerivation_NoValue_ToLiteralUnlimitedNaturalValue() {

-		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.unlimitedNatural);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);

-		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);

-		if (!editValueSpecificationActionCommand.canExecute()) {

-			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));

-

-		// Assert target derivation

-		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);

-		Assert.assertTrue("ValueSpecificationAction shall have a result typed by UnlimitedNatural", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("UnlimitedNatural"));

-

-		if (!editValueSpecificationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin

-	 * is inferred.

-	 * 

-	 * Scenario:

-	 * - 1] ValueSpecificationAction 'value' feature is set with the 'string'

-	 * - 2] Synchronization is performed via the advice

-	 * - ValueSpecificationAction has now 1 pin

-	 * - 1 result (typed by String)

-	 */

-	@Test

-	public void testPinDerivation_NoValue_ToLiteralRealValue() {

-		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.real);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);

-		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);

-		if (!editValueSpecificationActionCommand.canExecute()) {

-			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));

-

-		// Assert target derivation

-		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);

-		Assert.assertTrue("ValueSpecificationAction shall have a result typed by Real", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("Real"));

-

-		if (!editValueSpecificationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin

-	 * is inferred.

-	 * 

-	 * Scenario:

-	 * - 1] ValueSpecificationAction 'value' feature is set with the 'enumerationInstance'

-	 * - 2] Synchronization is performed via the advice

-	 * - ValueSpecificationAction has now 1 pin

-	 * - 1 result (typed by the enumeration)

-	 */

-	@Test

-	public void testPinDerivation_NoValue_ToLiteralEnumerationValue() {

-		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.enumerationInstanceValue);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);

-		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);

-		if (!editValueSpecificationActionCommand.canExecute()) {

-			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));

-

-		// Assert target derivation

-		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);

-		Assert.assertTrue("ValueSpecificationAction shall have a result typed by enumeration", this.valueSpecificationAction.getResult().getType() == this.enumeration);

-

-		if (!editValueSpecificationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * Role:

-	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin

-	 * is inferred.

-	 * 

-	 * Scenario:

-	 * - 1] ValueSpecificationAction 'value' feature is set with the 'instanceSpecification'

-	 * - 2] Synchronization is performed via the advice

-	 * - ValueSpecificationAction has now 1 pin

-	 * - 1 result (typed by clazz)

-	 */

-	@Test

-	public void testPinDerivation_NoValue_ToInstanceSpecificationValueSingleClassifier() {

-		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.instanceSpecInstanceValue);

-		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);

-		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);

-		if (!editValueSpecificationActionCommand.canExecute()) {

-			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");

-		}

-		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));

-

-		// Assert target derivation

-		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);

-		Assert.assertTrue("ValueSpecificationAction shall have a result typed by clazz", this.valueSpecificationAction.getResult().getType() == this.class1);

-

-		if (!editValueSpecificationActionCommand.canUndo()) {

-			Assert.fail("It shall be possible to undo the pin derivation");

-		}

-		this.editingDomain.getCommandStack().undo();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()

-	 *

-	 */

-	@Override

-	public void populateBaseTestModel() {

-		super.populateBaseTestModel();

-		// Create LiteralInteger

-		integer = UMLFactory.eINSTANCE.createLiteralInteger();

-

-		// Create LiteralBoolean

-		bool = UMLFactory.eINSTANCE.createLiteralBoolean();

-

-		// Create LiteralString

-		string = UMLFactory.eINSTANCE.createLiteralString();

-

-		// Create LiteralUnlimitedNatural

-		unlimitedNatural = UMLFactory.eINSTANCE.createLiteralUnlimitedNatural();

-

-		// Create LiteralReal

-		real = UMLFactory.eINSTANCE.createLiteralReal();

-

-		// Create EnumerationInstanceValue

-		enumerationInstanceValue = UMLFactory.eINSTANCE.createInstanceValue();

-		enumeration = UMLFactory.eINSTANCE.createEnumeration();

-		EnumerationLiteral enumerationLiteral = UMLFactory.eINSTANCE.createEnumerationLiteral();

-		enumeration.getOwnedLiterals().add(enumerationLiteral);

-		enumerationInstanceValue.setInstance(enumerationLiteral);

-

-		// Create InstanceSpecification

-		instanceSpecInstanceValue = UMLFactory.eINSTANCE.createInstanceValue();

-		class1 = UMLFactory.eINSTANCE.createClass();

-		class1.setName("C1");

-		InstanceSpecification instanceSpec = UMLFactory.eINSTANCE.createInstanceSpecification();

-		instanceSpec.getClassifiers().add(class1);

-		instanceSpecInstanceValue.setInstance(instanceSpec);

-

-		// Create the activity containing the send signal action

-		Activity activity = UMLFactory.eINSTANCE.createActivity();

-		this.valueSpecificationAction = UMLFactory.eINSTANCE.createValueSpecificationAction();

-		activity.getOwnedNodes().add(this.valueSpecificationAction);

-

-		// Add the different elements to the model

-		this.umlTestModel.getPackagedElements().add(activity);

-

-		// Add the test model within the model set

-		Resource umlTestModelResource = new ResourceImpl();

-		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));

-		umlTestModelResource.getContents().add(this.umlTestModel);

-		this.modelSet.getResources().add(umlTestModelResource);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.activity.tests.derivation.pins;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer;
+import org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.IAutomatedModelCompletionPreferencesConstants;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.Class;
+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.LiteralBoolean;
+import org.eclipse.uml2.uml.LiteralInteger;
+import org.eclipse.uml2.uml.LiteralReal;
+import org.eclipse.uml2.uml.LiteralString;
+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.ValueSpecificationAction;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * Pin of ValueSpecificationAction should be create and update automatically
+ *
+ */
+public class TestValueSpecificationActionPinDerivation extends AbstractTestPinDerivation {
+
+	private final String TARGET_ADVICE_IDENTIFIER = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.ValueSpecificationActionEditHelperAdvice";
+
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_INSTANCE_SPECIFICATION = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceSpecificationEditHelperAdvice";
+
+	private final String TARGET_ADVICE_IDENTIFIER_FOR_INSTANCE_VALUE = "org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceValueEditHelperAdvice";
+
+	private ValueSpecificationAction valueSpecificationAction;
+
+	private LiteralInteger integer;
+
+	private LiteralBoolean bool;
+
+	private LiteralString string;
+
+	private LiteralUnlimitedNatural unlimitedNatural;
+
+	private LiteralReal real;
+
+	private InstanceValue enumerationInstanceValue;
+
+	private Enumeration enumeration;
+
+	private Class class1;
+
+	private InstanceValue instanceSpecInstanceValue;
+
+	/**
+	 * Constructor.
+	 */
+	public TestValueSpecificationActionPinDerivation() {
+		this.integer = null;
+		this.bool = null;
+		this.string = null;
+		this.unlimitedNatural = null;
+		this.real = null;
+		this.enumerationInstanceValue = null;
+		this.enumeration = null;
+		this.class1 = null;
+		this.instanceSpecInstanceValue = null;
+		this.populateBaseTestModel();
+		// Set Automated Model Completion preference to PIN_SYNCHRONIZATION
+		IPreferenceStore prefStore = Activator.getDefault().getPreferenceStore();
+		prefStore.setValue(IAutomatedModelCompletionPreferencesConstants.VALUE_SPECIFICATION_ACTION, AutomatedModelCompletionPreferencesInitializer.PIN_SYNCHRONIZATION);
+	}
+
+	/**
+	 * Role:
+	 * - Ensure that the advice for the ValueSpecificationAction is available
+	 */
+	@Test
+	public void testAdviceForValueSpecificationActionExists() {
+		Assert.assertNotNull("ValueSpecificationAction advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER));
+		Assert.assertNotNull("InstanceSpecification advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_INSTANCE_SPECIFICATION));
+		Assert.assertNotNull("InstanceValue advice for activity models is missing", this.getAdvice(TARGET_ADVICE_IDENTIFIER_FOR_INSTANCE_VALUE));
+	}
+
+	/**
+	 * Role:
+	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin
+	 * is inferred.
+	 * 
+	 * Scenario:
+	 * - 1] ValueSpecificationAction 'value' feature is set with the 'integer'
+	 * - 2] Synchronization is performed via the advice
+	 * - ValueSpecificationAction has now 1 pin
+	 * - 1 result (typed by Integer)
+	 */
+	@Test
+	public void testPinDerivation_NoValue_ToLiteralIntegerValue() {
+		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.integer);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);
+		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);
+		if (!editValueSpecificationActionCommand.canExecute()) {
+			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));
+
+		// Assert target derivation
+		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null); 
+		Assert.assertTrue("ValueSpecificationAction shall have a result typed by Integer", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("Integer"));
+
+		if (!editValueSpecificationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin
+	 * is inferred.
+	 * 
+	 * Scenario:
+	 * - 1] ValueSpecificationAction 'value' feature is set with the 'boolean'
+	 * - 2] Synchronization is performed via the advice
+	 * - ValueSpecificationAction has now 1 pin
+	 * - 1 result (typed by Boolean)
+	 */
+	@Test
+	public void testPinDerivation_NoValue_ToLiteralBooleanValue() {
+		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.bool);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);
+		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);
+		if (!editValueSpecificationActionCommand.canExecute()) {
+			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));
+
+		// Assert target derivation
+		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null); 
+		Assert.assertTrue("ValueSpecificationAction shall have a result typed by Boolean", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("Boolean"));
+
+		if (!editValueSpecificationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin
+	 * is inferred.
+	 * 
+	 * Scenario:
+	 * - 1] ValueSpecificationAction 'value' feature is set with the 'string'
+	 * - 2] Synchronization is performed via the advice
+	 * - ValueSpecificationAction has now 1 pin
+	 * - 1 result (typed by String)
+	 */
+	@Test
+	public void testPinDerivation_NoValue_ToLiteralStringValue() {
+		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.string);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);
+		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);
+		if (!editValueSpecificationActionCommand.canExecute()) {
+			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));
+
+		// Assert target derivation
+		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);
+		Assert.assertTrue("ValueSpecificationAction shall have a result typed by String", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("String"));
+
+		if (!editValueSpecificationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin
+	 * is inferred.
+	 * 
+	 * Scenario:
+	 * - 1] ValueSpecificationAction 'value' feature is set with the 'string'
+	 * - 2] Synchronization is performed via the advice
+	 * - ValueSpecificationAction has now 1 pin
+	 * - 1 result (typed by String)
+	 */
+	@Test
+	public void testPinDerivation_NoValue_ToLiteralUnlimitedNaturalValue() {
+		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.unlimitedNatural);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);
+		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);
+		if (!editValueSpecificationActionCommand.canExecute()) {
+			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));
+
+		// Assert target derivation
+		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);
+		Assert.assertTrue("ValueSpecificationAction shall have a result typed by UnlimitedNatural", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("UnlimitedNatural"));
+
+		if (!editValueSpecificationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin
+	 * is inferred.
+	 * 
+	 * Scenario:
+	 * - 1] ValueSpecificationAction 'value' feature is set with the 'string'
+	 * - 2] Synchronization is performed via the advice
+	 * - ValueSpecificationAction has now 1 pin
+	 * - 1 result (typed by String)
+	 */
+	@Test
+	public void testPinDerivation_NoValue_ToLiteralRealValue() {
+		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.real);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);
+		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);
+		if (!editValueSpecificationActionCommand.canExecute()) {
+			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));
+
+		// Assert target derivation
+		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);
+		Assert.assertTrue("ValueSpecificationAction shall have a result typed by Real", this.valueSpecificationAction.getResult().getType() == this.getPrimitiveType("Real"));
+
+		if (!editValueSpecificationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin
+	 * is inferred.
+	 * 
+	 * Scenario:
+	 * - 1] ValueSpecificationAction 'value' feature is set with the 'enumerationInstance'
+	 * - 2] Synchronization is performed via the advice
+	 * - ValueSpecificationAction has now 1 pin
+	 * - 1 result (typed by the enumeration)
+	 */
+	@Test
+	public void testPinDerivation_NoValue_ToLiteralEnumerationValue() {
+		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.enumerationInstanceValue);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);
+		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);
+		if (!editValueSpecificationActionCommand.canExecute()) {
+			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));
+
+		// Assert target derivation
+		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);
+		Assert.assertTrue("ValueSpecificationAction shall have a result typed by enumeration", this.valueSpecificationAction.getResult().getType() == this.enumeration);
+
+		if (!editValueSpecificationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * Role:
+	 * - For a ValueSpecificationAction having no referenced ValueSpecification, ensure that if a value gets referenced the pin
+	 * is inferred.
+	 * 
+	 * Scenario:
+	 * - 1] ValueSpecificationAction 'value' feature is set with the 'instanceSpecification'
+	 * - 2] Synchronization is performed via the advice
+	 * - ValueSpecificationAction has now 1 pin
+	 * - 1 result (typed by clazz)
+	 */
+	@Test
+	public void testPinDerivation_NoValue_ToInstanceSpecificationValueSingleClassifier() {
+		SetRequest request = new SetRequest(this.editingDomain, this.valueSpecificationAction, UMLPackage.eINSTANCE.getValueSpecificationAction_Value(), this.instanceSpecInstanceValue);
+		IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(this.valueSpecificationAction);
+		ICommand editValueSpecificationActionCommand = elementEditService.getEditCommand(request);
+		if (!editValueSpecificationActionCommand.canExecute()) {
+			Assert.fail("The ValueSpecificationAction cannot be edited  (Edit command is not executable)");
+		}
+		this.editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(editValueSpecificationActionCommand));
+
+		// Assert target derivation
+		Assert.assertTrue("ValueSpecificationAction shall have a result", this.valueSpecificationAction.getResult() != null);
+		Assert.assertTrue("ValueSpecificationAction shall have a result typed by clazz", this.valueSpecificationAction.getResult().getType() == this.class1);
+
+		if (!editValueSpecificationActionCommand.canUndo()) {
+			Assert.fail("It shall be possible to undo the pin derivation");
+		}
+		this.editingDomain.getCommandStack().undo();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins.AbstractTestPinDerivation#populateBaseTestModel()
+	 *
+	 */
+	@Override
+	public void populateBaseTestModel() {
+		super.populateBaseTestModel();
+		// Create LiteralInteger
+		integer = UMLFactory.eINSTANCE.createLiteralInteger();
+
+		// Create LiteralBoolean
+		bool = UMLFactory.eINSTANCE.createLiteralBoolean();
+
+		// Create LiteralString
+		string = UMLFactory.eINSTANCE.createLiteralString();
+
+		// Create LiteralUnlimitedNatural
+		unlimitedNatural = UMLFactory.eINSTANCE.createLiteralUnlimitedNatural();
+
+		// Create LiteralReal
+		real = UMLFactory.eINSTANCE.createLiteralReal();
+
+		// Create EnumerationInstanceValue
+		enumerationInstanceValue = UMLFactory.eINSTANCE.createInstanceValue();
+		enumeration = UMLFactory.eINSTANCE.createEnumeration();
+		EnumerationLiteral enumerationLiteral = UMLFactory.eINSTANCE.createEnumerationLiteral();
+		enumeration.getOwnedLiterals().add(enumerationLiteral);
+		enumerationInstanceValue.setInstance(enumerationLiteral);
+
+		// Create InstanceSpecification
+		instanceSpecInstanceValue = UMLFactory.eINSTANCE.createInstanceValue();
+		class1 = UMLFactory.eINSTANCE.createClass();
+		class1.setName("C1");
+		InstanceSpecification instanceSpec = UMLFactory.eINSTANCE.createInstanceSpecification();
+		instanceSpec.getClassifiers().add(class1);
+		instanceSpecInstanceValue.setInstance(instanceSpec);
+
+		// Create the activity containing the send signal action
+		Activity activity = UMLFactory.eINSTANCE.createActivity();
+		this.valueSpecificationAction = UMLFactory.eINSTANCE.createValueSpecificationAction();
+		activity.getOwnedNodes().add(this.valueSpecificationAction);
+
+		// Add the different elements to the model
+		this.umlTestModel.getPackagedElements().add(activity);
+
+		// Add the test model within the model set
+		Resource umlTestModelResource = new ResourceImpl();
+		umlTestModelResource.setURI(URI.createURI("UMLBaseTestModel.tmp"));
+		umlTestModelResource.getContents().add(this.umlTestModel);
+		this.modelSet.getResources().add(umlTestModelResource);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
index 5f43d33f3c0..f6ae19bf1a1 100755
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
@@ -1,49 +1,49 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.ui.ide;bundle-version="3.10.0",

- org.eclipse.emf.common.ui;bundle-version="2.9.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.services.edit;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.services.openelement;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.core.expressions,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.xtend.lib;bundle-version="2.8.3",

- org.eclipse.xtext.xbase.lib;bundle-version="2.8.3",

- org.eclipse.papyrus.tests.framework;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.sashwindows.di;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.service.types;bundle-version="[3.1.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.clazz.test,

- org.eclipse.papyrus.uml.diagram.clazz.test.canonical,

- org.eclipse.papyrus.uml.diagram.clazz.test.copyPaste,

- org.eclipse.papyrus.uml.diagram.clazz.test.dnd,

- org.eclipse.papyrus.uml.diagram.clazz.test.legacy,

- org.eclipse.papyrus.uml.diagram.clazz.test.load,

- org.eclipse.papyrus.uml.diagram.clazz.test.resources,

- org.eclipse.papyrus.uml.diagram.clazz.test.tests,

- org.eclipse.papyrus.uml.diagram.clazz.tests.generation

-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.uml.diagram.clazz.test.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui.ide;bundle-version="3.10.0",
+ org.eclipse.emf.common.ui;bundle-version="2.9.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.edit;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.services.openelement;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.expressions,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.xtend.lib;bundle-version="2.8.3",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.3",
+ org.eclipse.papyrus.tests.framework;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.sashwindows.di;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.1.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.clazz.test,
+ org.eclipse.papyrus.uml.diagram.clazz.test.canonical,
+ org.eclipse.papyrus.uml.diagram.clazz.test.copyPaste,
+ org.eclipse.papyrus.uml.diagram.clazz.test.dnd,
+ org.eclipse.papyrus.uml.diagram.clazz.test.legacy,
+ org.eclipse.papyrus.uml.diagram.clazz.test.load,
+ org.eclipse.papyrus.uml.diagram.clazz.test.resources,
+ org.eclipse.papyrus.uml.diagram.clazz.test.tests,
+ org.eclipse.papyrus.uml.diagram.clazz.tests.generation
+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.uml.diagram.clazz.test.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/build.properties
index a2ca0cc51db..3f24d747893 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/build.properties
@@ -1,10 +1,10 @@
-source.. = test/,\

-           test-gen/,\

-           xtend-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               model/

-src.includes = about.html

+source.. = test/,\
+           test-gen/,\
+           xtend-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               model/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.di
index fa44dbfd5bc..6bddfe2e53b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.di
@@ -1,26 +1,26 @@
-<?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="package24.notation#_y2V9wBM4EeSW8ufHPtpJcQ"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="package24.notation#_Da1q0BM5EeSW8ufHPtpJcQ"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="package24.notation#_L0CKYBM5EeSW8ufHPtpJcQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="package24.notation#_L0CKYBM5EeSW8ufHPtpJcQ"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="package24.notation#_y2V9wBM4EeSW8ufHPtpJcQ"/>

-        </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="package24.notation#_y2V9wBM4EeSW8ufHPtpJcQ"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="package24.notation#_Da1q0BM5EeSW8ufHPtpJcQ"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="package24.notation#_L0CKYBM5EeSW8ufHPtpJcQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="package24.notation#_L0CKYBM5EeSW8ufHPtpJcQ"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="package24.notation#_y2V9wBM4EeSW8ufHPtpJcQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.notation
index 797265662d8..17069df2437 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.notation
@@ -1,167 +1,167 @@
-<?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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

-  <notation:Diagram xmi:id="_y2V9wBM4EeSW8ufHPtpJcQ" type="Package" name="Diagram1" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_1KkqMBM4EeSW8ufHPtpJcQ" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_1K72kBM4EeSW8ufHPtpJcQ" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_1K9EsBM4EeSW8ufHPtpJcQ" type="7016">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1K9EsRM4EeSW8ufHPtpJcQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1K9EshM4EeSW8ufHPtpJcQ"/>

-      </children>

-      <element xmi:type="uml:Package" href="package24.uml#_1JXwUBM4EeSW8ufHPtpJcQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1KkqMRM4EeSW8ufHPtpJcQ" x="416" y="196"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_1YKaQBM4EeSW8ufHPtpJcQ" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_1YKaQhM4EeSW8ufHPtpJcQ" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_1YLBUBM4EeSW8ufHPtpJcQ" type="7016">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1YLBURM4EeSW8ufHPtpJcQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1YLBUhM4EeSW8ufHPtpJcQ"/>

-      </children>

-      <element xmi:type="uml:Package" href="package24.uml#_1YJMIBM4EeSW8ufHPtpJcQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1YKaQRM4EeSW8ufHPtpJcQ" x="876" y="197"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_2StW8BM4EeSW8ufHPtpJcQ" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_2StW8hM4EeSW8ufHPtpJcQ" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_2StW8xM4EeSW8ufHPtpJcQ" type="7009">

-        <children xmi:type="notation:Shape" xmi:id="_2v3NABM4EeSW8ufHPtpJcQ" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_2v3NAhM4EeSW8ufHPtpJcQ" type="5017"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_2v3NAxM4EeSW8ufHPtpJcQ" type="7010">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_2v3NBBM4EeSW8ufHPtpJcQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2v3NBRM4EeSW8ufHPtpJcQ"/>

-          </children>

-          <element xmi:type="uml:Package" href="package24.uml#_2v0wwBM4EeSW8ufHPtpJcQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2v3NARM4EeSW8ufHPtpJcQ" x="56" y="51"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_24pVkBM4EeSW8ufHPtpJcQ" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_24pVkhM4EeSW8ufHPtpJcQ" type="5017"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_24pVkxM4EeSW8ufHPtpJcQ" type="7010">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_24pVlBM4EeSW8ufHPtpJcQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_24pVlRM4EeSW8ufHPtpJcQ"/>

-          </children>

-          <element xmi:type="uml:Package" href="package24.uml#_24m5UBM4EeSW8ufHPtpJcQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_24pVkRM4EeSW8ufHPtpJcQ" x="359" y="50"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_2StW9BM4EeSW8ufHPtpJcQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2StW9RM4EeSW8ufHPtpJcQ"/>

-      </children>

-      <element xmi:type="uml:Model" href="package24.uml#_2Sq6sBM4EeSW8ufHPtpJcQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2StW8RM4EeSW8ufHPtpJcQ" x="1172" y="114" width="652" height="249"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_4U-JoBM4EeSW8ufHPtpJcQ" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_4U-wsRM4EeSW8ufHPtpJcQ" type="5038"/>

-      <element xmi:type="uml:Comment" href="package24.uml#_4UdzUBM4EeSW8ufHPtpJcQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4U-wsBM4EeSW8ufHPtpJcQ" x="1473" y="482"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_7icyQBM4EeSW8ufHPtpJcQ" type="2011">

-      <children xmi:type="notation:DecorationNode" xmi:id="_7icyQhM4EeSW8ufHPtpJcQ" type="5037"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7icyQxM4EeSW8ufHPtpJcQ" type="5159"/>

-      <element xmi:type="uml:Constraint" href="package24.uml#_7iZH4BM4EeSW8ufHPtpJcQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7icyQRM4EeSW8ufHPtpJcQ" x="1050" y="489"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_y2V9wRM4EeSW8ufHPtpJcQ"/>

-    <element xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_1u44MBM4EeSW8ufHPtpJcQ" type="4008" source="_1KkqMBM4EeSW8ufHPtpJcQ" target="_1YKaQBM4EeSW8ufHPtpJcQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_1u5fQBM4EeSW8ufHPtpJcQ" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1u5fQRM4EeSW8ufHPtpJcQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_1u5fQhM4EeSW8ufHPtpJcQ" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1u5fQxM4EeSW8ufHPtpJcQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_1u44MRM4EeSW8ufHPtpJcQ"/>

-      <element xmi:type="uml:Dependency" href="package24.uml#_1tPSYBM4EeSW8ufHPtpJcQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1u44MhM4EeSW8ufHPtpJcQ" points="[100, 8, -360, 7]$[560, 8, 100, 7]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_3nLPgBM4EeSW8ufHPtpJcQ" type="4008" source="_2v3NABM4EeSW8ufHPtpJcQ" target="_1YKaQBM4EeSW8ufHPtpJcQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_3nLPgxM4EeSW8ufHPtpJcQ" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3nL2kBM4EeSW8ufHPtpJcQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_3nL2kRM4EeSW8ufHPtpJcQ" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3nL2khM4EeSW8ufHPtpJcQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_3nLPgRM4EeSW8ufHPtpJcQ"/>

-      <element xmi:type="uml:Dependency" href="package24.uml#_3nIzQBM4EeSW8ufHPtpJcQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3nLPghM4EeSW8ufHPtpJcQ" points="[-100, 4, 254, -19]$[-361, -5, -7, -28]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_45HYgBM4EeSW8ufHPtpJcQ" type="4013" source="_4U-JoBM4EeSW8ufHPtpJcQ" target="_24pVkBM4EeSW8ufHPtpJcQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_45HYgRM4EeSW8ufHPtpJcQ"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_45HYghM4EeSW8ufHPtpJcQ" points="[3, -50, -19, 230]$[20, -308, -2, -28]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_5NSRsBM4EeSW8ufHPtpJcQ" type="4010" source="_2v3NABM4EeSW8ufHPtpJcQ" target="_1KkqMBM4EeSW8ufHPtpJcQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_5NS4wBM4EeSW8ufHPtpJcQ" type="6022">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5NS4wRM4EeSW8ufHPtpJcQ" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_5NSRsRM4EeSW8ufHPtpJcQ"/>

-      <element xmi:type="uml:PackageImport" href="package24.uml#_5NPOYBM4EeSW8ufHPtpJcQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5NSRshM4EeSW8ufHPtpJcQ" points="[8, 50, 825, 47]$[8, 188, 825, 185]$[-811, 188, 6, 185]$[-811, 53, 6, 50]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_AAMI4BM5EeSW8ufHPtpJcQ" type="4006" source="_24pVkBM4EeSW8ufHPtpJcQ" target="_2v3NABM4EeSW8ufHPtpJcQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_AAMI4xM5EeSW8ufHPtpJcQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_AAMv8BM5EeSW8ufHPtpJcQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_AAMv8RM5EeSW8ufHPtpJcQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_AAMv8hM5EeSW8ufHPtpJcQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_AAMI4RM5EeSW8ufHPtpJcQ"/>

-      <element xmi:type="uml:Abstraction" href="package24.uml#_AAJFkBM5EeSW8ufHPtpJcQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AAMI4hM5EeSW8ufHPtpJcQ" points="[-100, 0, 129, 4]$[-329, 0, -100, 4]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_Da1q0BM5EeSW8ufHPtpJcQ" type="Package" name="ClosedDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_D1e_cBM5EeSW8ufHPtpJcQ" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_D1e_chM5EeSW8ufHPtpJcQ" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_D1e_cxM5EeSW8ufHPtpJcQ" type="7016">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_D1e_dBM5EeSW8ufHPtpJcQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1e_dRM5EeSW8ufHPtpJcQ"/>

-      </children>

-      <element xmi:type="uml:Package" href="package24.uml#_D1dKQBM5EeSW8ufHPtpJcQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1e_cRM5EeSW8ufHPtpJcQ" x="614" y="254"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_EZN-oBM5EeSW8ufHPtpJcQ" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EZN-ohM5EeSW8ufHPtpJcQ" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_EZN-oxM5EeSW8ufHPtpJcQ" type="7009">

-        <children xmi:type="notation:Shape" xmi:id="_D6T1EBM5EeSW8ufHPtpJcQ" type="2007">

-          <children xmi:type="notation:DecorationNode" xmi:id="_D6UcIBM5EeSW8ufHPtpJcQ" type="5026"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_D6UcIRM5EeSW8ufHPtpJcQ" type="7016">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_D6UcIhM5EeSW8ufHPtpJcQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6UcIxM5EeSW8ufHPtpJcQ"/>

-          </children>

-          <element xmi:type="uml:Package" href="package24.uml#_D6Sm8BM5EeSW8ufHPtpJcQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6T1ERM5EeSW8ufHPtpJcQ" x="15" y="47"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EZN-pBM5EeSW8ufHPtpJcQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EZN-pRM5EeSW8ufHPtpJcQ"/>

-      </children>

-      <element xmi:type="uml:Model" href="package24.uml#_EZMwgBM5EeSW8ufHPtpJcQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EZN-oRM5EeSW8ufHPtpJcQ" x="909" y="174" width="395" height="226"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_Da1q0RM5EeSW8ufHPtpJcQ"/>

-    <element xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_GAooYBM5EeSW8ufHPtpJcQ" type="4006" source="_D6T1EBM5EeSW8ufHPtpJcQ" target="_D1e_cBM5EeSW8ufHPtpJcQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GAooYxM5EeSW8ufHPtpJcQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GAooZBM5EeSW8ufHPtpJcQ" y="21"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_GAooZRM5EeSW8ufHPtpJcQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GApPcBM5EeSW8ufHPtpJcQ" x="13" y="36"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_GAooYRM5EeSW8ufHPtpJcQ"/>

-      <element xmi:type="uml:Abstraction" href="package24.uml#_GAmMIBM5EeSW8ufHPtpJcQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GAooYhM5EeSW8ufHPtpJcQ" points="[-100, 6, 214, -8]$[-214, 20, 100, 6]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_HGT3ABM5EeSW8ufHPtpJcQ" type="4008" source="_EZN-oBM5EeSW8ufHPtpJcQ" target="_D1e_cBM5EeSW8ufHPtpJcQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_HGUeEBM5EeSW8ufHPtpJcQ" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HGUeERM5EeSW8ufHPtpJcQ" x="-6" y="13"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_HGUeEhM5EeSW8ufHPtpJcQ" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HGUeExM5EeSW8ufHPtpJcQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_HGT3ARM5EeSW8ufHPtpJcQ"/>

-      <element xmi:type="uml:Dependency" href="package24.uml#_HGQzsBM5EeSW8ufHPtpJcQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HGT3AhM5EeSW8ufHPtpJcQ" points="[0, 13, 428, 96]$[0, 64, 428, 147]$[-434, 64, -6, 147]$[-434, -33, -6, 50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HGfdMBM5EeSW8ufHPtpJcQ" id="(0.589873417721519,0.9424778761061947)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_L0CKYBM5EeSW8ufHPtpJcQ" type="PapyrusTestInvalidDiagram" name="InvalidDiagram" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_L0CxcBM5EeSW8ufHPtpJcQ"/>

-    <element xmi:type="uml:Package" href="package24.uml#_1JXwUBM4EeSW8ufHPtpJcQ"/>

-  </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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <notation:Diagram xmi:id="_y2V9wBM4EeSW8ufHPtpJcQ" type="Package" name="Diagram1" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_1KkqMBM4EeSW8ufHPtpJcQ" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1K72kBM4EeSW8ufHPtpJcQ" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1K9EsBM4EeSW8ufHPtpJcQ" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1K9EsRM4EeSW8ufHPtpJcQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1K9EshM4EeSW8ufHPtpJcQ"/>
+      </children>
+      <element xmi:type="uml:Package" href="package24.uml#_1JXwUBM4EeSW8ufHPtpJcQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1KkqMRM4EeSW8ufHPtpJcQ" x="416" y="196"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_1YKaQBM4EeSW8ufHPtpJcQ" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1YKaQhM4EeSW8ufHPtpJcQ" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1YLBUBM4EeSW8ufHPtpJcQ" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1YLBURM4EeSW8ufHPtpJcQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1YLBUhM4EeSW8ufHPtpJcQ"/>
+      </children>
+      <element xmi:type="uml:Package" href="package24.uml#_1YJMIBM4EeSW8ufHPtpJcQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1YKaQRM4EeSW8ufHPtpJcQ" x="876" y="197"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_2StW8BM4EeSW8ufHPtpJcQ" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_2StW8hM4EeSW8ufHPtpJcQ" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_2StW8xM4EeSW8ufHPtpJcQ" type="7009">
+        <children xmi:type="notation:Shape" xmi:id="_2v3NABM4EeSW8ufHPtpJcQ" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_2v3NAhM4EeSW8ufHPtpJcQ" type="5017"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_2v3NAxM4EeSW8ufHPtpJcQ" type="7010">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_2v3NBBM4EeSW8ufHPtpJcQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2v3NBRM4EeSW8ufHPtpJcQ"/>
+          </children>
+          <element xmi:type="uml:Package" href="package24.uml#_2v0wwBM4EeSW8ufHPtpJcQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2v3NARM4EeSW8ufHPtpJcQ" x="56" y="51"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_24pVkBM4EeSW8ufHPtpJcQ" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_24pVkhM4EeSW8ufHPtpJcQ" type="5017"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_24pVkxM4EeSW8ufHPtpJcQ" type="7010">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_24pVlBM4EeSW8ufHPtpJcQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_24pVlRM4EeSW8ufHPtpJcQ"/>
+          </children>
+          <element xmi:type="uml:Package" href="package24.uml#_24m5UBM4EeSW8ufHPtpJcQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_24pVkRM4EeSW8ufHPtpJcQ" x="359" y="50"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_2StW9BM4EeSW8ufHPtpJcQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2StW9RM4EeSW8ufHPtpJcQ"/>
+      </children>
+      <element xmi:type="uml:Model" href="package24.uml#_2Sq6sBM4EeSW8ufHPtpJcQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2StW8RM4EeSW8ufHPtpJcQ" x="1172" y="114" width="652" height="249"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_4U-JoBM4EeSW8ufHPtpJcQ" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4U-wsRM4EeSW8ufHPtpJcQ" type="5038"/>
+      <element xmi:type="uml:Comment" href="package24.uml#_4UdzUBM4EeSW8ufHPtpJcQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4U-wsBM4EeSW8ufHPtpJcQ" x="1473" y="482"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7icyQBM4EeSW8ufHPtpJcQ" type="2011">
+      <children xmi:type="notation:DecorationNode" xmi:id="_7icyQhM4EeSW8ufHPtpJcQ" type="5037"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7icyQxM4EeSW8ufHPtpJcQ" type="5159"/>
+      <element xmi:type="uml:Constraint" href="package24.uml#_7iZH4BM4EeSW8ufHPtpJcQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7icyQRM4EeSW8ufHPtpJcQ" x="1050" y="489"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_y2V9wRM4EeSW8ufHPtpJcQ"/>
+    <element xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_1u44MBM4EeSW8ufHPtpJcQ" type="4008" source="_1KkqMBM4EeSW8ufHPtpJcQ" target="_1YKaQBM4EeSW8ufHPtpJcQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1u5fQBM4EeSW8ufHPtpJcQ" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1u5fQRM4EeSW8ufHPtpJcQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1u5fQhM4EeSW8ufHPtpJcQ" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1u5fQxM4EeSW8ufHPtpJcQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_1u44MRM4EeSW8ufHPtpJcQ"/>
+      <element xmi:type="uml:Dependency" href="package24.uml#_1tPSYBM4EeSW8ufHPtpJcQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1u44MhM4EeSW8ufHPtpJcQ" points="[100, 8, -360, 7]$[560, 8, 100, 7]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_3nLPgBM4EeSW8ufHPtpJcQ" type="4008" source="_2v3NABM4EeSW8ufHPtpJcQ" target="_1YKaQBM4EeSW8ufHPtpJcQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_3nLPgxM4EeSW8ufHPtpJcQ" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3nL2kBM4EeSW8ufHPtpJcQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3nL2kRM4EeSW8ufHPtpJcQ" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3nL2khM4EeSW8ufHPtpJcQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_3nLPgRM4EeSW8ufHPtpJcQ"/>
+      <element xmi:type="uml:Dependency" href="package24.uml#_3nIzQBM4EeSW8ufHPtpJcQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3nLPghM4EeSW8ufHPtpJcQ" points="[-100, 4, 254, -19]$[-361, -5, -7, -28]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_45HYgBM4EeSW8ufHPtpJcQ" type="4013" source="_4U-JoBM4EeSW8ufHPtpJcQ" target="_24pVkBM4EeSW8ufHPtpJcQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_45HYgRM4EeSW8ufHPtpJcQ"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_45HYghM4EeSW8ufHPtpJcQ" points="[3, -50, -19, 230]$[20, -308, -2, -28]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_5NSRsBM4EeSW8ufHPtpJcQ" type="4010" source="_2v3NABM4EeSW8ufHPtpJcQ" target="_1KkqMBM4EeSW8ufHPtpJcQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5NS4wBM4EeSW8ufHPtpJcQ" type="6022">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5NS4wRM4EeSW8ufHPtpJcQ" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_5NSRsRM4EeSW8ufHPtpJcQ"/>
+      <element xmi:type="uml:PackageImport" href="package24.uml#_5NPOYBM4EeSW8ufHPtpJcQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5NSRshM4EeSW8ufHPtpJcQ" points="[8, 50, 825, 47]$[8, 188, 825, 185]$[-811, 188, 6, 185]$[-811, 53, 6, 50]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_AAMI4BM5EeSW8ufHPtpJcQ" type="4006" source="_24pVkBM4EeSW8ufHPtpJcQ" target="_2v3NABM4EeSW8ufHPtpJcQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_AAMI4xM5EeSW8ufHPtpJcQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AAMv8BM5EeSW8ufHPtpJcQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_AAMv8RM5EeSW8ufHPtpJcQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AAMv8hM5EeSW8ufHPtpJcQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_AAMI4RM5EeSW8ufHPtpJcQ"/>
+      <element xmi:type="uml:Abstraction" href="package24.uml#_AAJFkBM5EeSW8ufHPtpJcQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AAMI4hM5EeSW8ufHPtpJcQ" points="[-100, 0, 129, 4]$[-329, 0, -100, 4]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_Da1q0BM5EeSW8ufHPtpJcQ" type="Package" name="ClosedDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_D1e_cBM5EeSW8ufHPtpJcQ" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_D1e_chM5EeSW8ufHPtpJcQ" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_D1e_cxM5EeSW8ufHPtpJcQ" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_D1e_dBM5EeSW8ufHPtpJcQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1e_dRM5EeSW8ufHPtpJcQ"/>
+      </children>
+      <element xmi:type="uml:Package" href="package24.uml#_D1dKQBM5EeSW8ufHPtpJcQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1e_cRM5EeSW8ufHPtpJcQ" x="614" y="254"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EZN-oBM5EeSW8ufHPtpJcQ" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EZN-ohM5EeSW8ufHPtpJcQ" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EZN-oxM5EeSW8ufHPtpJcQ" type="7009">
+        <children xmi:type="notation:Shape" xmi:id="_D6T1EBM5EeSW8ufHPtpJcQ" type="2007">
+          <children xmi:type="notation:DecorationNode" xmi:id="_D6UcIBM5EeSW8ufHPtpJcQ" type="5026"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_D6UcIRM5EeSW8ufHPtpJcQ" type="7016">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_D6UcIhM5EeSW8ufHPtpJcQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6UcIxM5EeSW8ufHPtpJcQ"/>
+          </children>
+          <element xmi:type="uml:Package" href="package24.uml#_D6Sm8BM5EeSW8ufHPtpJcQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6T1ERM5EeSW8ufHPtpJcQ" x="15" y="47"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EZN-pBM5EeSW8ufHPtpJcQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EZN-pRM5EeSW8ufHPtpJcQ"/>
+      </children>
+      <element xmi:type="uml:Model" href="package24.uml#_EZMwgBM5EeSW8ufHPtpJcQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EZN-oRM5EeSW8ufHPtpJcQ" x="909" y="174" width="395" height="226"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_Da1q0RM5EeSW8ufHPtpJcQ"/>
+    <element xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_GAooYBM5EeSW8ufHPtpJcQ" type="4006" source="_D6T1EBM5EeSW8ufHPtpJcQ" target="_D1e_cBM5EeSW8ufHPtpJcQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GAooYxM5EeSW8ufHPtpJcQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GAooZBM5EeSW8ufHPtpJcQ" y="21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GAooZRM5EeSW8ufHPtpJcQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GApPcBM5EeSW8ufHPtpJcQ" x="13" y="36"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_GAooYRM5EeSW8ufHPtpJcQ"/>
+      <element xmi:type="uml:Abstraction" href="package24.uml#_GAmMIBM5EeSW8ufHPtpJcQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GAooYhM5EeSW8ufHPtpJcQ" points="[-100, 6, 214, -8]$[-214, 20, 100, 6]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HGT3ABM5EeSW8ufHPtpJcQ" type="4008" source="_EZN-oBM5EeSW8ufHPtpJcQ" target="_D1e_cBM5EeSW8ufHPtpJcQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HGUeEBM5EeSW8ufHPtpJcQ" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HGUeERM5EeSW8ufHPtpJcQ" x="-6" y="13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HGUeEhM5EeSW8ufHPtpJcQ" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HGUeExM5EeSW8ufHPtpJcQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_HGT3ARM5EeSW8ufHPtpJcQ"/>
+      <element xmi:type="uml:Dependency" href="package24.uml#_HGQzsBM5EeSW8ufHPtpJcQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HGT3AhM5EeSW8ufHPtpJcQ" points="[0, 13, 428, 96]$[0, 64, 428, 147]$[-434, 64, -6, 147]$[-434, -33, -6, 50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HGfdMBM5EeSW8ufHPtpJcQ" id="(0.589873417721519,0.9424778761061947)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_L0CKYBM5EeSW8ufHPtpJcQ" type="PapyrusTestInvalidDiagram" name="InvalidDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_L0CxcBM5EeSW8ufHPtpJcQ"/>
+    <element xmi:type="uml:Package" href="package24.uml#_1JXwUBM4EeSW8ufHPtpJcQ"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.uml
index b58df229832..25ad33d846a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.uml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_yzyZABM4EeSW8ufHPtpJcQ" name="model">

-  <ownedComment xmi:type="uml:Comment" xmi:id="_4UdzUBM4EeSW8ufHPtpJcQ" annotatedElement="_24m5UBM4EeSW8ufHPtpJcQ">

-    <body> </body>

-  </ownedComment>

-  <packagedElement xmi:type="uml:Package" xmi:id="_1JXwUBM4EeSW8ufHPtpJcQ" clientDependency="_1tPSYBM4EeSW8ufHPtpJcQ" name="Package1">

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_1tPSYBM4EeSW8ufHPtpJcQ" name="Dependency1" client="_1JXwUBM4EeSW8ufHPtpJcQ" supplier="_1YJMIBM4EeSW8ufHPtpJcQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_1YJMIBM4EeSW8ufHPtpJcQ" name="Package2"/>

-  <packagedElement xmi:type="uml:Model" xmi:id="_2Sq6sBM4EeSW8ufHPtpJcQ" name="Model1">

-    <packagedElement xmi:type="uml:Package" xmi:id="_2v0wwBM4EeSW8ufHPtpJcQ" clientDependency="_3nIzQBM4EeSW8ufHPtpJcQ" name="Package1">

-      <packageImport xmi:type="uml:PackageImport" xmi:id="_5NPOYBM4EeSW8ufHPtpJcQ" importedPackage="_1JXwUBM4EeSW8ufHPtpJcQ"/>

-      <packagedElement xmi:type="uml:Dependency" xmi:id="_3nIzQBM4EeSW8ufHPtpJcQ" name="Dependency1" client="_2v0wwBM4EeSW8ufHPtpJcQ" supplier="_1YJMIBM4EeSW8ufHPtpJcQ"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Package" xmi:id="_24m5UBM4EeSW8ufHPtpJcQ" clientDependency="_AAJFkBM5EeSW8ufHPtpJcQ" name="Package2">

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_AAJFkBM5EeSW8ufHPtpJcQ" name="Abstraction1" client="_24m5UBM4EeSW8ufHPtpJcQ" supplier="_2v0wwBM4EeSW8ufHPtpJcQ"/>

-    </packagedElement>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Constraint" xmi:id="_7iZH4BM4EeSW8ufHPtpJcQ" name="Constraint1">

-    <specification xmi:type="uml:LiteralString" xmi:id="_7iaWABM4EeSW8ufHPtpJcQ" value=""/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_D1dKQBM5EeSW8ufHPtpJcQ" name="Package3"/>

-  <packagedElement xmi:type="uml:Model" xmi:id="_EZMwgBM5EeSW8ufHPtpJcQ" clientDependency="_HGQzsBM5EeSW8ufHPtpJcQ" name="Model2">

-    <packagedElement xmi:type="uml:Package" xmi:id="_D6Sm8BM5EeSW8ufHPtpJcQ" clientDependency="_GAmMIBM5EeSW8ufHPtpJcQ" name="Package4">

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_GAmMIBM5EeSW8ufHPtpJcQ" name="Abstraction1" client="_D6Sm8BM5EeSW8ufHPtpJcQ" supplier="_D1dKQBM5EeSW8ufHPtpJcQ"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_HGQzsBM5EeSW8ufHPtpJcQ" name="Dependency1" client="_EZMwgBM5EeSW8ufHPtpJcQ" supplier="_D1dKQBM5EeSW8ufHPtpJcQ"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_yzyZABM4EeSW8ufHPtpJcQ" name="model">
+  <ownedComment xmi:type="uml:Comment" xmi:id="_4UdzUBM4EeSW8ufHPtpJcQ" annotatedElement="_24m5UBM4EeSW8ufHPtpJcQ">
+    <body> </body>
+  </ownedComment>
+  <packagedElement xmi:type="uml:Package" xmi:id="_1JXwUBM4EeSW8ufHPtpJcQ" clientDependency="_1tPSYBM4EeSW8ufHPtpJcQ" name="Package1">
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_1tPSYBM4EeSW8ufHPtpJcQ" name="Dependency1" client="_1JXwUBM4EeSW8ufHPtpJcQ" supplier="_1YJMIBM4EeSW8ufHPtpJcQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_1YJMIBM4EeSW8ufHPtpJcQ" name="Package2"/>
+  <packagedElement xmi:type="uml:Model" xmi:id="_2Sq6sBM4EeSW8ufHPtpJcQ" name="Model1">
+    <packagedElement xmi:type="uml:Package" xmi:id="_2v0wwBM4EeSW8ufHPtpJcQ" clientDependency="_3nIzQBM4EeSW8ufHPtpJcQ" name="Package1">
+      <packageImport xmi:type="uml:PackageImport" xmi:id="_5NPOYBM4EeSW8ufHPtpJcQ" importedPackage="_1JXwUBM4EeSW8ufHPtpJcQ"/>
+      <packagedElement xmi:type="uml:Dependency" xmi:id="_3nIzQBM4EeSW8ufHPtpJcQ" name="Dependency1" client="_2v0wwBM4EeSW8ufHPtpJcQ" supplier="_1YJMIBM4EeSW8ufHPtpJcQ"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_24m5UBM4EeSW8ufHPtpJcQ" clientDependency="_AAJFkBM5EeSW8ufHPtpJcQ" name="Package2">
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_AAJFkBM5EeSW8ufHPtpJcQ" name="Abstraction1" client="_24m5UBM4EeSW8ufHPtpJcQ" supplier="_2v0wwBM4EeSW8ufHPtpJcQ"/>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Constraint" xmi:id="_7iZH4BM4EeSW8ufHPtpJcQ" name="Constraint1">
+    <specification xmi:type="uml:LiteralString" xmi:id="_7iaWABM4EeSW8ufHPtpJcQ" value=""/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_D1dKQBM5EeSW8ufHPtpJcQ" name="Package3"/>
+  <packagedElement xmi:type="uml:Model" xmi:id="_EZMwgBM5EeSW8ufHPtpJcQ" clientDependency="_HGQzsBM5EeSW8ufHPtpJcQ" name="Model2">
+    <packagedElement xmi:type="uml:Package" xmi:id="_D6Sm8BM5EeSW8ufHPtpJcQ" clientDependency="_GAmMIBM5EeSW8ufHPtpJcQ" name="Package4">
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_GAmMIBM5EeSW8ufHPtpJcQ" name="Abstraction1" client="_D6Sm8BM5EeSW8ufHPtpJcQ" supplier="_D1dKQBM5EeSW8ufHPtpJcQ"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_HGQzsBM5EeSW8ufHPtpJcQ" name="Dependency1" client="_EZMwgBM5EeSW8ufHPtpJcQ" supplier="_D1dKQBM5EeSW8ufHPtpJcQ"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/Activator.java
index 6e852dc7eed..1177b4bf502 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/Activator.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.test;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.clazz.tests";

-

-	// 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;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.test;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.clazz.tests";
+
+	// 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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/IClassDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/IClassDiagramTestsConstants.java
index 9717ae52359..92ffb425ee7 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/IClassDiagramTestsConstants.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/IClassDiagramTestsConstants.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.test;

-

-public interface IClassDiagramTestsConstants {

-

-	/** name of the test project */ 

-	public final String PROJECT_NAME = "ClassDiagramTestProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "ClassDiagramTest.di";

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.test;
+
+public interface IClassDiagramTestsConstants {
+
+	/** name of the test project */ 
+	public final String PROJECT_NAME = "ClassDiagramTestProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "ClassDiagramTest.di";
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java
index cf42aace8a9..6b357a536c3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-

-/**

- * The Class AbstractPapyrusTestCase.

- */

-public abstract class AbstractPapyrusTestCase extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+
+/**
+ * The Class AbstractPapyrusTestCase.
+ */
+public abstract class AbstractPapyrusTestCase extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/ClassDiagramListCompartmentTestHelper.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/ClassDiagramListCompartmentTestHelper.java
index e431c8ef7c9..331f2c514c1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/ClassDiagramListCompartmentTestHelper.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/ClassDiagramListCompartmentTestHelper.java
@@ -1,56 +1,56 @@
-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;

-

-public class ClassDiagramListCompartmentTestHelper extends TestListCompartmentHelper {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param diagramEditPart

-	 * @param diagramEditor

-	 */

-	public ClassDiagramListCompartmentTestHelper(DiagramEditPart diagramEditPart, UmlGmfDiagramEditor diagramEditor) {

-		super(diagramEditPart, diagramEditor);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getDefaultNamedElementVisualId()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getDefaultNamedElementVisualId() {

-		return DefaultNamedElementEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getElementType(int)

-	 *

-	 * @param childVID

-	 * @return

-	 */

-	@Override

-	protected IElementType getElementType(String childVID) {

-		return UMLElementTypes.getElementType(childVID);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getVisualID(org.eclipse.gmf.runtime.notation.View)

-	 *

-	 * @param view

-	 * @return

-	 */

-	@Override

-	protected String getVisualID(View view) {

-		return UMLVisualIDRegistry.getVisualID(view);

-	}

-

+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;
+
+public class ClassDiagramListCompartmentTestHelper extends TestListCompartmentHelper {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param diagramEditPart
+	 * @param diagramEditor
+	 */
+	public ClassDiagramListCompartmentTestHelper(DiagramEditPart diagramEditPart, UmlGmfDiagramEditor diagramEditor) {
+		super(diagramEditPart, diagramEditor);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getDefaultNamedElementVisualId()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getDefaultNamedElementVisualId() {
+		return DefaultNamedElementEditPart.VISUAL_ID;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getElementType(int)
+	 *
+	 * @param childVID
+	 * @return
+	 */
+	@Override
+	protected IElementType getElementType(String childVID) {
+		return UMLElementTypes.getElementType(childVID);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getVisualID(org.eclipse.gmf.runtime.notation.View)
+	 *
+	 * @param view
+	 * @return
+	 */
+	@Override
+	protected String getVisualID(View view) {
+		return UMLVisualIDRegistry.getVisualID(view);
+	}
+
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationClass.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationClass.java
index 9caba5353ff..08ec5d3d34b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationClass.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationClass.java
@@ -1,63 +1,63 @@
-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;

-import org.junit.Test;

-

-public class TestClassDiagramAssociationClass extends TestLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return CustomUMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testManageAssociationClass() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.AssociationClass_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	@Override

-	public void installEnvironment(IElementType sourceType, IElementType targetType) {

-		createdEdgesCount = 2;

-		createdChildsCount = 1;

-		super.installEnvironment(sourceType, targetType);

-	}

-

-	@Override

-	public void testToCreateALink(IElementType linkType, String initialName) {

-		testCreateLink(linkType, initialName);

-	}

-

-	@Override

-	public void testToManageLink(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType containerType, boolean allowedOntheSame, String initialName) {

-		installEnvironment(sourceType, targetType);

-		testToCreateALink(linkType, initialName);

-		testDestroy(linkType);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		testViewDeletion(linkType);

-		testDrop(linkType);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		testToCreateAlinkOnTheSame(linkType, allowedOntheSame);

-	}

+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;
+import org.junit.Test;
+
+public class TestClassDiagramAssociationClass extends TestLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return CustomUMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testManageAssociationClass() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.AssociationClass_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	@Override
+	public void installEnvironment(IElementType sourceType, IElementType targetType) {
+		createdEdgesCount = 2;
+		createdChildsCount = 1;
+		super.installEnvironment(sourceType, targetType);
+	}
+
+	@Override
+	public void testToCreateALink(IElementType linkType, String initialName) {
+		testCreateLink(linkType, initialName);
+	}
+
+	@Override
+	public void testToManageLink(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType containerType, boolean allowedOntheSame, String initialName) {
+		installEnvironment(sourceType, targetType);
+		testToCreateALink(linkType, initialName);
+		testDestroy(linkType);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		testViewDeletion(linkType);
+		testDrop(linkType);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		testToCreateAlinkOnTheSame(linkType, allowedOntheSame);
+	}
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java
index 85b6d09c827..a9deb7e6ee7 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java
@@ -1,258 +1,258 @@
-/*****************************************************************************

- * 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

- *  Nizar GUEDIDI (CEA LIST) - Add tests for Primitive Type properties and operations 

- *  Nizar GUEDIDI (CEA LIST) - Add tests for nested classifier compartments

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildLabel;

-import org.junit.Test;

-

-/**

- * The Class TestClassDiagramChildLabel.

- */

-public class TestClassDiagramChildLabel extends TestChildLabel {

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return CustomUMLDiagramUpdater.INSTANCE;

-	}

-	

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	@FailingTest

-	public void testToManageInstanceSlot() {

-		//instance specification

-		testToManageTopNode(UMLElementTypes.InstanceSpecification_Shape, UMLElementTypes.Slot_SlotLabel, InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID, "<UNDEFINED>");

-	}

-

-	@Test

-	public void testToManageComponentProperty() {

-		//instance specification

-		testToManageTopNodeWithMask(UMLElementTypes.Component_Shape, UMLElementTypes.Property_ComponentAttributeLabel, ComponentAttributeCompartmentEditPart.VISUAL_ID,"Attribute");

-	}

-

-	@Test

-	public void testToManageComponentNestedClass() {

-		//Class

-		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Class_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedInterface() {

-		//Interface

-		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Interface_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedSignal() {

-		//Signal

-		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Signal_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedDataType() {

-		//Data Type

-		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.DataType_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedEnumeration() {

-		//Enumeration

-		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Enumeration_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedPrimitiveType() {

-		//primitive Type

-		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentOperation() {

-		//instance specification

-		testToManageTopNodeWithMask(UMLElementTypes.Component_Shape, UMLElementTypes.Operation_ComponentOperationLabel, ComponentOperationCompartmentEditPart.VISUAL_ID,null);

-	}

-

-	@Test

-	public void testToManageSignalProperty() {

-		//instance specification

-		testToManageTopNodeWithMask(UMLElementTypes.Signal_Shape, UMLElementTypes.Property_SignalAttributeLabel, SignalAttributeCompartmentEditPart.VISUAL_ID,"Attribute");

-	}

-

-	@Test

-	public void testToManageInterfaceProperty() {

-		//interface

-		testToManageTopNodeWithMask(UMLElementTypes.Interface_Shape, UMLElementTypes.Property_InterfaceAttributeLabel, InterfaceAttributeCompartmentEditPart.VISUAL_ID,"Attribute");

-	}

-

-	@Test

-	public void testToManageInterfaceOperation() {

-		//interface

-		testToManageTopNodeWithMask(UMLElementTypes.Interface_Shape, UMLElementTypes.Operation_InterfaceOperationLabel, InterfaceOperationCompartmentEditPart.VISUAL_ID,null);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedClass() {

-		//Class

-		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Class_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedInterface() {

-		//Interface

-		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Interface_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedSignal() {

-		//Signal

-		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Signal_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedDataType() {

-		//Data Type

-		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.DataType_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedEnumeration() {

-		//Enumeration

-		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedPrimitiveType() {

-		//Primitive Type

-		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageEnumerationLiteralEnumeration() {

-		//Enumeration

-		testToManageTopNode(UMLElementTypes.Enumeration_Shape, UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassProperty() {

-		//Enumeration

-		testToManageTopNodeWithMask(UMLElementTypes.Class_Shape, UMLElementTypes.Property_ClassAttributeLabel, ClassAttributeCompartmentEditPart.VISUAL_ID,"Attribute");

-	}

-

-	@Test

-	public void testToManageClassReception() {

-		//Enumeration

-		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Reception_ReceptionLabel, ClassOperationCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassOperation() {

-		//Enumeration

-		testToManageTopNodeWithMask(UMLElementTypes.Class_Shape, UMLElementTypes.Operation_ClassOperationLabel, ClassOperationCompartmentEditPart.VISUAL_ID,null);

-	}

-

-	@Test

-	public void testToManageClassNestedClass() {

-		//class

-		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Class_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedInetrface() {

-		//Interface

-		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Interface_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedSignal() {

-		//Signal

-		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Signal_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedDataType() {

-		//Data Type

-		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.DataType_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedEnumeration() {

-		//Enumeration

-		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Enumeration_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedPrimitiveType() {

-		//Primitive Type

-		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentReception() {

-		//class

-		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Reception_ReceptionLabel, ComponentOperationCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceReception() {

-		//class

-		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Reception_InterfaceReceptionLabel, InterfaceOperationCompartmentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManagePrimitiveTypeProperty() {

-		//class

-		testToManageTopNodeWithMask(UMLElementTypes.PrimitiveType_Shape, UMLElementTypes.Property_PrimitiveTypeAttributeLabel, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID,"Attribute");

-	}

-

-	@Test

-	public void testToManagePrimitiveTypeOperation() {

-		//class

-		testToManageTopNodeWithMask(UMLElementTypes.PrimitiveType_Shape, UMLElementTypes.Operation_PrimitiveTypeOperationLabel, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID,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
+ *  Nizar GUEDIDI (CEA LIST) - Add tests for Primitive Type properties and operations 
+ *  Nizar GUEDIDI (CEA LIST) - Add tests for nested classifier compartments
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildLabel;
+import org.junit.Test;
+
+/**
+ * The Class TestClassDiagramChildLabel.
+ */
+public class TestClassDiagramChildLabel extends TestChildLabel {
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return CustomUMLDiagramUpdater.INSTANCE;
+	}
+	
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	@FailingTest
+	public void testToManageInstanceSlot() {
+		//instance specification
+		testToManageTopNode(UMLElementTypes.InstanceSpecification_Shape, UMLElementTypes.Slot_SlotLabel, InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID, "<UNDEFINED>");
+	}
+
+	@Test
+	public void testToManageComponentProperty() {
+		//instance specification
+		testToManageTopNodeWithMask(UMLElementTypes.Component_Shape, UMLElementTypes.Property_ComponentAttributeLabel, ComponentAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+	}
+
+	@Test
+	public void testToManageComponentNestedClass() {
+		//Class
+		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Class_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedInterface() {
+		//Interface
+		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Interface_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedSignal() {
+		//Signal
+		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Signal_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedDataType() {
+		//Data Type
+		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.DataType_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedEnumeration() {
+		//Enumeration
+		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Enumeration_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedPrimitiveType() {
+		//primitive Type
+		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentOperation() {
+		//instance specification
+		testToManageTopNodeWithMask(UMLElementTypes.Component_Shape, UMLElementTypes.Operation_ComponentOperationLabel, ComponentOperationCompartmentEditPart.VISUAL_ID,null);
+	}
+
+	@Test
+	public void testToManageSignalProperty() {
+		//instance specification
+		testToManageTopNodeWithMask(UMLElementTypes.Signal_Shape, UMLElementTypes.Property_SignalAttributeLabel, SignalAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+	}
+
+	@Test
+	public void testToManageInterfaceProperty() {
+		//interface
+		testToManageTopNodeWithMask(UMLElementTypes.Interface_Shape, UMLElementTypes.Property_InterfaceAttributeLabel, InterfaceAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+	}
+
+	@Test
+	public void testToManageInterfaceOperation() {
+		//interface
+		testToManageTopNodeWithMask(UMLElementTypes.Interface_Shape, UMLElementTypes.Operation_InterfaceOperationLabel, InterfaceOperationCompartmentEditPart.VISUAL_ID,null);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedClass() {
+		//Class
+		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Class_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedInterface() {
+		//Interface
+		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Interface_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedSignal() {
+		//Signal
+		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Signal_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedDataType() {
+		//Data Type
+		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.DataType_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedEnumeration() {
+		//Enumeration
+		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedPrimitiveType() {
+		//Primitive Type
+		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageEnumerationLiteralEnumeration() {
+		//Enumeration
+		testToManageTopNode(UMLElementTypes.Enumeration_Shape, UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassProperty() {
+		//Enumeration
+		testToManageTopNodeWithMask(UMLElementTypes.Class_Shape, UMLElementTypes.Property_ClassAttributeLabel, ClassAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+	}
+
+	@Test
+	public void testToManageClassReception() {
+		//Enumeration
+		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Reception_ReceptionLabel, ClassOperationCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassOperation() {
+		//Enumeration
+		testToManageTopNodeWithMask(UMLElementTypes.Class_Shape, UMLElementTypes.Operation_ClassOperationLabel, ClassOperationCompartmentEditPart.VISUAL_ID,null);
+	}
+
+	@Test
+	public void testToManageClassNestedClass() {
+		//class
+		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Class_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedInetrface() {
+		//Interface
+		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Interface_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedSignal() {
+		//Signal
+		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Signal_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedDataType() {
+		//Data Type
+		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.DataType_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedEnumeration() {
+		//Enumeration
+		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Enumeration_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedPrimitiveType() {
+		//Primitive Type
+		testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentReception() {
+		//class
+		testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Reception_ReceptionLabel, ComponentOperationCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceReception() {
+		//class
+		testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Reception_InterfaceReceptionLabel, InterfaceOperationCompartmentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManagePrimitiveTypeProperty() {
+		//class
+		testToManageTopNodeWithMask(UMLElementTypes.PrimitiveType_Shape, UMLElementTypes.Property_PrimitiveTypeAttributeLabel, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+	}
+
+	@Test
+	public void testToManagePrimitiveTypeOperation() {
+		//class
+		testToManageTopNodeWithMask(UMLElementTypes.PrimitiveType_Shape, UMLElementTypes.Operation_PrimitiveTypeOperationLabel, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID,null);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContainment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContainment.java
index bfb927ec725..3538fd79ebf 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContainment.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContainment.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestContainmentLink;

-import org.junit.Test;

-

-public class TestClassDiagramContainment extends TestContainmentLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return CustomUMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage containmentLink.

-	 */

-	@Test

-	public void testToManageContainment() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Element_ContainmentEdge, UMLElementTypes.Package_Shape);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestContainmentLink;
+import org.junit.Test;
+
+public class TestClassDiagramContainment extends TestContainmentLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return CustomUMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage containmentLink.
+	 */
+	@Test
+	public void testToManageContainment() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Element_ContainmentEdge, UMLElementTypes.Package_Shape);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramInstanceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramInstanceSpecification.java
index bf1de547f1b..a97895e0a8c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramInstanceSpecification.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramInstanceSpecification.java
@@ -1,50 +1,50 @@
-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestInstanceSpecification;

-import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;

-import org.junit.Test;

-

-public class TestClassDiagramInstanceSpecification extends TestInstanceSpecification {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return CustomUMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testInstanceSpecification() {

-		testInstanceSpecification(UMLElementTypes.Class_Shape, UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE, UMLElementTypes.InstanceSpecification_Shape, UMLElementTypes.InstanceSpecification_Edge);

-	}

-

-	@Override

-	protected ICommand createSetupEditPartClassifierCommand(EObject source, SetRequest setRequest) {

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(source);

-		return provider.getEditCommand(setRequest);

-	}

+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestInstanceSpecification;
+import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;
+import org.junit.Test;
+
+public class TestClassDiagramInstanceSpecification extends TestInstanceSpecification {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return CustomUMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testInstanceSpecification() {
+		testInstanceSpecification(UMLElementTypes.Class_Shape, UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE, UMLElementTypes.InstanceSpecification_Shape, UMLElementTypes.InstanceSpecification_Edge);
+	}
+
+	@Override
+	protected ICommand createSetupEditPartClassifierCommand(EObject source, SetRequest setRequest) {
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(source);
+		return provider.getEditCommand(setRequest);
+	}
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLink.java
index e5af73c3d2a..4ccd2c61a00 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLink.java
@@ -1,113 +1,113 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;

-import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;

-import org.junit.Test;

-

-/**

- * The Class TestClassDiagramLink use to test link that are contained by the owner of the target and the source

- */

-public class TestClassDiagramLink extends TestLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return CustomUMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage component.

-	 */

-	@Test

-	@FailingTest

-	public void testToManageDependency() {

-		testToManageLink(UMLElementTypes.Component_Shape, UMLElementTypes.Component_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Association.

-	 */

-	@Test

-	@FailingTest

-	public void testToManageAssociation() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE, UMLElementTypes.Package_Shape, true,"srcMulA_cla");

-	}

-

-	//test generatlization

-	//test interfaceRealization

-	//test substitution

-	/**

-	 * Test to manage Realization

-	 */

-	@Test

-	@FailingTest

-	public void testToManageRealization() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Realization_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Abstraction

-	 */

-	@Test

-	@FailingTest

-	public void testToManageAbstraction() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Usage

-	 */

-	@Test

-	@FailingTest

-	public void testToManageUsage() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Usage

-	 */

-	@Test

-	@FailingTest

-	public void testToManageInformationFlow() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.InformationFlow_Edge, UMLElementTypes.Package_Shape, true);

-	}

-	//test Element import

-	//testPackageImport

-	//test comment link

-	//test constraintLink

-	//test template binding

-	//test instancespecificationLink

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;
+import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;
+import org.junit.Test;
+
+/**
+ * The Class TestClassDiagramLink use to test link that are contained by the owner of the target and the source
+ */
+public class TestClassDiagramLink extends TestLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return CustomUMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage component.
+	 */
+	@Test
+	@FailingTest
+	public void testToManageDependency() {
+		testToManageLink(UMLElementTypes.Component_Shape, UMLElementTypes.Component_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Association.
+	 */
+	@Test
+	@FailingTest
+	public void testToManageAssociation() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE, UMLElementTypes.Package_Shape, true,"srcMulA_cla");
+	}
+
+	//test generatlization
+	//test interfaceRealization
+	//test substitution
+	/**
+	 * Test to manage Realization
+	 */
+	@Test
+	@FailingTest
+	public void testToManageRealization() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Realization_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Abstraction
+	 */
+	@Test
+	@FailingTest
+	public void testToManageAbstraction() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Usage
+	 */
+	@Test
+	@FailingTest
+	public void testToManageUsage() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Usage
+	 */
+	@Test
+	@FailingTest
+	public void testToManageInformationFlow() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.InformationFlow_Edge, UMLElementTypes.Package_Shape, true);
+	}
+	//test Element import
+	//testPackageImport
+	//test comment link
+	//test constraintLink
+	//test template binding
+	//test instancespecificationLink
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java
index c8ef4b7b4b2..f8daa60219d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java
@@ -1,117 +1,117 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 459701

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkOwnedBySource;

-import org.junit.Test;

-

-/**

- * The Class TestClassDiagramLink use to test link that are contained by the owner of the target and the source

- */

-public class TestClassDiagramLinkOwnedBySource extends TestLinkOwnedBySource {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return CustomUMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage Association.

-	 */

-	@Test

-	public void testToManageGeneralization() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-	/**

-	 * Test to manage InterfaceRealization.

-	 */

-	@Test

-	public void testToManageInterfaceRealization() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Interface_Shape, UMLElementTypes.InterfaceRealization_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-	/**

-	 * Test to manage Substitution.

-	 */

-	@Test

-	public void testToManageSubstitution() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Substitution_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-	/**

-	 * Test to manage ElementImport.

-	 */

-	@Test

-	public void testToManageElementImport() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.ElementImport_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage ElementImport.

-	 */

-	@Test

-	public void testToManagePackageImport() {

-		testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.PackageImport_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	@TargetConfigurator(CreateRedefinableTemplateSignature.class)

-	@Test

-	public void testToManageTemplateBinding() {

-		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.TemplateBinding_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-	// test comment link

-	// test constraintLink

-	// test containment link

-	// test instancespecificationLink

-

-	//

-	// Configurators

-	//

-

-	public static class CreateRedefinableTemplateSignature implements FixtureEditPartConfigurator {

-		public Command configureFixtureEditPart(IGraphicalEditPart editPart, IElementType elementType, boolean isSource) {

-			CreateViewRequest request = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.RedefinableTemplateSignature_Shape, editPart.getDiagramPreferencesHint());

-			return editPart.getCommand(request);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 459701
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkOwnedBySource;
+import org.junit.Test;
+
+/**
+ * The Class TestClassDiagramLink use to test link that are contained by the owner of the target and the source
+ */
+public class TestClassDiagramLinkOwnedBySource extends TestLinkOwnedBySource {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return CustomUMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage Association.
+	 */
+	@Test
+	public void testToManageGeneralization() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+	/**
+	 * Test to manage InterfaceRealization.
+	 */
+	@Test
+	public void testToManageInterfaceRealization() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Interface_Shape, UMLElementTypes.InterfaceRealization_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+	/**
+	 * Test to manage Substitution.
+	 */
+	@Test
+	public void testToManageSubstitution() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Substitution_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+	/**
+	 * Test to manage ElementImport.
+	 */
+	@Test
+	public void testToManageElementImport() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.ElementImport_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage ElementImport.
+	 */
+	@Test
+	public void testToManagePackageImport() {
+		testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.PackageImport_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	@TargetConfigurator(CreateRedefinableTemplateSignature.class)
+	@Test
+	public void testToManageTemplateBinding() {
+		testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.TemplateBinding_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+	// test comment link
+	// test constraintLink
+	// test containment link
+	// test instancespecificationLink
+
+	//
+	// Configurators
+	//
+
+	public static class CreateRedefinableTemplateSignature implements FixtureEditPartConfigurator {
+		public Command configureFixtureEditPart(IGraphicalEditPart editPart, IElementType elementType, boolean isSource) {
+			CreateViewRequest request = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.RedefinableTemplateSignature_Shape, editPart.getDiagramPreferencesHint());
+			return editPart.getCommand(request);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramNestedClassifier.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramNestedClassifier.java
index 60588f13fe6..aa89048fc95 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramNestedClassifier.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramNestedClassifier.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestNested;

-import org.junit.Test;

-

-/**

- * The Class TestClassDiagramNestedClassifier.

- */

-public class TestClassDiagramNestedClassifier extends TestNested {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testToManageComponentNestedClass() {

-		//Class

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Class_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedInterface() {

-		//Interface

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Interface_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedSignal() {

-		//Signal

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Signal_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedDataType() {

-		//Data Type

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.DataType_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedEnumeration() {

-		//Enumeration

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Enumeration_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageComponentNestedPrimitiveType() {

-		//primitive Type

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedClass() {

-		//Class

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Class_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedInterface() {

-		//Interface

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Interface_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedSignal() {

-		//Signal

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Signal_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedDataType() {

-		//Data Type

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.DataType_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedEnumeration() {

-		//Enumeration

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageInterfaceNestedPrimitiveType() {

-		//Primitive Type

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedClass() {

-		//class

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Class_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedInetrface() {

-		//Interface

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Interface_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedSignal() {

-		//Signal

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Signal_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedDataType() {

-		//Data Type

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.DataType_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageclassNestedEnumeration() {

-		//Enumeration

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Enumeration_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);

-	}

-

-	@Test

-	public void testToManageClassNestedPrimitiveType() {

-		//Primitive Type

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestNested;
+import org.junit.Test;
+
+/**
+ * The Class TestClassDiagramNestedClassifier.
+ */
+public class TestClassDiagramNestedClassifier extends TestNested {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testToManageComponentNestedClass() {
+		//Class
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Class_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedInterface() {
+		//Interface
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Interface_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedSignal() {
+		//Signal
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Signal_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedDataType() {
+		//Data Type
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.DataType_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedEnumeration() {
+		//Enumeration
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Enumeration_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageComponentNestedPrimitiveType() {
+		//primitive Type
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedClass() {
+		//Class
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Class_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedInterface() {
+		//Interface
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Interface_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedSignal() {
+		//Signal
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Signal_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedDataType() {
+		//Data Type
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.DataType_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedEnumeration() {
+		//Enumeration
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageInterfaceNestedPrimitiveType() {
+		//Primitive Type
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedClass() {
+		//class
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Class_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedInetrface() {
+		//Interface
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Interface_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedSignal() {
+		//Signal
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Signal_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedDataType() {
+		//Data Type
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.DataType_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageclassNestedEnumeration() {
+		//Enumeration
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Enumeration_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	@Test
+	public void testToManageClassNestedPrimitiveType() {
+		//Primitive Type
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestDropfunction.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestDropfunction.java
index 3939262be00..c2b38269a72 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestDropfunction.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestDropfunction.java
@@ -1,151 +1,151 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildLabel;

-import org.eclipse.uml2.uml.Element;

-import org.junit.Test;

-

-/**

- * test in order to verify if the drop respect the order of the selection

- * Create an enumeration, create subenumerationliterals, select them, drop into the diagram

- * the order of enumeration list has to be the same that as the list in the request drop.

- *

- */

-public class TestDropfunction extends TestChildLabel {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return CustomUMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	public static int MAX = 20;

-

-	@Test

-	public void testDropWithOrder() {

-		testToCreateATopNode(UMLElementTypes.Enumeration_Shape);

-		testToCreateSetOfNode(UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);

-		testSetOfDrop(UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);

-	}

-

-	protected void testToCreateSetOfNode(IElementType type, String containerType) {

-		ListCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < getTopEditPart().getChildren().size()) {

-			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) {

-				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null);

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, compartment.getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-		for(int i = 0; i < MAX; i++) {

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = compartment.getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			//creation of label

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);

-			//deletion view

-			Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-			command = ((GraphicalEditPart)compartment.getChildren().get(0)).getCommand(deleteViewRequest);

-			assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		}

-	}

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	protected void testSetOfDrop(IElementType type, String containerType) {

-		ListCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < getTopEditPart().getChildren().size()) {

-			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) {

-				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null);

-		//DROP

-		assertTrue(DROP + INITIALIZATION_TEST, compartment.getChildren().size() == 0);

-		assertTrue(DROP + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == MAX);

-		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		ArrayList<Element> list = new ArrayList<Element>();

-		for(int i = 0; i < MAX; i++) {

-			list.add(getRootSemanticModel().getOwnedElements().get(i));

-		}

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(new Point(20, 20));

-		Command command = compartment.getCommand(dropObjectsRequest);

-		assertNotNull(DROP + COMMAND_NULL, command);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DROP + TEST_THE_EXECUTION, compartment.getChildren().size() == MAX);

-		assertTrue(DROP + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == MAX);

-		for(int i = 0; i < MAX; i++) {

-			assertEquals(getRootSemanticModel().getOwnedElements().get(i), ((GraphicalEditPart)compartment.getChildren().get(i)).resolveSemanticElement());

-		}

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildLabel;
+import org.eclipse.uml2.uml.Element;
+import org.junit.Test;
+
+/**
+ * test in order to verify if the drop respect the order of the selection
+ * Create an enumeration, create subenumerationliterals, select them, drop into the diagram
+ * the order of enumeration list has to be the same that as the list in the request drop.
+ *
+ */
+public class TestDropfunction extends TestChildLabel {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return CustomUMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	public static int MAX = 20;
+
+	@Test
+	public void testDropWithOrder() {
+		testToCreateATopNode(UMLElementTypes.Enumeration_Shape);
+		testToCreateSetOfNode(UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
+		testSetOfDrop(UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
+	}
+
+	protected void testToCreateSetOfNode(IElementType type, String containerType) {
+		ListCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < getTopEditPart().getChildren().size()) {
+			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) {
+				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null);
+		//CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, compartment.getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+		for(int i = 0; i < MAX; i++) {
+			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+			Command command = compartment.getCommand(requestcreation);
+			assertNotNull(CREATION + COMMAND_NULL, command);
+			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+			//creation of label
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);
+			//deletion view
+			Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+			command = ((GraphicalEditPart)compartment.getChildren().get(0)).getCommand(deleteViewRequest);
+			assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		}
+	}
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	protected void testSetOfDrop(IElementType type, String containerType) {
+		ListCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < getTopEditPart().getChildren().size()) {
+			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) {
+				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null);
+		//DROP
+		assertTrue(DROP + INITIALIZATION_TEST, compartment.getChildren().size() == 0);
+		assertTrue(DROP + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == MAX);
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		for(int i = 0; i < MAX; i++) {
+			list.add(getRootSemanticModel().getOwnedElements().get(i));
+		}
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(new Point(20, 20));
+		Command command = compartment.getCommand(dropObjectsRequest);
+		assertNotNull(DROP + COMMAND_NULL, command);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DROP + TEST_THE_EXECUTION, compartment.getChildren().size() == MAX);
+		assertTrue(DROP + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == MAX);
+		for(int i = 0; i < MAX; i++) {
+			assertEquals(getRootSemanticModel().getOwnedElements().get(i), ((GraphicalEditPart)compartment.getChildren().get(i)).resolveSemanticElement());
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentIllegalElements.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentIllegalElements.java
index 096e038fd64..bc8df761fe0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentIllegalElements.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentIllegalElements.java
@@ -1,173 +1,173 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;

-import org.junit.Test;

-

-/**

- * 

- *

- */

-public class TestListCompartmentIllegalElements extends AbstractPapyrusTestCase {

-

-	private TestListCompartmentHelper myHelper;

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	@FailingTest

-	public void testClassInClassAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testClassInClassOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInClassOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInClassAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInClassNestedCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInClassNestedCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInInterfaceOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInInterfaceAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInInterfaceNestedCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInInterfaceNestedCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInComponentOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInComponentAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInComponentNestedCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInComponentNestedCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInDataTypeOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, PropertyforDataTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInDataTypeAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, OperationForDataTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInPrimitiveTypeOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, PropertyforPrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInPrimitiveTypeAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, OperationForPrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	private TestListCompartmentHelper getHelper() {

-		if (myHelper == null) {

-			myHelper = new ClassDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);

-		}

-		return myHelper;

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForPrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforPrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;
+import org.junit.Test;
+
+/**
+ * 
+ *
+ */
+public class TestListCompartmentIllegalElements extends AbstractPapyrusTestCase {
+
+	private TestListCompartmentHelper myHelper;
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	@FailingTest
+	public void testClassInClassAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testClassInClassOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInClassOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInClassAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInClassNestedCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInClassNestedCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInInterfaceOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInInterfaceAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInInterfaceNestedCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInInterfaceNestedCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInComponentOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInComponentAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInComponentNestedCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInComponentNestedCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInDataTypeOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, PropertyforDataTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInDataTypeAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, OperationForDataTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInPrimitiveTypeOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, PropertyforPrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInPrimitiveTypeAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, OperationForPrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	private TestListCompartmentHelper getHelper() {
+		if (myHelper == null) {
+			myHelper = new ClassDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);
+		}
+		return myHelper;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentNestedChild.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentNestedChild.java
index 81a6e6e1ed3..63a19c26cb3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentNestedChild.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentNestedChild.java
@@ -1,114 +1,114 @@
-/*****************************************************************************

- * 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 450944

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedComponentForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedComponentForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedComponentForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;

-import org.junit.Test;

-

-/**

- *

- */

-public class TestListCompartmentNestedChild extends AbstractPapyrusTestCase {

-

-	private TestListCompartmentHelper myHelper;

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testNestedComponentVsClass() throws Exception {

-		getHelper().checkChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, NestedComponentForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testNestedComponentVsInterface() throws Exception {

-		getHelper().checkChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, NestedComponentForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testNestedComponentVsComponent() throws Exception {

-		getHelper().checkChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, NestedComponentForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testNestedClasstVsClass() throws Exception {

-		getHelper().checkChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, NestedClassForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testNestedClassVsInterface() throws Exception {

-		getHelper().checkChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, NestedClassForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testNestedClassVsComponent() throws Exception {

-		getHelper().checkChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, NestedClassForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testNestedInterfacetVsClass() throws Exception {

-		getHelper().checkChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, NestedInterfaceForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testNestedInterfaceVsInterface() throws Exception {

-		getHelper().checkChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, NestedInterfaceForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testNestedInterfcaeVsComponent() throws Exception {

-		getHelper().checkChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, NestedInterfaceForComponentEditPart.VISUAL_ID);

-	}

-

-	private TestListCompartmentHelper getHelper() {

-		if (myHelper == null) {

-			myHelper = new ClassDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);

-		}

-		return myHelper;

-	}

-}

+/*****************************************************************************
+ * 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 450944
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedComponentForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedComponentForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedComponentForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class TestListCompartmentNestedChild extends AbstractPapyrusTestCase {
+
+	private TestListCompartmentHelper myHelper;
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testNestedComponentVsClass() throws Exception {
+		getHelper().checkChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, NestedComponentForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testNestedComponentVsInterface() throws Exception {
+		getHelper().checkChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, NestedComponentForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testNestedComponentVsComponent() throws Exception {
+		getHelper().checkChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, NestedComponentForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testNestedClasstVsClass() throws Exception {
+		getHelper().checkChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, NestedClassForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testNestedClassVsInterface() throws Exception {
+		getHelper().checkChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, NestedClassForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testNestedClassVsComponent() throws Exception {
+		getHelper().checkChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, NestedClassForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testNestedInterfacetVsClass() throws Exception {
+		getHelper().checkChildCreate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, NestedInterfaceForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testNestedInterfaceVsInterface() throws Exception {
+		getHelper().checkChildCreate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, NestedInterfaceForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testNestedInterfcaeVsComponent() throws Exception {
+		getHelper().checkChildCreate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, NestedInterfaceForComponentEditPart.VISUAL_ID);
+	}
+
+	private TestListCompartmentHelper getHelper() {
+		if (myHelper == null) {
+			myHelper = new ClassDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);
+		}
+		return myHelper;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentNodesChildDuplicates.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentNodesChildDuplicates.java
index 91b0bac7dd5..5003f528568 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentNodesChildDuplicates.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentNodesChildDuplicates.java
@@ -1,286 +1,286 @@
-/*****************************************************************************

- * 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 450944

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;

-import org.junit.Test;

-

-/**

- *

- */

-public class TestListCompartmentNodesChildDuplicates extends AbstractPapyrusTestCase {

-

-	private TestListCompartmentHelper myHelper;

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testAssociationClassVsProperty() throws Exception {

-		getHelper().checkDuplicate(AssociationClassEditPart.VISUAL_ID, AssociationClassAttributeCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testAssociationClassVsOperation() throws Exception {

-		getHelper().checkDuplicate(AssociationClassEditPart.VISUAL_ID, AssociationClassOperationCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testClassVsProperty() throws Exception {

-		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testClassVsOperation() throws Exception {

-		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testClassVsClass() throws Exception {

-		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID, NestedClassForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testClassVsDataType() throws Exception {

-		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID, NestedDataTypeForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testClassVsEnumeration() throws Exception {

-		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, EnumerationEditPart.VISUAL_ID, NestedEnumerationForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testClassVsInterface() throws Exception {

-		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID, NestedInterfaceForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testClassVsReception() throws Exception {

-		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, ReceptionEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testClassVsPrimitiveType() throws Exception {

-		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID, NestedPrimitiveTypeForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testClassVsSignal() throws Exception {

-		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, SignalEditPart.VISUAL_ID, NestedSignalForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testComponentVsClass() throws Exception {

-		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID, NestedClassForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testComponentVsDataType() throws Exception {

-		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID, NestedDataTypeForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testComponentVsEnumeration() throws Exception {

-		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, EnumerationEditPart.VISUAL_ID, NestedEnumerationForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testComponentVsInterface() throws Exception {

-		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID, NestedInterfaceForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testComponentVsPrimitiveType() throws Exception {

-		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID, NestedPrimitiveTypeForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testComponentVsSignal() throws Exception {

-		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, SignalEditPart.VISUAL_ID, NestedSignalForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testComponentVsOperation() throws Exception {

-		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testComponentVsReception() throws Exception {

-		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, ReceptionEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testComponentVsProperty() throws Exception {

-		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDataTypeVsProperty() throws Exception {

-		getHelper().checkDuplicate(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforDataTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDataTypeVsOperation() throws Exception {

-		getHelper().checkDuplicate(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, OperationForDataTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsOperation() throws Exception {

-		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsReception() throws Exception {

-		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, ReceptionInInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsClass() throws Exception {

-		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID, NestedClassForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsDataType() throws Exception {

-		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID, NestedDataTypeForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsEnumeration() throws Exception {

-		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, EnumerationEditPart.VISUAL_ID, NestedEnumerationForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsInterface() throws Exception {

-		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID, NestedInterfaceForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsPrimitiveType() throws Exception {

-		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID, NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsSignal() throws Exception {

-		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, SignalEditPart.VISUAL_ID, NestedSignalForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsProperty() throws Exception {

-		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPrimitiveTypeVsProperty() throws Exception {

-		getHelper().checkDuplicate(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforPrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPrimitiveTypeVsOperation() throws Exception {

-		getHelper().checkDuplicate(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, OperationForPrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testSignalVsProperty() throws Exception {

-		getHelper().checkDuplicate(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, PropertyForSignalEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testEnumerationVsEnumerationLiteral() throws Exception {

-		getHelper().checkDuplicate(EnumerationEditPart.VISUAL_ID, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID, EnumerationLiteralEditPart.VISUAL_ID);

-	}

-

-	private TestListCompartmentHelper getHelper() {

-		if (myHelper == null) {

-			myHelper = new ClassDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);

-		}

-		return myHelper;

-	}

-}

+/*****************************************************************************
+ * 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 450944
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedDataTypeForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedEnumerationForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedPrimitiveTypeForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedSignalForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForPrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforPrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionInInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class TestListCompartmentNodesChildDuplicates extends AbstractPapyrusTestCase {
+
+	private TestListCompartmentHelper myHelper;
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testAssociationClassVsProperty() throws Exception {
+		getHelper().checkDuplicate(AssociationClassEditPart.VISUAL_ID, AssociationClassAttributeCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testAssociationClassVsOperation() throws Exception {
+		getHelper().checkDuplicate(AssociationClassEditPart.VISUAL_ID, AssociationClassOperationCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testClassVsProperty() throws Exception {
+		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testClassVsOperation() throws Exception {
+		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testClassVsClass() throws Exception {
+		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID, NestedClassForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testClassVsDataType() throws Exception {
+		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID, NestedDataTypeForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testClassVsEnumeration() throws Exception {
+		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, EnumerationEditPart.VISUAL_ID, NestedEnumerationForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testClassVsInterface() throws Exception {
+		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID, NestedInterfaceForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testClassVsReception() throws Exception {
+		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, ReceptionEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testClassVsPrimitiveType() throws Exception {
+		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID, NestedPrimitiveTypeForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testClassVsSignal() throws Exception {
+		getHelper().checkDuplicate(ClassEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, SignalEditPart.VISUAL_ID, NestedSignalForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testComponentVsClass() throws Exception {
+		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID, NestedClassForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testComponentVsDataType() throws Exception {
+		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID, NestedDataTypeForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testComponentVsEnumeration() throws Exception {
+		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, EnumerationEditPart.VISUAL_ID, NestedEnumerationForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testComponentVsInterface() throws Exception {
+		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID, NestedInterfaceForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testComponentVsPrimitiveType() throws Exception {
+		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID, NestedPrimitiveTypeForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testComponentVsSignal() throws Exception {
+		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, SignalEditPart.VISUAL_ID, NestedSignalForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testComponentVsOperation() throws Exception {
+		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testComponentVsReception() throws Exception {
+		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, ReceptionEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testComponentVsProperty() throws Exception {
+		getHelper().checkDuplicate(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDataTypeVsProperty() throws Exception {
+		getHelper().checkDuplicate(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforDataTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDataTypeVsOperation() throws Exception {
+		getHelper().checkDuplicate(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, OperationForDataTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsOperation() throws Exception {
+		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsReception() throws Exception {
+		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, ReceptionInInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsClass() throws Exception {
+		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID, NestedClassForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsDataType() throws Exception {
+		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID, NestedDataTypeForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsEnumeration() throws Exception {
+		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, EnumerationEditPart.VISUAL_ID, NestedEnumerationForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsInterface() throws Exception {
+		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID, NestedInterfaceForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsPrimitiveType() throws Exception {
+		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID, NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsSignal() throws Exception {
+		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, SignalEditPart.VISUAL_ID, NestedSignalForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsProperty() throws Exception {
+		getHelper().checkDuplicate(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPrimitiveTypeVsProperty() throws Exception {
+		getHelper().checkDuplicate(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforPrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPrimitiveTypeVsOperation() throws Exception {
+		getHelper().checkDuplicate(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, OperationForPrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testSignalVsProperty() throws Exception {
+		getHelper().checkDuplicate(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, PropertyForSignalEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testEnumerationVsEnumerationLiteral() throws Exception {
+		getHelper().checkDuplicate(EnumerationEditPart.VISUAL_ID, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID, EnumerationLiteralEditPart.VISUAL_ID);
+	}
+
+	private TestListCompartmentHelper getHelper() {
+		if (myHelper == null) {
+			myHelper = new ClassDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);
+		}
+		return myHelper;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentPropertiesOperationsDrop.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentPropertiesOperationsDrop.java
index b91739fc8e1..deead04d42b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentPropertiesOperationsDrop.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentPropertiesOperationsDrop.java
@@ -1,353 +1,353 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforPrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;

-import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;

-import org.junit.Test;

-

-/**

- * 

- *

- */

-public class TestListCompartmentPropertiesOperationsDrop extends AbstractPapyrusTestCase {

-

-	private TestListCompartmentHelper myHelper;

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	@FailingTest

-	public void testPropertyInClassAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testPropertyInInterfaceAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testPropertyInDataTypeAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforDataTypeEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testPropertyInComponentAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testPropertyInPrimitiveTypeAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforPrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testPropertyInSignalAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, PropertyForSignalEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testOperationInClassOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testOperationInInterfaceOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testOperationInDataTypeOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, OperationForDataTypeEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testOperationInComponentOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testOperationInPrimitiveTypeOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, OperationForPrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInClassDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInInterfaceDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInDataTypeDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforDataTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInComponentDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInPrimitiveTypeDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforPrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInSignalDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, PropertyForSignalEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInClassDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInInterfaceDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInDataTypeDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, OperationForDataTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInComponentDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInPrimitiveTypeDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, OperationForPrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropClass2PropertyAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropClass2OperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropInterface2PropertyAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropInterface2OperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropComponent2PropertyAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, ComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropComponent2OperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, ComponentEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropDataType2PropertyAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropDataType2OperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropSignal2PropertyAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, SignalEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropPrimitiveType2OperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropPrimitiveType2AttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID);

-	}

-

-	/*

-	 * For ASSOCIATION_DIRECTED_EDGE

-	 */

-	

-	@Test

-	public void testDropAssociationEndDirectedProperty2InterfaceAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndDirectedProperty2ClassAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndDirectedProperty2DataTypeAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndDirectedProperty2SignalAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndDirectedProperty2PrimitiveTypeAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndDirectedProperty2ComponentAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);

-	}

-

-	

-	/*

-	 * For ASSOCIATION_NON_DIRECTED_EDGE

-	 */

-	

-	@Test

-	public void testDropAssociationEndCompositeDirectedProperty2InterfaceAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndCompositeDirectedProperty2ClassAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndCompositeDirectedProperty2DataTypeAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndCompositeDirectedProperty2SignalAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndCompositeDirectedProperty2PrimitiveTypeAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropAssociationEndCompositeDirectedProperty2ComponentAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);

-	}

-	

-	/*

-	 * For ASSOCIATION_SHARED_DIRECTED_EDGE

-	 */

-	

-	@Test

-	public void testDropSharedAssociationDirectedProperty2InterfaceAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropSharedAssociationDirectedProperty2ClassAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropSharedAssociationDirectedProperty2DataTypeAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropSharedAssociationDirectedProperty2SignalAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropSharedAssociationDirectedProperty2PrimitiveTypeAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);

-	}

-

-	@Test

-	public void testDropSharedAssociationDirectedProperty2ComponentAttributeCompartment() throws Exception {

-		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);

-	}

-	

-

-	private TestListCompartmentHelper getHelper() {

-		if (myHelper == null) {

-			myHelper = new ClassDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);

-		}

-		return myHelper;

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForPrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforPrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;
+import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;
+import org.junit.Test;
+
+/**
+ * 
+ *
+ */
+public class TestListCompartmentPropertiesOperationsDrop extends AbstractPapyrusTestCase {
+
+	private TestListCompartmentHelper myHelper;
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	@FailingTest
+	public void testPropertyInClassAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testPropertyInInterfaceAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testPropertyInDataTypeAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforDataTypeEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testPropertyInComponentAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testPropertyInPrimitiveTypeAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforPrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testPropertyInSignalAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, PropertyForSignalEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testOperationInClassOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testOperationInInterfaceOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testOperationInDataTypeOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, OperationForDataTypeEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testOperationInComponentOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testOperationInPrimitiveTypeOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, OperationForPrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInClassDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, PropertyForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInInterfaceDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInDataTypeDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforDataTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInComponentDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, PropertyForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInPrimitiveTypeDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, PropertyforPrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInSignalDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, PropertyForSignalEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInClassDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, OperationForClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInInterfaceDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditpart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInDataTypeDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, OperationForDataTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInComponentDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, OperationForComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInPrimitiveTypeDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, OperationForPrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropClass2PropertyAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropClass2OperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(ClassEditPart.VISUAL_ID, ClassOperationCompartmentEditPart.VISUAL_ID, ClassEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropInterface2PropertyAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropInterface2OperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(InterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, InterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropComponent2PropertyAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, ComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropComponent2OperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(ComponentEditPart.VISUAL_ID, ComponentOperationCompartmentEditPart.VISUAL_ID, ComponentEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropDataType2PropertyAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropDataType2OperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(DataTypeEditPart.VISUAL_ID, DataTypeOperationCompartmentEditPart.VISUAL_ID, DataTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropSignal2PropertyAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, SignalEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropPrimitiveType2OperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropPrimitiveType2AttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, PrimitiveTypeEditPart.VISUAL_ID);
+	}
+
+	/*
+	 * For ASSOCIATION_DIRECTED_EDGE
+	 */
+	
+	@Test
+	public void testDropAssociationEndDirectedProperty2InterfaceAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndDirectedProperty2ClassAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndDirectedProperty2DataTypeAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndDirectedProperty2SignalAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndDirectedProperty2PrimitiveTypeAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndDirectedProperty2ComponentAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_DIRECTED_EDGE);
+	}
+
+	
+	/*
+	 * For ASSOCIATION_NON_DIRECTED_EDGE
+	 */
+	
+	@Test
+	public void testDropAssociationEndCompositeDirectedProperty2InterfaceAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndCompositeDirectedProperty2ClassAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndCompositeDirectedProperty2DataTypeAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndCompositeDirectedProperty2SignalAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndCompositeDirectedProperty2PrimitiveTypeAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropAssociationEndCompositeDirectedProperty2ComponentAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_COMPOSITE_DIRECTED_EDGE);
+	}
+	
+	/*
+	 * For ASSOCIATION_SHARED_DIRECTED_EDGE
+	 */
+	
+	@Test
+	public void testDropSharedAssociationDirectedProperty2InterfaceAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropSharedAssociationDirectedProperty2ClassAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropSharedAssociationDirectedProperty2DataTypeAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropSharedAssociationDirectedProperty2SignalAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropSharedAssociationDirectedProperty2PrimitiveTypeAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);
+	}
+
+	@Test
+	public void testDropSharedAssociationDirectedProperty2ComponentAttributeCompartment() throws Exception {
+		getHelper().checkDropAssociationEndPropertyFromModelExplorer(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, UMLDIElementTypes.ASSOCIATION_SHARED_DIRECTED_EDGE);
+	}
+	
+
+	private TestListCompartmentHelper getHelper() {
+		if (myHelper == null) {
+			myHelper = new ClassDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);
+		}
+		return myHelper;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestMultiLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestMultiLink.java
index a655f4fa954..5695663af16 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestMultiLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestMultiLink.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractTestMultiLink;

-import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;

-import org.junit.Test;

-

-public class TestMultiLink extends AbstractTestMultiLink {

-

-	@Override

-	protected CreateViewRequest createViewRequestShapeContainer() {

-		

-		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_Shape, getDiagramEditPart().getDiagramPreferencesHint());

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage dependency.

-	 */

-	@Test

-	public void testToManageMultiDependency() {

-		testToManageMultiLink(UMLElementTypes.Dependency_Edge, UMLElementTypes.Dependency_BranchEdge, true);

-	}

-

-	/**

-	 * Test to manage multiassociation.

-	 */

-	@Test

-	public void testToManageMultiAssociation() {

-		testToManageMultiLink(UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE, UMLElementTypes.Association_BranchEdge, false);

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.test.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractTestMultiLink;
+import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;
+import org.junit.Test;
+
+public class TestMultiLink extends AbstractTestMultiLink {
+
+	@Override
+	protected CreateViewRequest createViewRequestShapeContainer() {
+		
+		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_Shape, getDiagramEditPart().getDiagramPreferencesHint());
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage dependency.
+	 */
+	@Test
+	public void testToManageMultiDependency() {
+		testToManageMultiLink(UMLElementTypes.Dependency_Edge, UMLElementTypes.Dependency_BranchEdge, true);
+	}
+
+	/**
+	 * Test to manage multiassociation.
+	 */
+	@Test
+	public void testToManageMultiAssociation() {
+		testToManageMultiLink(UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE, UMLElementTypes.Association_BranchEdge, false);
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestRedefinableTemplateSignature.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestRedefinableTemplateSignature.java
index fb962038ba4..58b5cbb01c2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestRedefinableTemplateSignature.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestRedefinableTemplateSignature.java
@@ -1,137 +1,137 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.Map;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.uml2.uml.TemplateSignature;

-import org.eclipse.uml2.uml.TemplateableElement;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * RedefinableTemplateSignature affixed node tests

- */

-public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase {

-

-	/**

-	 * Test Interface redefinable template signature

-	 */

-	@Test

-	public void testToManageInterface() {

-		testRedefinableTemplateSignature(UMLElementTypes.Interface_Shape);

-	}

-

-	/**

-	 * Test Class redefinable template signature

-	 */

-	@Test

-	public void testToManageClass() {

-		testRedefinableTemplateSignature(UMLElementTypes.Class_Shape);

-	}

-

-	/**

-	 * Test Signal redefinable template signature

-	 */

-	@Test

-	public void testToManageSignal() {

-		testRedefinableTemplateSignature(UMLElementTypes.Signal_Shape);

-	}

-

-	/**

-	 * Test DataType redefinable template signature

-	 */

-	@Test

-	public void testToManageDataType() {

-		testRedefinableTemplateSignature(UMLElementTypes.DataType_Shape);

-	}

-

-	/**

-	 * Test PrimitiveType redefinable template signature

-	 */

-	@Test

-	public void testToManagePrimitiveType() {

-		testRedefinableTemplateSignature(UMLElementTypes.PrimitiveType_Shape);

-	}

-

-	/**

-	 * Test Enumeration redefinable template signature

-	 */

-	@Test

-	public void testToManageEnumeration() {

-		testRedefinableTemplateSignature(UMLElementTypes.Enumeration_Shape);

-	}

-

-	/**

-	 * Test Component redefinable template signature

-	 */

-	@Test

-	public void testToManageComponent() {

-		testRedefinableTemplateSignature(UMLElementTypes.Component_Shape);

-	}

-

-	protected void testRedefinableTemplateSignature(IElementType container) {

-		createAffixedChildNode(container, getTemplateableSignature());

-	}

-

-	protected IElementType getTemplateableSignature() {

-		return UMLElementTypes.RedefinableTemplateSignature_Shape;

-	}

-

-	protected void createAffixedChildNode(IElementType container, IElementType child) {

-		IGraphicalEditPart containerEP = createChild(getDiagramEditPart(), container);

-		EObject containerSemantic = containerEP.resolveSemanticElement();

-		assertTrue("Expected container as TemplateableElement.", containerSemantic instanceof TemplateableElement);

-		IGraphicalEditPart affixedEP = createChild(containerEP, child);

-		EObject affixedSemantic = affixedEP.resolveSemanticElement();

-		TemplateSignature templateSignature = ((TemplateableElement) containerSemantic).getOwnedTemplateSignature();

-		assertNotNull("Container should contains template signature.", templateSignature);

-		assertEquals(affixedSemantic, templateSignature);

-	}

-

-	private IGraphicalEditPart createChild(IGraphicalEditPart container, IElementType childType) {

-		Point location = new Point(0, 0);

-		final CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(childType, container.getDiagramPreferencesHint());

-		@SuppressWarnings("unchecked")

-		Map<Object, Object> params = requestcreation.getExtendedData();

-		params.put(AspectUnspecifiedTypeCreationTool.INITIAL_MOUSE_LOCATION_FOR_CREATION, location);

-		requestcreation.setSize(new Dimension(10, 10));

-		requestcreation.setLocation(location);

-		Command command = container.getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		executeOnUIThread(command);

-		EditPart createdEditPart = (EditPart) container.getChildren().get((container.getChildren().size() - 1));

-		Assert.assertNotNull("The editpart must be created", createdEditPart); //$NON-NLS-1$

-		Assert.assertTrue(createdEditPart instanceof IGraphicalEditPart);

-		return (IGraphicalEditPart) createdEditPart;

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.TemplateSignature;
+import org.eclipse.uml2.uml.TemplateableElement;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * RedefinableTemplateSignature affixed node tests
+ */
+public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase {
+
+	/**
+	 * Test Interface redefinable template signature
+	 */
+	@Test
+	public void testToManageInterface() {
+		testRedefinableTemplateSignature(UMLElementTypes.Interface_Shape);
+	}
+
+	/**
+	 * Test Class redefinable template signature
+	 */
+	@Test
+	public void testToManageClass() {
+		testRedefinableTemplateSignature(UMLElementTypes.Class_Shape);
+	}
+
+	/**
+	 * Test Signal redefinable template signature
+	 */
+	@Test
+	public void testToManageSignal() {
+		testRedefinableTemplateSignature(UMLElementTypes.Signal_Shape);
+	}
+
+	/**
+	 * Test DataType redefinable template signature
+	 */
+	@Test
+	public void testToManageDataType() {
+		testRedefinableTemplateSignature(UMLElementTypes.DataType_Shape);
+	}
+
+	/**
+	 * Test PrimitiveType redefinable template signature
+	 */
+	@Test
+	public void testToManagePrimitiveType() {
+		testRedefinableTemplateSignature(UMLElementTypes.PrimitiveType_Shape);
+	}
+
+	/**
+	 * Test Enumeration redefinable template signature
+	 */
+	@Test
+	public void testToManageEnumeration() {
+		testRedefinableTemplateSignature(UMLElementTypes.Enumeration_Shape);
+	}
+
+	/**
+	 * Test Component redefinable template signature
+	 */
+	@Test
+	public void testToManageComponent() {
+		testRedefinableTemplateSignature(UMLElementTypes.Component_Shape);
+	}
+
+	protected void testRedefinableTemplateSignature(IElementType container) {
+		createAffixedChildNode(container, getTemplateableSignature());
+	}
+
+	protected IElementType getTemplateableSignature() {
+		return UMLElementTypes.RedefinableTemplateSignature_Shape;
+	}
+
+	protected void createAffixedChildNode(IElementType container, IElementType child) {
+		IGraphicalEditPart containerEP = createChild(getDiagramEditPart(), container);
+		EObject containerSemantic = containerEP.resolveSemanticElement();
+		assertTrue("Expected container as TemplateableElement.", containerSemantic instanceof TemplateableElement);
+		IGraphicalEditPart affixedEP = createChild(containerEP, child);
+		EObject affixedSemantic = affixedEP.resolveSemanticElement();
+		TemplateSignature templateSignature = ((TemplateableElement) containerSemantic).getOwnedTemplateSignature();
+		assertNotNull("Container should contains template signature.", templateSignature);
+		assertEquals(affixedSemantic, templateSignature);
+	}
+
+	private IGraphicalEditPart createChild(IGraphicalEditPart container, IElementType childType) {
+		Point location = new Point(0, 0);
+		final CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(childType, container.getDiagramPreferencesHint());
+		@SuppressWarnings("unchecked")
+		Map<Object, Object> params = requestcreation.getExtendedData();
+		params.put(AspectUnspecifiedTypeCreationTool.INITIAL_MOUSE_LOCATION_FOR_CREATION, location);
+		requestcreation.setSize(new Dimension(10, 10));
+		requestcreation.setLocation(location);
+		Command command = container.getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		executeOnUIThread(command);
+		EditPart createdEditPart = (EditPart) container.getChildren().get((container.getChildren().size() - 1));
+		Assert.assertNotNull("The editpart must be created", createdEditPart); //$NON-NLS-1$
+		Assert.assertTrue(createdEditPart instanceof IGraphicalEditPart);
+		return (IGraphicalEditPart) createdEditPart;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/legacy/PackageDiagramLegacyTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/legacy/PackageDiagramLegacyTest.java
index 99d8012f4a0..339fd892f5a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/legacy/PackageDiagramLegacyTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/legacy/PackageDiagramLegacyTest.java
@@ -1,108 +1,108 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.legacy;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.emf.common.ui.URIEditorInput;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * Test class for opening Papyrus 0.10.x Package Diagrams in Papyrus >= 1.0.x

- *

- * @author Camille Letavernier

- *

- */

-public class PackageDiagramLegacyTest extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	protected IMultiDiagramEditor editor;

-

-	protected IPageManager pageManager;

-

-	@Before

-	public void initModel() throws Exception {

-		IProject project = houseKeeper.createProject("uml2.4diagrams");

-		IFile diFile = houseKeeper.createFile(project, "package24.di", "model/legacyPackage/package24.di");

-		houseKeeper.createFile(project, "package24.uml", "model/legacyPackage/package24.uml");

-		houseKeeper.createFile(project, "package24.notation", "model/legacyPackage/package24.notation");

-

-		editor = houseKeeper.openPapyrusEditor(diFile);

-		pageManager = ServiceUtils.getInstance().getService(IPageManager.class, editor.getServicesRegistry());

-	}

-

-	@Test

-	public void testOpening24PackageModel() throws Exception {

-		Assert.assertEquals(3, pageManager.allPages().size());

-

-		Diagram diagram1 = getDiagram("Diagram1");

-		Assert.assertEquals("PapyrusUMLClassDiagram", diagram1.getType());

-		pageManager.selectPage(diagram1);

-

-		IEditorPart diagram1Editor = editor.getActiveEditor();

-		Assert.assertTrue(diagram1Editor instanceof UmlClassDiagramForMultiEditor);

-	}

-

-	protected Diagram getDiagram(String name) {

-		for (Object page : pageManager.allPages()) {

-			if (page instanceof Diagram) {

-				if (name.equals(((Diagram) page).getName())) {

-					return (Diagram) page;

-				}

-			}

-		}

-		return null;

-	}

-

-	@Test

-	public void testOpening24PackageDiagram() throws Exception {

-		Assert.assertEquals(3, pageManager.allPages().size());

-

-		Diagram closedDiagram = getDiagram("ClosedDiagram");

-		Diagram invalidDiagram = getDiagram("InvalidDiagram");

-

-		pageManager.closePage(invalidDiagram);

-

-		pageManager.openPage(closedDiagram);

-

-		// Assert.assertEquals("PapyrusUMLClassDiagram", closedDiagram.getType());

-

-		pageManager.selectPage(closedDiagram); // Workaround for an unrelated bug: the page is not immediately selected after it has been opened

-

-		IEditorPart closedDiagramEditor = editor.getActiveEditor();

-

-		Assert.assertEquals(closedDiagramEditor.getClass(), UmlClassDiagramForMultiEditor.class);

-

-		IEditorInput input = closedDiagramEditor.getEditorInput();

-		Assert.assertTrue(input instanceof URIEditorInput);

-		URIEditorInput uriInput = (URIEditorInput) input;

-

-		Assert.assertTrue(uriInput.getURI().equals(EcoreUtil.getURI(closedDiagram)));

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.legacy;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.emf.common.ui.URIEditorInput;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test class for opening Papyrus 0.10.x Package Diagrams in Papyrus >= 1.0.x
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class PackageDiagramLegacyTest extends AbstractPapyrusTest {
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	protected IMultiDiagramEditor editor;
+
+	protected IPageManager pageManager;
+
+	@Before
+	public void initModel() throws Exception {
+		IProject project = houseKeeper.createProject("uml2.4diagrams");
+		IFile diFile = houseKeeper.createFile(project, "package24.di", "model/legacyPackage/package24.di");
+		houseKeeper.createFile(project, "package24.uml", "model/legacyPackage/package24.uml");
+		houseKeeper.createFile(project, "package24.notation", "model/legacyPackage/package24.notation");
+
+		editor = houseKeeper.openPapyrusEditor(diFile);
+		pageManager = ServiceUtils.getInstance().getService(IPageManager.class, editor.getServicesRegistry());
+	}
+
+	@Test
+	public void testOpening24PackageModel() throws Exception {
+		Assert.assertEquals(3, pageManager.allPages().size());
+
+		Diagram diagram1 = getDiagram("Diagram1");
+		Assert.assertEquals("PapyrusUMLClassDiagram", diagram1.getType());
+		pageManager.selectPage(diagram1);
+
+		IEditorPart diagram1Editor = editor.getActiveEditor();
+		Assert.assertTrue(diagram1Editor instanceof UmlClassDiagramForMultiEditor);
+	}
+
+	protected Diagram getDiagram(String name) {
+		for (Object page : pageManager.allPages()) {
+			if (page instanceof Diagram) {
+				if (name.equals(((Diagram) page).getName())) {
+					return (Diagram) page;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Test
+	public void testOpening24PackageDiagram() throws Exception {
+		Assert.assertEquals(3, pageManager.allPages().size());
+
+		Diagram closedDiagram = getDiagram("ClosedDiagram");
+		Diagram invalidDiagram = getDiagram("InvalidDiagram");
+
+		pageManager.closePage(invalidDiagram);
+
+		pageManager.openPage(closedDiagram);
+
+		// Assert.assertEquals("PapyrusUMLClassDiagram", closedDiagram.getType());
+
+		pageManager.selectPage(closedDiagram); // Workaround for an unrelated bug: the page is not immediately selected after it has been opened
+
+		IEditorPart closedDiagramEditor = editor.getActiveEditor();
+
+		Assert.assertEquals(closedDiagramEditor.getClass(), UmlClassDiagramForMultiEditor.class);
+
+		IEditorInput input = closedDiagramEditor.getEditorInput();
+		Assert.assertTrue(input instanceof URIEditorInput);
+		URIEditorInput uriInput = (URIEditorInput) input;
+
+		Assert.assertTrue(uriInput.getURI().equals(EcoreUtil.getURI(closedDiagram)));
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load100ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load100ClassTest.java
index 56ad445a481..2711dc2b4b0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load100ClassTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load100ClassTest.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Ignore;

-import org.junit.Test;

-

-

-/**

- * The Class Load100ClassTest.

- */

-public class Load100ClassTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-	}

-

-	/**

-	 * Test load100 class.

-	 */

-	@Ignore

-	@Test

-	public void testLoad100Class() {

-		for(int i = 0; i < 100; i++) {

-			testToCreateANode(UMLElementTypes.Class_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * The Class Load100ClassTest.
+ */
+public class Load100ClassTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+	}
+
+	/**
+	 * Test load100 class.
+	 */
+	@Ignore
+	@Test
+	public void testLoad100Class() {
+		for(int i = 0; i < 100; i++) {
+			testToCreateANode(UMLElementTypes.Class_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load10ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load10ClassTest.java
index 1cc1998adaf..51685e6ce40 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load10ClassTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load10ClassTest.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Ignore;

-import org.junit.Test;

-

-

-/**

- * The Class Load10ClassTest.

- */

-public class Load10ClassTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-	}

-

-	/**

-	 * Test load10 class.

-	 */

-	@Ignore

-	@Test

-	public void testLoad10Class() {

-		for(int i = 0; i < 10; i++) {

-			testToCreateANode(UMLElementTypes.Class_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * The Class Load10ClassTest.
+ */
+public class Load10ClassTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+	}
+
+	/**
+	 * Test load10 class.
+	 */
+	@Ignore
+	@Test
+	public void testLoad10Class() {
+		for(int i = 0; i < 10; i++) {
+			testToCreateANode(UMLElementTypes.Class_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load200ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load200ClassTest.java
index 4497024e352..4798171ab14 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load200ClassTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load200ClassTest.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Ignore;

-import org.junit.Test;

-

-

-/**

- * The Class Load200ClassTest.

- */

-public class Load200ClassTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-	}

-

-	/**

-	 * Test load200 class.

-	 */

-	@Ignore

-	@Test

-	public void testLoad200Class() {

-		for(int i = 0; i < 200; i++) {

-			testToCreateANode(UMLElementTypes.Class_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * The Class Load200ClassTest.
+ */
+public class Load200ClassTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+	}
+
+	/**
+	 * Test load200 class.
+	 */
+	@Ignore
+	@Test
+	public void testLoad200Class() {
+		for(int i = 0; i < 200; i++) {
+			testToCreateANode(UMLElementTypes.Class_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load300ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load300ClassTest.java
index 45413444bb0..b0dd77b4b21 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load300ClassTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load300ClassTest.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Ignore;

-import org.junit.Test;

-

-

-/**

- * The Class Load300ClassTest.

- */

-public class Load300ClassTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-	}

-

-	/**

-	 * Test load300 class.

-	 */

-	@Ignore

-	@Test

-	public void testLoad300Class() {

-		for(int i = 0; i < 300; i++) {

-			testToCreateANode(UMLElementTypes.Class_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * The Class Load300ClassTest.
+ */
+public class Load300ClassTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+	}
+
+	/**
+	 * Test load300 class.
+	 */
+	@Ignore
+	@Test
+	public void testLoad300Class() {
+		for(int i = 0; i < 300; i++) {
+			testToCreateANode(UMLElementTypes.Class_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load400ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load400ClassTest.java
index 757e9d94336..28b72b13f98 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load400ClassTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load400ClassTest.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Ignore;

-import org.junit.Test;

-

-

-/**

- * The Class Load400ClassTest.

- */

-public class Load400ClassTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-	}

-

-	/**

-	 * Test load400 class.

-	 */

-	@Ignore

-	@Test

-	public void testLoad400Class() {

-		for(int i = 0; i < 400; i++) {

-			testToCreateANode(UMLElementTypes.Class_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * The Class Load400ClassTest.
+ */
+public class Load400ClassTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+	}
+
+	/**
+	 * Test load400 class.
+	 */
+	@Ignore
+	@Test
+	public void testLoad400Class() {
+		for(int i = 0; i < 400; i++) {
+			testToCreateANode(UMLElementTypes.Class_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load500ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load500ClassTest.java
index 9bfef5fabe4..991b8eb6c5c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load500ClassTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load500ClassTest.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Ignore;

-import org.junit.Test;

-

-

-/**

- * The Class Load500ClassTest.

- */

-public class Load500ClassTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IClassDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IClassDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-	}

-

-	/**

-	 * Test load500 class.

-	 */

-	@Ignore

-	@Test

-	public void testLoad500Class() {

-		for(int i = 0; i < 500; i++) {

-			testToCreateANode(UMLElementTypes.Class_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.test.IClassDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.clazz.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * The Class Load500ClassTest.
+ */
+public class Load500ClassTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IClassDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IClassDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+	}
+
+	/**
+	 * Test load500 class.
+	 */
+	@Ignore
+	@Test
+	public void testLoad500Class() {
+		for(int i = 0; i < 500; i++) {
+			testToCreateANode(UMLElementTypes.Class_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/LoadTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/LoadTests.java
index 42b346b5189..4c494d230c6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/LoadTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/LoadTests.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.uml.diagram.clazz.test.load;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-// 10 classes

-Load10ClassTest.class,

-// 100 classes

-Load100ClassTest.class,

-// 200 classes

-Load200ClassTest.class,

-// 300 classes

-Load300ClassTest.class,

-// 400 classes

-Load400ClassTest.class,

-// 500 classes

-Load500ClassTest.class, })

-public class LoadTests {

-}

+/*****************************************************************************
+ * 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.uml.diagram.clazz.test.load;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All tests together.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+// 10 classes
+Load10ClassTest.class,
+// 100 classes
+Load100ClassTest.class,
+// 200 classes
+Load200ClassTest.class,
+// 300 classes
+Load300ClassTest.class,
+// 400 classes
+Load400ClassTest.class,
+// 500 classes
+Load500ClassTest.class, })
+public class LoadTests {
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/tests/RoundedCompartmentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/tests/RoundedCompartmentTest.java
index 374c11ceea5..6d7eeae9f7b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/tests/RoundedCompartmentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/tests/RoundedCompartmentTest.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

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.test.tests;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;

-

-/**

- * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.

- */

-public class RoundedCompartmentTest extends AbstractGenericShapeTest {

-

-	/**

-	 * Gets the rounded compartment edit parts.

-	 *

-	 * @return the rounded compartment edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()

-	 */

-	public List<Class<?>> getRoundedCompartmentEditParts() {

-

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-		classes.add(AssociationNodeEditPart.class);

-		classes.add(AssociationClassEditPart.class);

-		classes.add(ClassEditPart.class);

-		classes.add(ClassEditPartCN.class);

-		classes.add(ComponentEditPart.class);

-		classes.add(ComponentEditPartCN.class);

-		classes.add(DataTypeEditPart.class);

-		classes.add(DataTypeEditPartCN.class);

-		classes.add(EnumerationEditPart.class);

-		classes.add(EnumerationEditPartCN.class);

-		classes.add(InformationItemEditPart.class);

-		classes.add(InformationItemEditPartCN.class);

-		classes.add(InterfaceEditPart.class);

-		classes.add(InterfaceEditPartCN.class);

-		classes.add(PrimitiveTypeEditPart.class);

-		classes.add(PrimitiveTypeEditPartCN.class);

-		classes.add(SignalEditPart.class);

-		classes.add(SignalEditPartCN.class);

-		classes.add(DurationObservationEditPart.class);

-		classes.add(InstanceSpecificationEditPart.class);

-		classes.add(InstanceSpecificationEditPartCN.class);

-		classes.add(ModelEditPartCN.class);

-		classes.add(ModelEditPartTN.class);

-		classes.add(PackageEditPart.class);

-		classes.add(PackageEditPartCN.class);

-		classes.add(TimeObservationEditPart.class);

-

-		return classes;

-	}

-

-	/**

-	 * Gets the rounded border named element edit parts.

-	 *

-	 * @return the rounded border named element edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()

-	 */

-	public List<Class<?>> getRoundedBorderNamedElementEditParts() {

-		return new ArrayList<Class<?>>();

-

-	}

-}

+/*****************************************************************************
+ * 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
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.test.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;
+
+/**
+ * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.
+ */
+public class RoundedCompartmentTest extends AbstractGenericShapeTest {
+
+	/**
+	 * Gets the rounded compartment edit parts.
+	 *
+	 * @return the rounded compartment edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()
+	 */
+	public List<Class<?>> getRoundedCompartmentEditParts() {
+
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+		classes.add(AssociationNodeEditPart.class);
+		classes.add(AssociationClassEditPart.class);
+		classes.add(ClassEditPart.class);
+		classes.add(ClassEditPartCN.class);
+		classes.add(ComponentEditPart.class);
+		classes.add(ComponentEditPartCN.class);
+		classes.add(DataTypeEditPart.class);
+		classes.add(DataTypeEditPartCN.class);
+		classes.add(EnumerationEditPart.class);
+		classes.add(EnumerationEditPartCN.class);
+		classes.add(InformationItemEditPart.class);
+		classes.add(InformationItemEditPartCN.class);
+		classes.add(InterfaceEditPart.class);
+		classes.add(InterfaceEditPartCN.class);
+		classes.add(PrimitiveTypeEditPart.class);
+		classes.add(PrimitiveTypeEditPartCN.class);
+		classes.add(SignalEditPart.class);
+		classes.add(SignalEditPartCN.class);
+		classes.add(DurationObservationEditPart.class);
+		classes.add(InstanceSpecificationEditPart.class);
+		classes.add(InstanceSpecificationEditPartCN.class);
+		classes.add(ModelEditPartCN.class);
+		classes.add(ModelEditPartTN.class);
+		classes.add(PackageEditPart.class);
+		classes.add(PackageEditPartCN.class);
+		classes.add(TimeObservationEditPart.class);
+
+		return classes;
+	}
+
+	/**
+	 * Gets the rounded border named element edit parts.
+	 *
+	 * @return the rounded border named element edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()
+	 */
+	public List<Class<?>> getRoundedBorderNamedElementEditParts() {
+		return new ArrayList<Class<?>>();
+
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.project b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.project
index c4f9f1a4e4a..1941233f639 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.project
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.common.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.common.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
index d4bfe9be2fe..83923b40010 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
@@ -1,43 +1,43 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit,

- org.eclipse.emf.transaction,

- org.eclipse.ui.ide,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.notation.edit,

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.types.core;bundle-version="[3.1.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.common.tests,

- org.eclipse.papyrus.uml.diagram.common.tests.css,

- org.eclipse.papyrus.uml.diagram.common.tests.parser,

- org.eclipse.papyrus.uml.diagram.common.tests.tests

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.3.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.tests.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: This plugin provides tests for the papyrus plugin UML Diagram Common

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit,
+ org.eclipse.emf.transaction,
+ org.eclipse.ui.ide,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation.edit,
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[3.1.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.common.tests,
+ org.eclipse.papyrus.uml.diagram.common.tests.css,
+ org.eclipse.papyrus.uml.diagram.common.tests.parser,
+ org.eclipse.papyrus.uml.diagram.common.tests.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.3.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.tests.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: This plugin provides tests for the papyrus plugin UML Diagram Common
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/build.properties
index 564e70fb658..2051ac1de8e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/build.properties
@@ -1,10 +1,10 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               resources/,\

-               org.eclipse.papyrus.uml.diagram.common.tests.launch,\

-               about.html,\

-               plugin.properties,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               resources/,\
+               org.eclipse.papyrus.uml.diagram.common.tests.launch,\
+               about.html,\
+               plugin.properties,\
+               plugin.xml
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/plugin.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/plugin.properties
index 73be7a48cd7..88953fa1862 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/plugin.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/plugin.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.uml.diagram.common.tests

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.uml.diagram.common.tests
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus UML Diagram Common Tests
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.notation
index 50a163408f8..985ca29b286 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.notation
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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">

-  <notation:Diagram xmi:id="_0sIY8McAEeOWXJw_sGK0hw" type="PapyrusUMLClassDiagram" name="Main" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_AXnvsMcBEeOWXJw_sGK0hw" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_AXt2UMcBEeOWXJw_sGK0hw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_AXyu0McBEeOWXJw_sGK0hw" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_AXyu0ccBEeOWXJw_sGK0hw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_AXyu0scBEeOWXJw_sGK0hw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_AXyu08cBEeOWXJw_sGK0hw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXyu1McBEeOWXJw_sGK0hw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_AXzV4McBEeOWXJw_sGK0hw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_AXzV4ccBEeOWXJw_sGK0hw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_AXzV4scBEeOWXJw_sGK0hw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_AXzV48cBEeOWXJw_sGK0hw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXzV5McBEeOWXJw_sGK0hw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_AXzV5ccBEeOWXJw_sGK0hw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_AXzV5scBEeOWXJw_sGK0hw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_AXzV58cBEeOWXJw_sGK0hw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_AXzV6McBEeOWXJw_sGK0hw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXzV6ccBEeOWXJw_sGK0hw"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_bvZHMMcDEeOWXJw_sGK0hw" name="cssClass">

-        <stringListValue>horizontalGradient</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#_AWuX0McBEeOWXJw_sGK0hw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXnvsccBEeOWXJw_sGK0hw" x="137" y="56" width="149" height="117"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_VZ4MEMcCEeOWXJw_sGK0hw" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_VZ4zIMcCEeOWXJw_sGK0hw" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VZ5aMMcCEeOWXJw_sGK0hw" type="7016">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_VZ5aMccCEeOWXJw_sGK0hw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VZ5aMscCEeOWXJw_sGK0hw"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_c9NlMMcDEeOWXJw_sGK0hw" name="cssClass">

-        <stringListValue>fillRed</stringListValue>

-        <stringListValue>horizontalGradient</stringListValue>

-      </styles>

-      <element xmi:type="uml:Package" href="model.uml#_VZ1IwMcCEeOWXJw_sGK0hw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VZ4MEccCEeOWXJw_sGK0hw" x="133" y="234" width="193" height="147"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_iUiDIMq8EeO8w-_dLZ4fFQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_iUj4UMq8EeO8w-_dLZ4fFQ" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_iUj4Ucq8EeO8w-_dLZ4fFQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_iUj4Usq8EeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_iUj4U8q8EeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iUj4VMq8EeO8w-_dLZ4fFQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUj4Vcq8EeO8w-_dLZ4fFQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_iUkfYMq8EeO8w-_dLZ4fFQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_iUkfYcq8EeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_iUkfYsq8EeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iUkfY8q8EeO8w-_dLZ4fFQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUkfZMq8EeO8w-_dLZ4fFQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_iUkfZcq8EeO8w-_dLZ4fFQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_iUkfZsq8EeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_iUkfZ8q8EeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iUkfaMq8EeO8w-_dLZ4fFQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUkfacq8EeO8w-_dLZ4fFQ"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_oQ7wIMq8EeO8w-_dLZ4fFQ" name="cssClass">

-        <stringListValue>fontWhite</stringListValue>

-        <stringListValue>noBorder</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#_iUGlUMq8EeO8w-_dLZ4fFQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUiDIcq8EeO8w-_dLZ4fFQ" x="533" y="247" width="161" height="132"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_qyooIMrNEeO8w-_dLZ4fFQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qyp2QMrNEeO8w-_dLZ4fFQ" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qyqdUMrNEeO8w-_dLZ4fFQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qyqdUcrNEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qyqdUsrNEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qyqdU8rNEeO8w-_dLZ4fFQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyqdVMrNEeO8w-_dLZ4fFQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qyrEYMrNEeO8w-_dLZ4fFQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qyrEYcrNEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qyrEYsrNEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qyrEY8rNEeO8w-_dLZ4fFQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyrEZMrNEeO8w-_dLZ4fFQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qyrrcMrNEeO8w-_dLZ4fFQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qyrrccrNEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qyrrcsrNEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qyrrc8rNEeO8w-_dLZ4fFQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyrrdMrNEeO8w-_dLZ4fFQ"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_-LcP4MrNEeO8w-_dLZ4fFQ" name="cssClass">

-        <stringListValue>noBorder</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#_qyhTYMrNEeO8w-_dLZ4fFQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyooIcrNEeO8w-_dLZ4fFQ" x="616" y="246" width="141" height="132"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_gfl1kMrOEeO8w-_dLZ4fFQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_gfnDsMrOEeO8w-_dLZ4fFQ" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_gfnDscrOEeO8w-_dLZ4fFQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_gfnDssrOEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_gfnDs8rOEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_gfnDtMrOEeO8w-_dLZ4fFQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gfnDtcrOEeO8w-_dLZ4fFQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_gfnqwMrOEeO8w-_dLZ4fFQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_gfnqwcrOEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_gfnqwsrOEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_gfnqw8rOEeO8w-_dLZ4fFQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gfnqxMrOEeO8w-_dLZ4fFQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_gfoR0MrOEeO8w-_dLZ4fFQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_gfoR0crOEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_gfoR0srOEeO8w-_dLZ4fFQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_gfoR08rOEeO8w-_dLZ4fFQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gfoR1MrOEeO8w-_dLZ4fFQ"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_l3UvQMrOEeO8w-_dLZ4fFQ" name="cssClass">

-        <stringListValue>noBorder</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#_gfiLMMrOEeO8w-_dLZ4fFQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gfl1kcrOEeO8w-_dLZ4fFQ" x="420" y="251" width="141" height="128"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_0sIY8ccAEeOWXJw_sGK0hw"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_0sIY8scAEeOWXJw_sGK0hw">

-      <owner xmi:type="uml:Model" href="model.uml#_0qL4MMcAEeOWXJw_sGK0hw"/>

-    </styles>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="__5ozMMcAEeOWXJw_sGK0hw" name="css_stylesheets" eObjectListValue="__5rPcMcAEeOWXJw_sGK0hw"/>

-    <element xmi:type="uml:Model" href="model.uml#_0qL4MMcAEeOWXJw_sGK0hw"/>

-  </notation:Diagram>

-  <css:EmbeddedStyleSheet xmi:id="__5rPcMcAEeOWXJw_sGK0hw" label="TestStyleSheet" content="Class {&#xD;&#xA;&#x9;fontColor:red;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;Package {&#xD;&#xA;&#x9;fontColor:blue;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;.fillRed {&#xD;&#xA;&#x9; fillColor: #FF0000;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;.horizontalGradient {&#xD;&#xA; &#x9;gradient: #00FF00 horizontal;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;.fontWhite {&#xD;&#xA;&#x9;fontColor:white;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;.noBorder {&#xD;&#xA;&#x9;displayBorder:false;&#xD;&#xA;}"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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">
+  <notation:Diagram xmi:id="_0sIY8McAEeOWXJw_sGK0hw" type="PapyrusUMLClassDiagram" name="Main" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_AXnvsMcBEeOWXJw_sGK0hw" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_AXt2UMcBEeOWXJw_sGK0hw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_AXyu0McBEeOWXJw_sGK0hw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_AXyu0ccBEeOWXJw_sGK0hw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_AXyu0scBEeOWXJw_sGK0hw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_AXyu08cBEeOWXJw_sGK0hw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXyu1McBEeOWXJw_sGK0hw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_AXzV4McBEeOWXJw_sGK0hw" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_AXzV4ccBEeOWXJw_sGK0hw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_AXzV4scBEeOWXJw_sGK0hw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_AXzV48cBEeOWXJw_sGK0hw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXzV5McBEeOWXJw_sGK0hw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_AXzV5ccBEeOWXJw_sGK0hw" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_AXzV5scBEeOWXJw_sGK0hw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_AXzV58cBEeOWXJw_sGK0hw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_AXzV6McBEeOWXJw_sGK0hw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXzV6ccBEeOWXJw_sGK0hw"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_bvZHMMcDEeOWXJw_sGK0hw" name="cssClass">
+        <stringListValue>horizontalGradient</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#_AWuX0McBEeOWXJw_sGK0hw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXnvsccBEeOWXJw_sGK0hw" x="137" y="56" width="149" height="117"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_VZ4MEMcCEeOWXJw_sGK0hw" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_VZ4zIMcCEeOWXJw_sGK0hw" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VZ5aMMcCEeOWXJw_sGK0hw" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VZ5aMccCEeOWXJw_sGK0hw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VZ5aMscCEeOWXJw_sGK0hw"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_c9NlMMcDEeOWXJw_sGK0hw" name="cssClass">
+        <stringListValue>fillRed</stringListValue>
+        <stringListValue>horizontalGradient</stringListValue>
+      </styles>
+      <element xmi:type="uml:Package" href="model.uml#_VZ1IwMcCEeOWXJw_sGK0hw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VZ4MEccCEeOWXJw_sGK0hw" x="133" y="234" width="193" height="147"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_iUiDIMq8EeO8w-_dLZ4fFQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iUj4UMq8EeO8w-_dLZ4fFQ" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iUj4Ucq8EeO8w-_dLZ4fFQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iUj4Usq8EeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iUj4U8q8EeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iUj4VMq8EeO8w-_dLZ4fFQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUj4Vcq8EeO8w-_dLZ4fFQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iUkfYMq8EeO8w-_dLZ4fFQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iUkfYcq8EeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iUkfYsq8EeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iUkfY8q8EeO8w-_dLZ4fFQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUkfZMq8EeO8w-_dLZ4fFQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iUkfZcq8EeO8w-_dLZ4fFQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iUkfZsq8EeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iUkfZ8q8EeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iUkfaMq8EeO8w-_dLZ4fFQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUkfacq8EeO8w-_dLZ4fFQ"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_oQ7wIMq8EeO8w-_dLZ4fFQ" name="cssClass">
+        <stringListValue>fontWhite</stringListValue>
+        <stringListValue>noBorder</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#_iUGlUMq8EeO8w-_dLZ4fFQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUiDIcq8EeO8w-_dLZ4fFQ" x="533" y="247" width="161" height="132"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qyooIMrNEeO8w-_dLZ4fFQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qyp2QMrNEeO8w-_dLZ4fFQ" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qyqdUMrNEeO8w-_dLZ4fFQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qyqdUcrNEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qyqdUsrNEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qyqdU8rNEeO8w-_dLZ4fFQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyqdVMrNEeO8w-_dLZ4fFQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qyrEYMrNEeO8w-_dLZ4fFQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qyrEYcrNEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qyrEYsrNEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qyrEY8rNEeO8w-_dLZ4fFQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyrEZMrNEeO8w-_dLZ4fFQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qyrrcMrNEeO8w-_dLZ4fFQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qyrrccrNEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qyrrcsrNEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qyrrc8rNEeO8w-_dLZ4fFQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyrrdMrNEeO8w-_dLZ4fFQ"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_-LcP4MrNEeO8w-_dLZ4fFQ" name="cssClass">
+        <stringListValue>noBorder</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#_qyhTYMrNEeO8w-_dLZ4fFQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyooIcrNEeO8w-_dLZ4fFQ" x="616" y="246" width="141" height="132"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_gfl1kMrOEeO8w-_dLZ4fFQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_gfnDsMrOEeO8w-_dLZ4fFQ" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gfnDscrOEeO8w-_dLZ4fFQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gfnDssrOEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gfnDs8rOEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gfnDtMrOEeO8w-_dLZ4fFQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gfnDtcrOEeO8w-_dLZ4fFQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gfnqwMrOEeO8w-_dLZ4fFQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gfnqwcrOEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gfnqwsrOEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gfnqw8rOEeO8w-_dLZ4fFQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gfnqxMrOEeO8w-_dLZ4fFQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gfoR0MrOEeO8w-_dLZ4fFQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gfoR0crOEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gfoR0srOEeO8w-_dLZ4fFQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gfoR08rOEeO8w-_dLZ4fFQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gfoR1MrOEeO8w-_dLZ4fFQ"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_l3UvQMrOEeO8w-_dLZ4fFQ" name="cssClass">
+        <stringListValue>noBorder</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#_gfiLMMrOEeO8w-_dLZ4fFQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gfl1kcrOEeO8w-_dLZ4fFQ" x="420" y="251" width="141" height="128"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_0sIY8ccAEeOWXJw_sGK0hw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_0sIY8scAEeOWXJw_sGK0hw">
+      <owner xmi:type="uml:Model" href="model.uml#_0qL4MMcAEeOWXJw_sGK0hw"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="__5ozMMcAEeOWXJw_sGK0hw" name="css_stylesheets" eObjectListValue="__5rPcMcAEeOWXJw_sGK0hw"/>
+    <element xmi:type="uml:Model" href="model.uml#_0qL4MMcAEeOWXJw_sGK0hw"/>
+  </notation:Diagram>
+  <css:EmbeddedStyleSheet xmi:id="__5rPcMcAEeOWXJw_sGK0hw" label="TestStyleSheet" content="Class {&#xD;&#xA;&#x9;fontColor:red;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;Package {&#xD;&#xA;&#x9;fontColor:blue;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;.fillRed {&#xD;&#xA;&#x9; fillColor: #FF0000;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;.horizontalGradient {&#xD;&#xA; &#x9;gradient: #00FF00 horizontal;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;.fontWhite {&#xD;&#xA;&#x9;fontColor:white;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;.noBorder {&#xD;&#xA;&#x9;displayBorder:false;&#xD;&#xA;}"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.uml
index 7cb0bc75322..9c92431238f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/431694/model.uml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_0qL4MMcAEeOWXJw_sGK0hw" name="Model">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_0qL4MccAEeOWXJw_sGK0hw">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Class" xmi:id="_AWuX0McBEeOWXJw_sGK0hw" name="Class1"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_VZ1IwMcCEeOWXJw_sGK0hw" name="Package1"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_iUGlUMq8EeO8w-_dLZ4fFQ" name="ClassNamedStyleFont"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_qyhTYMrNEeO8w-_dLZ4fFQ" name="Class2"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_gfiLMMrOEeO8w-_dLZ4fFQ" name="Class3"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_0qL4MMcAEeOWXJw_sGK0hw" name="Model">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_0qL4MccAEeOWXJw_sGK0hw">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_AWuX0McBEeOWXJw_sGK0hw" name="Class1"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_VZ1IwMcCEeOWXJw_sGK0hw" name="Package1"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_iUGlUMq8EeO8w-_dLZ4fFQ" name="ClassNamedStyleFont"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_qyhTYMrNEeO8w-_dLZ4fFQ" name="Class2"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_gfiLMMrOEeO8w-_dLZ4fFQ" name="Class3"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/477133/model.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/477133/model.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/477133/model.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/477133/model.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/477133/model.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/477133/model.notation
index 8bca11de1ba..f35c327611c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/477133/model.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/477133/model.notation
@@ -1,323 +1,323 @@
-<?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: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">

-  <notation:Diagram xmi:id="_LDNtwFuZEeWBbOvxypwYWA" type="PapyrusUMLClassDiagram" name="477133" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_LdZIUFuZEeWBbOvxypwYWA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_LdZIUluZEeWBbOvxypwYWA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_LdZIU1uZEeWBbOvxypwYWA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LdZIVFuZEeWBbOvxypwYWA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_LdZIVVuZEeWBbOvxypwYWA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_LdZIVluZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_LdZIV1uZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_LdZIWFuZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdZIWVuZEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_LdZIWluZEeWBbOvxypwYWA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_LdZIW1uZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_LdZIXFuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_LdZIXVuZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdZIXluZEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_LdZIX1uZEeWBbOvxypwYWA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_LdZIYFuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_LdZIYVuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_LdZIYluZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdZIY1uZEeWBbOvxypwYWA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_LdP-YFuZEeWBbOvxypwYWA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdZIUVuZEeWBbOvxypwYWA" x="84" y="103"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_MIf60FuZEeWBbOvxypwYWA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_MIf60luZEeWBbOvxypwYWA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_MIf601uZEeWBbOvxypwYWA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MIf61FuZEeWBbOvxypwYWA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MIf61VuZEeWBbOvxypwYWA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MIf61luZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_MIf611uZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_MIf62FuZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MIf62VuZEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MIf62luZEeWBbOvxypwYWA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MIf621uZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_MIf63FuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_MIf63VuZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MIf63luZEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MIf631uZEeWBbOvxypwYWA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MIf64FuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_MIf64VuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_MIf64luZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MIf641uZEeWBbOvxypwYWA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_MIWw4FuZEeWBbOvxypwYWA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MIf60VuZEeWBbOvxypwYWA" x="498" y="105"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_MXkRkVuZEeWBbOvxypwYWA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_MXkRk1uZEeWBbOvxypwYWA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_MXkRlFuZEeWBbOvxypwYWA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MXkRlVuZEeWBbOvxypwYWA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MXkRlluZEeWBbOvxypwYWA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MXkRl1uZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_MXkRmFuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_MXkRmVuZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXkRmluZEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MXkRm1uZEeWBbOvxypwYWA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MXkRnFuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_MXkRnVuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_MXkRnluZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXkRn1uZEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MXkRoFuZEeWBbOvxypwYWA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MXkRoVuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_MXkRoluZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_MXkRo1uZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXkRpFuZEeWBbOvxypwYWA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_MXkRkFuZEeWBbOvxypwYWA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXkRkluZEeWBbOvxypwYWA" x="99" y="359"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_MrONYVuZEeWBbOvxypwYWA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_MrONY1uZEeWBbOvxypwYWA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_MrONZFuZEeWBbOvxypwYWA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MrONZVuZEeWBbOvxypwYWA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MrONZluZEeWBbOvxypwYWA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MrONZ1uZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_MrONaFuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_MrONaVuZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MrONaluZEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MrONa1uZEeWBbOvxypwYWA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MrONbFuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_MrONbVuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_MrONbluZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MrONb1uZEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MrONcFuZEeWBbOvxypwYWA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MrONcVuZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_MrONcluZEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_MrONc1uZEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MrONdFuZEeWBbOvxypwYWA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_MrONYFuZEeWBbOvxypwYWA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MrONYluZEeWBbOvxypwYWA" x="493" y="363"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_dOgZgFuZEeWBbOvxypwYWA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_dOgZgVuZEeWBbOvxypwYWA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_dOgZg1uZEeWBbOvxypwYWA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="model.uml#_LdP-YFuZEeWBbOvxypwYWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dOgZgluZEeWBbOvxypwYWA" x="284" y="103"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_d2K2cFuZEeWBbOvxypwYWA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_d2K2cVuZEeWBbOvxypwYWA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d2K2c1uZEeWBbOvxypwYWA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="model.uml#_MIWw4FuZEeWBbOvxypwYWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d2K2cluZEeWBbOvxypwYWA" x="698" y="105"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_efzCQ1uZEeWBbOvxypwYWA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_efzCRFuZEeWBbOvxypwYWA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_efzCRluZEeWBbOvxypwYWA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="model.uml#_MXkRkFuZEeWBbOvxypwYWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efzCRVuZEeWBbOvxypwYWA" x="299" y="359"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_fKbTqVuZEeWBbOvxypwYWA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_fKbTqluZEeWBbOvxypwYWA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fKbTrFuZEeWBbOvxypwYWA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="model.uml#_MrONYFuZEeWBbOvxypwYWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fKbTq1uZEeWBbOvxypwYWA" x="693" y="363"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_LDNtwVuZEeWBbOvxypwYWA" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_LDNtwluZEeWBbOvxypwYWA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_LDNtw1uZEeWBbOvxypwYWA">

-      <owner xmi:type="uml:Model" href="model.uml#_HwHlUFuZEeWBbOvxypwYWA"/>

-    </styles>

-    <element xmi:type="uml:Model" href="model.uml#_HwHlUFuZEeWBbOvxypwYWA"/>

-    <edges xmi:type="notation:Connector" xmi:id="_UK310FuZEeWBbOvxypwYWA" type="4001" source="_MIf60FuZEeWBbOvxypwYWA" target="_LdZIUFuZEeWBbOvxypwYWA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm0FuZEeWBbOvxypwYWA" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm0VuZEeWBbOvxypwYWA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm0luZEeWBbOvxypwYWA" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm01uZEeWBbOvxypwYWA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm1FuZEeWBbOvxypwYWA" type="6003">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm1VuZEeWBbOvxypwYWA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm1luZEeWBbOvxypwYWA" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm11uZEeWBbOvxypwYWA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm2FuZEeWBbOvxypwYWA" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm2VuZEeWBbOvxypwYWA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm2luZEeWBbOvxypwYWA" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm21uZEeWBbOvxypwYWA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_UK310VuZEeWBbOvxypwYWA"/>

-      <element xmi:type="uml:Association" href="model.uml#_UKuE0FuZEeWBbOvxypwYWA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UK310luZEeWBbOvxypwYWA" points="[-17, 2, 364, -12]$[-331, -15, 50, -29]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ULncsFuZEeWBbOvxypwYWA" id="(0.0,0.34)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ULncsVuZEeWBbOvxypwYWA" id="(1.0,0.37)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_dOgZhFuZEeWBbOvxypwYWA" type="StereotypeCommentLink" source="_LdZIUFuZEeWBbOvxypwYWA" target="_dOgZgFuZEeWBbOvxypwYWA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_dOgZhVuZEeWBbOvxypwYWA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_dOgZiVuZEeWBbOvxypwYWA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="model.uml#_LdP-YFuZEeWBbOvxypwYWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dOgZhluZEeWBbOvxypwYWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dOgZh1uZEeWBbOvxypwYWA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dOgZiFuZEeWBbOvxypwYWA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_d2K2dFuZEeWBbOvxypwYWA" type="StereotypeCommentLink" source="_MIf60FuZEeWBbOvxypwYWA" target="_d2K2cFuZEeWBbOvxypwYWA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_d2K2dVuZEeWBbOvxypwYWA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d2K2eVuZEeWBbOvxypwYWA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="model.uml#_MIWw4FuZEeWBbOvxypwYWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d2K2dluZEeWBbOvxypwYWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d2K2d1uZEeWBbOvxypwYWA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d2K2eFuZEeWBbOvxypwYWA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_efzCR1uZEeWBbOvxypwYWA" type="StereotypeCommentLink" source="_MXkRkVuZEeWBbOvxypwYWA" target="_efzCQ1uZEeWBbOvxypwYWA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_efzCSFuZEeWBbOvxypwYWA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_efzCTFuZEeWBbOvxypwYWA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="model.uml#_MXkRkFuZEeWBbOvxypwYWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_efzCSVuZEeWBbOvxypwYWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efzCSluZEeWBbOvxypwYWA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efzCS1uZEeWBbOvxypwYWA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_fKbTrVuZEeWBbOvxypwYWA" type="StereotypeCommentLink" source="_MrONYVuZEeWBbOvxypwYWA" target="_fKbTqVuZEeWBbOvxypwYWA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_fKbTrluZEeWBbOvxypwYWA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fKbTsluZEeWBbOvxypwYWA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="model.uml#_MrONYFuZEeWBbOvxypwYWA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fKbTr1uZEeWBbOvxypwYWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fKbTsFuZEeWBbOvxypwYWA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fKbTsVuZEeWBbOvxypwYWA"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_zxkvEFufEeWBbOvxypwYWA" type="PapyrusUMLClassDiagram" name="BDD 446668" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_1L0fgFufEeWBbOvxypwYWA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_1L1GkFufEeWBbOvxypwYWA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_1L1GkVufEeWBbOvxypwYWA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1L1GklufEeWBbOvxypwYWA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1L1Gk1ufEeWBbOvxypwYWA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1L1GlFufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1L1GlVufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1L1GllufEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1L1Gl1ufEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1L1GmFufEeWBbOvxypwYWA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1L1GmVufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1L1GmlufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1L1Gm1ufEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1L1GnFufEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1L1GnVufEeWBbOvxypwYWA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1L1GnlufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1L1Gn1ufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1L1GoFufEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1L1GoVufEeWBbOvxypwYWA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_1LyDQFufEeWBbOvxypwYWA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1L0fgVufEeWBbOvxypwYWA" x="159" y="167"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_1aIBQFufEeWBbOvxypwYWA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_1aIBQlufEeWBbOvxypwYWA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_1aIBQ1ufEeWBbOvxypwYWA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1aIBRFufEeWBbOvxypwYWA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1aIBRVufEeWBbOvxypwYWA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1aIBRlufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1aIBR1ufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1aIBSFufEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1aIBSVufEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1aIBSlufEeWBbOvxypwYWA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1aIBS1ufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1aIBTFufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1aIBTVufEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1aIBTlufEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1aIBT1ufEeWBbOvxypwYWA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1aIBUFufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1aIBUVufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1aIBUlufEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1aIBU1ufEeWBbOvxypwYWA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_1aFlAFufEeWBbOvxypwYWA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1aIBQVufEeWBbOvxypwYWA" x="532" y="163"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_1pQCYFufEeWBbOvxypwYWA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_1pQCYlufEeWBbOvxypwYWA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_1pQCY1ufEeWBbOvxypwYWA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1pQCZFufEeWBbOvxypwYWA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1pQpcFufEeWBbOvxypwYWA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1pQpcVufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1pQpclufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1pQpc1ufEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pQpdFufEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1pQpdVufEeWBbOvxypwYWA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1pQpdlufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1pQpd1ufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1pQpeFufEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pQpeVufEeWBbOvxypwYWA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1pQpelufEeWBbOvxypwYWA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1pQpe1ufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1pQpfFufEeWBbOvxypwYWA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1pQpfVufEeWBbOvxypwYWA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pQpflufEeWBbOvxypwYWA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_1pONMFufEeWBbOvxypwYWA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pQCYVufEeWBbOvxypwYWA" x="547" y="411"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_zxkvEVufEeWBbOvxypwYWA" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_zxkvElufEeWBbOvxypwYWA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zxkvE1ufEeWBbOvxypwYWA">

-      <owner xmi:type="uml:Model" href="model.uml#_HwHlUFuZEeWBbOvxypwYWA"/>

-    </styles>

-    <element xmi:type="uml:Model" href="model.uml#_HwHlUFuZEeWBbOvxypwYWA"/>

-    <edges xmi:type="notation:Connector" xmi:id="_4rpcYFufEeWBbOvxypwYWA" type="4001" source="_1L0fgFufEeWBbOvxypwYWA" target="_1aIBQFufEeWBbOvxypwYWA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_4rpcY1ufEeWBbOvxypwYWA" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rpcZFufEeWBbOvxypwYWA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_4rpcZVufEeWBbOvxypwYWA" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rpcZlufEeWBbOvxypwYWA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_4rpcZ1ufEeWBbOvxypwYWA" type="6003">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rqDcFufEeWBbOvxypwYWA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_4rqDcVufEeWBbOvxypwYWA" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rqDclufEeWBbOvxypwYWA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_4rqDc1ufEeWBbOvxypwYWA" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rqDdFufEeWBbOvxypwYWA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_4rqDdVufEeWBbOvxypwYWA" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rqDdlufEeWBbOvxypwYWA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_4rpcYVufEeWBbOvxypwYWA"/>

-      <element xmi:type="uml:Association" href="model.uml#_4rWhcFufEeWBbOvxypwYWA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4rpcYlufEeWBbOvxypwYWA" points="[20, -9, -323, -15]$[339, -44, -4, -50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sGvYFufEeWBbOvxypwYWA" id="(1.0,0.39)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sGvYVufEeWBbOvxypwYWA" id="(0.0,0.36)"/>

-    </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: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">
+  <notation:Diagram xmi:id="_LDNtwFuZEeWBbOvxypwYWA" type="PapyrusUMLClassDiagram" name="477133" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_LdZIUFuZEeWBbOvxypwYWA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_LdZIUluZEeWBbOvxypwYWA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LdZIU1uZEeWBbOvxypwYWA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LdZIVFuZEeWBbOvxypwYWA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LdZIVVuZEeWBbOvxypwYWA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LdZIVluZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LdZIV1uZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LdZIWFuZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdZIWVuZEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LdZIWluZEeWBbOvxypwYWA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LdZIW1uZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LdZIXFuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LdZIXVuZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdZIXluZEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LdZIX1uZEeWBbOvxypwYWA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LdZIYFuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LdZIYVuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LdZIYluZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdZIY1uZEeWBbOvxypwYWA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_LdP-YFuZEeWBbOvxypwYWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdZIUVuZEeWBbOvxypwYWA" x="84" y="103"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MIf60FuZEeWBbOvxypwYWA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MIf60luZEeWBbOvxypwYWA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MIf601uZEeWBbOvxypwYWA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MIf61FuZEeWBbOvxypwYWA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MIf61VuZEeWBbOvxypwYWA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MIf61luZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MIf611uZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MIf62FuZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MIf62VuZEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MIf62luZEeWBbOvxypwYWA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MIf621uZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MIf63FuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MIf63VuZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MIf63luZEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MIf631uZEeWBbOvxypwYWA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MIf64FuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MIf64VuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MIf64luZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MIf641uZEeWBbOvxypwYWA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_MIWw4FuZEeWBbOvxypwYWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MIf60VuZEeWBbOvxypwYWA" x="498" y="105"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MXkRkVuZEeWBbOvxypwYWA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MXkRk1uZEeWBbOvxypwYWA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MXkRlFuZEeWBbOvxypwYWA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MXkRlVuZEeWBbOvxypwYWA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MXkRlluZEeWBbOvxypwYWA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MXkRl1uZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MXkRmFuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MXkRmVuZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXkRmluZEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MXkRm1uZEeWBbOvxypwYWA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MXkRnFuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MXkRnVuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MXkRnluZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXkRn1uZEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MXkRoFuZEeWBbOvxypwYWA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MXkRoVuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MXkRoluZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MXkRo1uZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXkRpFuZEeWBbOvxypwYWA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_MXkRkFuZEeWBbOvxypwYWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MXkRkluZEeWBbOvxypwYWA" x="99" y="359"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MrONYVuZEeWBbOvxypwYWA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MrONY1uZEeWBbOvxypwYWA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MrONZFuZEeWBbOvxypwYWA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MrONZVuZEeWBbOvxypwYWA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MrONZluZEeWBbOvxypwYWA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MrONZ1uZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MrONaFuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MrONaVuZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MrONaluZEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MrONa1uZEeWBbOvxypwYWA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MrONbFuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MrONbVuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MrONbluZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MrONb1uZEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MrONcFuZEeWBbOvxypwYWA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MrONcVuZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MrONcluZEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MrONc1uZEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MrONdFuZEeWBbOvxypwYWA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_MrONYFuZEeWBbOvxypwYWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MrONYluZEeWBbOvxypwYWA" x="493" y="363"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_dOgZgFuZEeWBbOvxypwYWA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_dOgZgVuZEeWBbOvxypwYWA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_dOgZg1uZEeWBbOvxypwYWA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="model.uml#_LdP-YFuZEeWBbOvxypwYWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dOgZgluZEeWBbOvxypwYWA" x="284" y="103"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_d2K2cFuZEeWBbOvxypwYWA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_d2K2cVuZEeWBbOvxypwYWA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d2K2c1uZEeWBbOvxypwYWA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="model.uml#_MIWw4FuZEeWBbOvxypwYWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d2K2cluZEeWBbOvxypwYWA" x="698" y="105"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_efzCQ1uZEeWBbOvxypwYWA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_efzCRFuZEeWBbOvxypwYWA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_efzCRluZEeWBbOvxypwYWA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="model.uml#_MXkRkFuZEeWBbOvxypwYWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efzCRVuZEeWBbOvxypwYWA" x="299" y="359"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_fKbTqVuZEeWBbOvxypwYWA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fKbTqluZEeWBbOvxypwYWA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fKbTrFuZEeWBbOvxypwYWA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="model.uml#_MrONYFuZEeWBbOvxypwYWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fKbTq1uZEeWBbOvxypwYWA" x="693" y="363"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_LDNtwVuZEeWBbOvxypwYWA" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_LDNtwluZEeWBbOvxypwYWA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_LDNtw1uZEeWBbOvxypwYWA">
+      <owner xmi:type="uml:Model" href="model.uml#_HwHlUFuZEeWBbOvxypwYWA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model.uml#_HwHlUFuZEeWBbOvxypwYWA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UK310FuZEeWBbOvxypwYWA" type="4001" source="_MIf60FuZEeWBbOvxypwYWA" target="_LdZIUFuZEeWBbOvxypwYWA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm0FuZEeWBbOvxypwYWA" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm0VuZEeWBbOvxypwYWA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm0luZEeWBbOvxypwYWA" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm01uZEeWBbOvxypwYWA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm1FuZEeWBbOvxypwYWA" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm1VuZEeWBbOvxypwYWA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm1luZEeWBbOvxypwYWA" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm11uZEeWBbOvxypwYWA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm2FuZEeWBbOvxypwYWA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm2VuZEeWBbOvxypwYWA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ULBm2luZEeWBbOvxypwYWA" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ULBm21uZEeWBbOvxypwYWA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UK310VuZEeWBbOvxypwYWA"/>
+      <element xmi:type="uml:Association" href="model.uml#_UKuE0FuZEeWBbOvxypwYWA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UK310luZEeWBbOvxypwYWA" points="[-17, 2, 364, -12]$[-331, -15, 50, -29]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ULncsFuZEeWBbOvxypwYWA" id="(0.0,0.34)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ULncsVuZEeWBbOvxypwYWA" id="(1.0,0.37)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_dOgZhFuZEeWBbOvxypwYWA" type="StereotypeCommentLink" source="_LdZIUFuZEeWBbOvxypwYWA" target="_dOgZgFuZEeWBbOvxypwYWA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_dOgZhVuZEeWBbOvxypwYWA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_dOgZiVuZEeWBbOvxypwYWA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="model.uml#_LdP-YFuZEeWBbOvxypwYWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dOgZhluZEeWBbOvxypwYWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dOgZh1uZEeWBbOvxypwYWA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dOgZiFuZEeWBbOvxypwYWA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_d2K2dFuZEeWBbOvxypwYWA" type="StereotypeCommentLink" source="_MIf60FuZEeWBbOvxypwYWA" target="_d2K2cFuZEeWBbOvxypwYWA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_d2K2dVuZEeWBbOvxypwYWA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d2K2eVuZEeWBbOvxypwYWA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="model.uml#_MIWw4FuZEeWBbOvxypwYWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d2K2dluZEeWBbOvxypwYWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d2K2d1uZEeWBbOvxypwYWA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d2K2eFuZEeWBbOvxypwYWA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_efzCR1uZEeWBbOvxypwYWA" type="StereotypeCommentLink" source="_MXkRkVuZEeWBbOvxypwYWA" target="_efzCQ1uZEeWBbOvxypwYWA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_efzCSFuZEeWBbOvxypwYWA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_efzCTFuZEeWBbOvxypwYWA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="model.uml#_MXkRkFuZEeWBbOvxypwYWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_efzCSVuZEeWBbOvxypwYWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efzCSluZEeWBbOvxypwYWA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efzCS1uZEeWBbOvxypwYWA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_fKbTrVuZEeWBbOvxypwYWA" type="StereotypeCommentLink" source="_MrONYVuZEeWBbOvxypwYWA" target="_fKbTqVuZEeWBbOvxypwYWA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_fKbTrluZEeWBbOvxypwYWA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_fKbTsluZEeWBbOvxypwYWA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="model.uml#_MrONYFuZEeWBbOvxypwYWA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fKbTr1uZEeWBbOvxypwYWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fKbTsFuZEeWBbOvxypwYWA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fKbTsVuZEeWBbOvxypwYWA"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_zxkvEFufEeWBbOvxypwYWA" type="PapyrusUMLClassDiagram" name="BDD 446668" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_1L0fgFufEeWBbOvxypwYWA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1L1GkFufEeWBbOvxypwYWA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1L1GkVufEeWBbOvxypwYWA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1L1GklufEeWBbOvxypwYWA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1L1Gk1ufEeWBbOvxypwYWA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1L1GlFufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1L1GlVufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1L1GllufEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1L1Gl1ufEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1L1GmFufEeWBbOvxypwYWA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1L1GmVufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1L1GmlufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1L1Gm1ufEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1L1GnFufEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1L1GnVufEeWBbOvxypwYWA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1L1GnlufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1L1Gn1ufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1L1GoFufEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1L1GoVufEeWBbOvxypwYWA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_1LyDQFufEeWBbOvxypwYWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1L0fgVufEeWBbOvxypwYWA" x="159" y="167"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_1aIBQFufEeWBbOvxypwYWA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1aIBQlufEeWBbOvxypwYWA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1aIBQ1ufEeWBbOvxypwYWA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1aIBRFufEeWBbOvxypwYWA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1aIBRVufEeWBbOvxypwYWA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1aIBRlufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1aIBR1ufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1aIBSFufEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1aIBSVufEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1aIBSlufEeWBbOvxypwYWA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1aIBS1ufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1aIBTFufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1aIBTVufEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1aIBTlufEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1aIBT1ufEeWBbOvxypwYWA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1aIBUFufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1aIBUVufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1aIBUlufEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1aIBU1ufEeWBbOvxypwYWA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_1aFlAFufEeWBbOvxypwYWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1aIBQVufEeWBbOvxypwYWA" x="532" y="163"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_1pQCYFufEeWBbOvxypwYWA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1pQCYlufEeWBbOvxypwYWA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1pQCY1ufEeWBbOvxypwYWA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1pQCZFufEeWBbOvxypwYWA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1pQpcFufEeWBbOvxypwYWA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1pQpcVufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1pQpclufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1pQpc1ufEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pQpdFufEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1pQpdVufEeWBbOvxypwYWA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1pQpdlufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1pQpd1ufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1pQpeFufEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pQpeVufEeWBbOvxypwYWA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1pQpelufEeWBbOvxypwYWA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1pQpe1ufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1pQpfFufEeWBbOvxypwYWA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1pQpfVufEeWBbOvxypwYWA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pQpflufEeWBbOvxypwYWA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_1pONMFufEeWBbOvxypwYWA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pQCYVufEeWBbOvxypwYWA" x="547" y="411"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_zxkvEVufEeWBbOvxypwYWA" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_zxkvElufEeWBbOvxypwYWA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zxkvE1ufEeWBbOvxypwYWA">
+      <owner xmi:type="uml:Model" href="model.uml#_HwHlUFuZEeWBbOvxypwYWA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model.uml#_HwHlUFuZEeWBbOvxypwYWA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_4rpcYFufEeWBbOvxypwYWA" type="4001" source="_1L0fgFufEeWBbOvxypwYWA" target="_1aIBQFufEeWBbOvxypwYWA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4rpcY1ufEeWBbOvxypwYWA" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rpcZFufEeWBbOvxypwYWA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4rpcZVufEeWBbOvxypwYWA" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rpcZlufEeWBbOvxypwYWA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4rpcZ1ufEeWBbOvxypwYWA" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rqDcFufEeWBbOvxypwYWA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4rqDcVufEeWBbOvxypwYWA" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rqDclufEeWBbOvxypwYWA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4rqDc1ufEeWBbOvxypwYWA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rqDdFufEeWBbOvxypwYWA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4rqDdVufEeWBbOvxypwYWA" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4rqDdlufEeWBbOvxypwYWA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_4rpcYVufEeWBbOvxypwYWA"/>
+      <element xmi:type="uml:Association" href="model.uml#_4rWhcFufEeWBbOvxypwYWA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4rpcYlufEeWBbOvxypwYWA" points="[20, -9, -323, -15]$[339, -44, -4, -50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sGvYFufEeWBbOvxypwYWA" id="(1.0,0.39)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sGvYVufEeWBbOvxypwYWA" id="(0.0,0.36)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/model.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/model.notation
index 874f912bdde..6ccde7e1118 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/model.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/model.notation
@@ -1,448 +1,448 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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">

-  <notation:Diagram xmi:id="_aA0nYP_uEeWeEdC7hbdSmw" type="PapyrusUMLComponentDiagram" name="Component Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_bSd1cP_uEeWeEdC7hbdSmw" type="Component_PackagedElementShape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_bTGuoP_uEeWeEdC7hbdSmw" type="Component_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_bTGuof_uEeWeEdC7hbdSmw" type="Component_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bTHVsP_uEeWeEdC7hbdSmw" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_bTH8wP_uEeWeEdC7hbdSmw" type="Component_StructureCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_bTH8wf_uEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bTH8wv_uEeWeEdC7hbdSmw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_bTUKAP_uEeWeEdC7hbdSmw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_bTUxEP_uEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bTUxEf_uEeWeEdC7hbdSmw"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_b1d00P_uEeWeEdC7hbdSmw" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_b1eb4P_uEeWeEdC7hbdSmw" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_b1eb4f_uEeWeEdC7hbdSmw" x="24" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_b1eb4v_uEeWeEdC7hbdSmw" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_b1eb4__uEeWeEdC7hbdSmw" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_Ansa8P_5EeWeEdC7hbdSmw" name="cssClass">

-          <stringListValue>portOnline</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_b0AcQP_uEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b1d00f_uEeWeEdC7hbdSmw" y="43" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_2TD4gP_vEeWeEdC7hbdSmw" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_2TD4gv_vEeWeEdC7hbdSmw" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_2TD4g__vEeWeEdC7hbdSmw" x="23" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_2TD4hP_vEeWeEdC7hbdSmw" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_2TD4hf_vEeWeEdC7hbdSmw" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_4dNb4P_vEeWeEdC7hbdSmw" name="cssClass">

-          <stringListValue>portInside</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_2TAOIP_vEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TD4gf_vEeWeEdC7hbdSmw" x="10" y="81" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_2nZJwP_vEeWeEdC7hbdSmw" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_2nZJwv_vEeWeEdC7hbdSmw" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_2nZJw__vEeWeEdC7hbdSmw" x="23" y="4"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_2nZJxP_vEeWeEdC7hbdSmw" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_2nZJxf_vEeWeEdC7hbdSmw" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_5Qf6AP_vEeWeEdC7hbdSmw" name="cssClass">

-          <stringListValue>portOutside</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_2nOKoP_vEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2nZJwf_vEeWeEdC7hbdSmw" x="-9" y="116" width="20" height="20"/>

-      </children>

-      <element xmi:type="uml:Component" href="model.uml#_bSWgsP_uEeWeEdC7hbdSmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bSd1cf_uEeWeEdC7hbdSmw" x="268" y="111" width="193" height="145"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_UVLLoBXFEeaQOqKbZy9Uvg" type="Component_PackagedElementShape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_UVdfgBXFEeaQOqKbZy9Uvg" type="Component_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_UVdfgRXFEeaQOqKbZy9Uvg" type="Component_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UVdfghXFEeaQOqKbZy9Uvg" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UVeGkBXFEeaQOqKbZy9Uvg" type="Component_StructureCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UVeGkRXFEeaQOqKbZy9Uvg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVeGkhXFEeaQOqKbZy9Uvg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UVmCYBXFEeaQOqKbZy9Uvg" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UVmCYRXFEeaQOqKbZy9Uvg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVmCYhXFEeaQOqKbZy9Uvg"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_U9UJsBXFEeaQOqKbZy9Uvg" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_U9UJshXFEeaQOqKbZy9Uvg" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_U9UJsxXFEeaQOqKbZy9Uvg" x="23" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_U9UwwBXFEeaQOqKbZy9Uvg" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_U9Wl8BXFEeaQOqKbZy9Uvg" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="model.uml#_U89kYBXFEeaQOqKbZy9Uvg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U9UJsRXFEeaQOqKbZy9Uvg" x="269" y="-10" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_V5lksBXFEeaQOqKbZy9Uvg" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_V5lkshXFEeaQOqKbZy9Uvg" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_V5lksxXFEeaQOqKbZy9Uvg" x="23" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_V5mLwBXFEeaQOqKbZy9Uvg" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_V5mLwRXFEeaQOqKbZy9Uvg" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="model.uml#_V5W7MBXFEeaQOqKbZy9Uvg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V5lksRXFEeaQOqKbZy9Uvg" x="269" y="163" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_WuQi4BXFEeaQOqKbZy9Uvg" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_WuRJ8RXFEeaQOqKbZy9Uvg" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_WuRJ8hXFEeaQOqKbZy9Uvg" x="23" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_WuRJ8xXFEeaQOqKbZy9Uvg" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_WuRJ9BXFEeaQOqKbZy9Uvg" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="model.uml#_Wt26QBXFEeaQOqKbZy9Uvg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WuRJ8BXFEeaQOqKbZy9Uvg" x="-10" y="-10" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_X45KABXFEeaQOqKbZy9Uvg" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_X45KAhXFEeaQOqKbZy9Uvg" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_X45KAxXFEeaQOqKbZy9Uvg" x="23" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_X45KBBXFEeaQOqKbZy9Uvg" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_X45KBRXFEeaQOqKbZy9Uvg" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="model.uml#_X4ruoBXFEeaQOqKbZy9Uvg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X45KARXFEeaQOqKbZy9Uvg" x="-10" y="163" width="20" height="20"/>

-      </children>

-      <element xmi:type="uml:Component" href="model.uml#_UUSa0BXFEeaQOqKbZy9Uvg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVLLoRXFEeaQOqKbZy9Uvg" x="732" y="128" width="279" height="173"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_iDb5IBXKEeajjfMdXxCzwA" type="Component_PackagedElementShape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_iDcgMRXKEeajjfMdXxCzwA" type="Component_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_iDcgMhXKEeajjfMdXxCzwA" type="Component_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iDcgMxXKEeajjfMdXxCzwA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_iDdHQBXKEeajjfMdXxCzwA" type="Component_StructureCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_iDdHQRXKEeajjfMdXxCzwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iDdHQhXKEeajjfMdXxCzwA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_iDotcBXKEeajjfMdXxCzwA" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_iDotcRXKEeajjfMdXxCzwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iDotchXKEeajjfMdXxCzwA"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_iYotEBXKEeajjfMdXxCzwA" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_iYpUIBXKEeajjfMdXxCzwA" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_iYpUIRXKEeajjfMdXxCzwA" x="20" y="5"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_iYpUIhXKEeajjfMdXxCzwA" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_iYpUIxXKEeajjfMdXxCzwA" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="model.uml#_iYN2UBXKEeajjfMdXxCzwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYotERXKEeajjfMdXxCzwA" x="248" y="19" width="20" height="20"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_lDbn8BXhEea6WZN2jvL3hg" name="cssClass">

-        <stringListValue>isOval</stringListValue>

-      </styles>

-      <element xmi:type="uml:Component" href="model.uml#_iDYOwBXKEeajjfMdXxCzwA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iDcgMBXKEeajjfMdXxCzwA" x="557" y="398" width="292" height="161"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_nzpkQBXKEeajjfMdXxCzwA" type="Component_PackagedElementShape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_nzqLUBXKEeajjfMdXxCzwA" type="Component_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nzqLURXKEeajjfMdXxCzwA" type="Component_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nzqLUhXKEeajjfMdXxCzwA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_nzqLUxXKEeajjfMdXxCzwA" type="Component_StructureCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_nzqLVBXKEeajjfMdXxCzwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nzqLVRXKEeajjfMdXxCzwA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_nzyHIBXKEeajjfMdXxCzwA" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_nzyHIRXKEeajjfMdXxCzwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nzyHIhXKEeajjfMdXxCzwA"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_phV1IBXKEeajjfMdXxCzwA" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_phWcMBXKEeajjfMdXxCzwA" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_phWcMRXKEeajjfMdXxCzwA" x="22" y="1"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_phWcMhXKEeajjfMdXxCzwA" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_phWcMxXKEeajjfMdXxCzwA" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="model.uml#_phLdEBXKEeajjfMdXxCzwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_phV1IRXKEeajjfMdXxCzwA" x="256" y="-10" width="20" height="20"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_j1q0UBXhEea6WZN2jvL3hg" name="cssClass">

-        <stringListValue>isPackage</stringListValue>

-      </styles>

-      <element xmi:type="uml:Component" href="model.uml#_nznvEBXKEeajjfMdXxCzwA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nzpkQRXKEeajjfMdXxCzwA" x="84" y="389" width="350" height="149"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_aA0nYf_uEeWeEdC7hbdSmw" name="diagram_compatibility_version" stringValue="1.2.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_aA0nYv_uEeWeEdC7hbdSmw"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_aA0nY__uEeWeEdC7hbdSmw">

-      <owner xmi:type="uml:Model" href="model.uml#_Z_d8gP_uEeWeEdC7hbdSmw"/>

-    </styles>

-    <element xmi:type="uml:Model" href="model.uml#_Z_d8gP_uEeWeEdC7hbdSmw"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_aBFGEP_uEeWeEdC7hbdSmw" type="CompositeStructure" name="Composite Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_hv8PMP_uEeWeEdC7hbdSmw" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_hv8PMv_uEeWeEdC7hbdSmw" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_hv82QP_uEeWeEdC7hbdSmw" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hv82Qf_uEeWeEdC7hbdSmw" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_hv82Qv_uEeWeEdC7hbdSmw" type="Class_StructureCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_iKXhYP_uEeWeEdC7hbdSmw" type="Property_Shape">

-          <children xmi:type="notation:DecorationNode" xmi:id="_iKXhYv_uEeWeEdC7hbdSmw" type="Property_NameLabel"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_iKXhY__uEeWeEdC7hbdSmw" type="Property_FloatingNameLabel">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_iKXhZP_uEeWeEdC7hbdSmw" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_iKZ9oP_uEeWeEdC7hbdSmw" type="Property_StructureCompartment">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_iKZ9of_uEeWeEdC7hbdSmw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iKZ9ov_uEeWeEdC7hbdSmw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_iNHTYP_uEeWeEdC7hbdSmw" type="compartment_shape_display">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_iNHTYf_uEeWeEdC7hbdSmw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iNHTYv_uEeWeEdC7hbdSmw"/>

-          </children>

-          <children xmi:type="notation:Shape" xmi:id="_yI494BaHEeaWc-G5enLUZQ" type="Port_Shape">

-            <children xmi:type="notation:DecorationNode" xmi:id="_yI494haHEeaWc-G5enLUZQ" type="Port_NameLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_yI494xaHEeaWc-G5enLUZQ" x="25" y="3"/>

-            </children>

-            <children xmi:type="notation:DecorationNode" xmi:id="_yI495BaHEeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_yI495RaHEeaWc-G5enLUZQ" x="25" y="-10"/>

-            </children>

-            <element xmi:type="uml:Port" href="model.uml#_yIq7cBaHEeaWc-G5enLUZQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yI494RaHEeaWc-G5enLUZQ" x="-10" y="57" width="20" height="20"/>

-          </children>

-          <children xmi:type="notation:Shape" xmi:id="_1T-Z0BaHEeaWc-G5enLUZQ" type="Port_Shape">

-            <children xmi:type="notation:DecorationNode" xmi:id="_1T_A4BaHEeaWc-G5enLUZQ" type="Port_NameLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_1T_A4RaHEeaWc-G5enLUZQ" x="25" y="3"/>

-            </children>

-            <children xmi:type="notation:DecorationNode" xmi:id="_1T_A4haHEeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_1T_A4xaHEeaWc-G5enLUZQ" x="25" y="-10"/>

-            </children>

-            <styles xmi:type="notation:StringListValueStyle" xmi:id="_7GaSgBaHEeaWc-G5enLUZQ" name="cssClass">

-              <stringListValue>portInside</stringListValue>

-            </styles>

-            <element xmi:type="uml:Port" href="model.uml#_1T128BaHEeaWc-G5enLUZQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1T-Z0RaHEeaWc-G5enLUZQ" y="85" width="20" height="20"/>

-          </children>

-          <children xmi:type="notation:Shape" xmi:id="_3c_UwBaHEeaWc-G5enLUZQ" type="Port_Shape">

-            <children xmi:type="notation:DecorationNode" xmi:id="_3c_UwhaHEeaWc-G5enLUZQ" type="Port_NameLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_3c_UwxaHEeaWc-G5enLUZQ" x="25" y="3"/>

-            </children>

-            <children xmi:type="notation:DecorationNode" xmi:id="_3c_UxBaHEeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_3c_UxRaHEeaWc-G5enLUZQ" x="25" y="-10"/>

-            </children>

-            <styles xmi:type="notation:StringListValueStyle" xmi:id="_8TtMEBaHEeaWc-G5enLUZQ" name="cssClass">

-              <stringListValue>portOutside</stringListValue>

-            </styles>

-            <element xmi:type="uml:Port" href="model.uml#_3c2x4BaHEeaWc-G5enLUZQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3c_UwRaHEeaWc-G5enLUZQ" x="-10" y="111" width="20" height="20"/>

-          </children>

-          <element xmi:type="uml:Property" href="model.uml#_iKTP8P_uEeWeEdC7hbdSmw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iKXhYf_uEeWeEdC7hbdSmw" x="252" y="22" width="238" height="161"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_hv82Q__uEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hv82RP_uEeWeEdC7hbdSmw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_hxYZoP_uEeWeEdC7hbdSmw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_hxYZof_uEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hxYZov_uEeWeEdC7hbdSmw"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_ilQtoP_uEeWeEdC7hbdSmw" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_ilQtov_uEeWeEdC7hbdSmw" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ilQto__uEeWeEdC7hbdSmw" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_ilQtpP_uEeWeEdC7hbdSmw" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ilQtpf_uEeWeEdC7hbdSmw" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_zUvGMP_vEeWeEdC7hbdSmw" name="cssClass">

-          <stringListValue>portOnline</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_ilKnAP_uEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ilQtof_uEeWeEdC7hbdSmw" y="86" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_uKmjoP_vEeWeEdC7hbdSmw" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_uKo_4P_vEeWeEdC7hbdSmw" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_uKo_4f_vEeWeEdC7hbdSmw" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_uKpm8P_vEeWeEdC7hbdSmw" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_uKpm8f_vEeWeEdC7hbdSmw" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_z8NV4P_vEeWeEdC7hbdSmw" name="cssClass">

-          <stringListValue>portInside</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_uKVd4P_vEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKmjof_vEeWeEdC7hbdSmw" x="10" y="118" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_ufB7gP_vEeWeEdC7hbdSmw" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_ufCikP_vEeWeEdC7hbdSmw" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ufCikf_vEeWeEdC7hbdSmw" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_ufCikv_vEeWeEdC7hbdSmw" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ufCik__vEeWeEdC7hbdSmw" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_0n-2wP_vEeWeEdC7hbdSmw" name="cssClass">

-          <stringListValue>portOutside</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_ue7N0P_vEeWeEdC7hbdSmw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ufB7gf_vEeWeEdC7hbdSmw" x="-9" y="152" width="20" height="20"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_hv5y8P_uEeWeEdC7hbdSmw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hv8PMf_uEeWeEdC7hbdSmw" x="96" y="86" width="575" height="234"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_rfKrkBX9EeaWc-G5enLUZQ" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_rfKrkRX9EeaWc-G5enLUZQ" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_rfKrkhX9EeaWc-G5enLUZQ" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rfKrkxX9EeaWc-G5enLUZQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_rfKrlBX9EeaWc-G5enLUZQ" type="Class_StructureCompartment">

-        <children xmi:type="notation:Shape" xmi:id="_rfKrlRX9EeaWc-G5enLUZQ" type="Property_Shape">

-          <children xmi:type="notation:DecorationNode" xmi:id="_rfKrlhX9EeaWc-G5enLUZQ" type="Property_NameLabel"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_rfKrlxX9EeaWc-G5enLUZQ" type="Property_FloatingNameLabel">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_rfKrmBX9EeaWc-G5enLUZQ" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_rfKrmRX9EeaWc-G5enLUZQ" type="Property_StructureCompartment">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_rfKrmhX9EeaWc-G5enLUZQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfKrmxX9EeaWc-G5enLUZQ"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_rfKrnBX9EeaWc-G5enLUZQ" type="compartment_shape_display">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_rfKrnRX9EeaWc-G5enLUZQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfKrnhX9EeaWc-G5enLUZQ"/>

-          </children>

-          <children xmi:type="notation:Shape" xmi:id="_rfKrnxX9EeaWc-G5enLUZQ" type="Port_Shape">

-            <children xmi:type="notation:DecorationNode" xmi:id="_rfKroBX9EeaWc-G5enLUZQ" type="Port_NameLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfKroRX9EeaWc-G5enLUZQ" x="25" y="3"/>

-            </children>

-            <children xmi:type="notation:DecorationNode" xmi:id="_rfKrohX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSoBX9EeaWc-G5enLUZQ" x="25" y="-10"/>

-            </children>

-            <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSoRX9EeaWc-G5enLUZQ" name="cssClass">

-              <stringListValue>portOnline</stringListValue>

-            </styles>

-            <element xmi:type="uml:Port" href="model.uml#_nnSdEP_uEeWeEdC7hbdSmw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSohX9EeaWc-G5enLUZQ" x="-11" y="52" width="53" height="20"/>

-          </children>

-          <children xmi:type="notation:Shape" xmi:id="_rfLSoxX9EeaWc-G5enLUZQ" type="Port_Shape">

-            <children xmi:type="notation:DecorationNode" xmi:id="_rfLSpBX9EeaWc-G5enLUZQ" type="Port_NameLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSpRX9EeaWc-G5enLUZQ" x="25" y="3"/>

-            </children>

-            <children xmi:type="notation:DecorationNode" xmi:id="_rfLSphX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSpxX9EeaWc-G5enLUZQ" x="25" y="-10"/>

-            </children>

-            <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSqBX9EeaWc-G5enLUZQ" name="cssClass">

-              <stringListValue>portInside</stringListValue>

-            </styles>

-            <element xmi:type="uml:Port" href="model.uml#_tM6zYP_vEeWeEdC7hbdSmw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSqRX9EeaWc-G5enLUZQ" x="-1" y="93" width="45" height="20"/>

-          </children>

-          <children xmi:type="notation:Shape" xmi:id="_rfLSqhX9EeaWc-G5enLUZQ" type="Port_Shape">

-            <children xmi:type="notation:DecorationNode" xmi:id="_rfLSqxX9EeaWc-G5enLUZQ" type="Port_NameLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSrBX9EeaWc-G5enLUZQ" x="25" y="3"/>

-            </children>

-            <children xmi:type="notation:DecorationNode" xmi:id="_rfLSrRX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSrhX9EeaWc-G5enLUZQ" x="25" y="-10"/>

-            </children>

-            <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSrxX9EeaWc-G5enLUZQ" name="cssClass">

-              <stringListValue>portOutside</stringListValue>

-            </styles>

-            <element xmi:type="uml:Port" href="model.uml#_tmei4P_vEeWeEdC7hbdSmw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSsBX9EeaWc-G5enLUZQ" x="-52" y="130" width="52" height="20"/>

-          </children>

-          <element xmi:type="uml:Property" href="model.uml#_rfKEgRX9EeaWc-G5enLUZQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSsRX9EeaWc-G5enLUZQ" x="252" y="22" width="238" height="161"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_rfLSshX9EeaWc-G5enLUZQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSsxX9EeaWc-G5enLUZQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_rfLStBX9EeaWc-G5enLUZQ" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_rfLStRX9EeaWc-G5enLUZQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSthX9EeaWc-G5enLUZQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_rfLStxX9EeaWc-G5enLUZQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSuBX9EeaWc-G5enLUZQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSuRX9EeaWc-G5enLUZQ" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSuhX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSuxX9EeaWc-G5enLUZQ" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSvBX9EeaWc-G5enLUZQ" name="cssClass">

-          <stringListValue>portOnline</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_rfKEghX9EeaWc-G5enLUZQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSvRX9EeaWc-G5enLUZQ" x="-46" y="85" width="55" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_rfLSvhX9EeaWc-G5enLUZQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSvxX9EeaWc-G5enLUZQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSwBX9EeaWc-G5enLUZQ" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSwRX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSwhX9EeaWc-G5enLUZQ" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSwxX9EeaWc-G5enLUZQ" name="cssClass">

-          <stringListValue>portInside</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_rfKEgxX9EeaWc-G5enLUZQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSxBX9EeaWc-G5enLUZQ" x="-1" y="117" width="49" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_rfLSxRX9EeaWc-G5enLUZQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSxhX9EeaWc-G5enLUZQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSxxX9EeaWc-G5enLUZQ" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSyBX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSyRX9EeaWc-G5enLUZQ" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSyhX9EeaWc-G5enLUZQ" name="cssClass">

-          <stringListValue>portOutside</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_rfKEhBX9EeaWc-G5enLUZQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSyxX9EeaWc-G5enLUZQ" x="-48" y="151" width="48" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Ql06EBaLEeaWc-G5enLUZQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_Ql1hIBaLEeaWc-G5enLUZQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ql1hIRaLEeaWc-G5enLUZQ" x="-80" y="-20"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Ql1hIhaLEeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ql1hIxaLEeaWc-G5enLUZQ" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_X0v-4BaLEeaWc-G5enLUZQ" name="cssClass">

-          <stringListValue>portInside</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_QldGoBaLEeaWc-G5enLUZQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ql06ERaLEeaWc-G5enLUZQ" x="17" y="-11" width="20" height="49"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_RTsssBaLEeaWc-G5enLUZQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_RTssshaLEeaWc-G5enLUZQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_RTsssxaLEeaWc-G5enLUZQ" x="-93" y="-18"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_RTtTwBaLEeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_RTtTwRaLEeaWc-G5enLUZQ" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_ZEiLwBaLEeaWc-G5enLUZQ" name="cssClass">

-          <stringListValue>portOnline</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_RTjiwBaLEeaWc-G5enLUZQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RTsssRaLEeaWc-G5enLUZQ" x="159" y="-11" width="20" height="46"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_TGHFgBaLEeaWc-G5enLUZQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_TGHFghaLEeaWc-G5enLUZQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TGHFgxaLEeaWc-G5enLUZQ" x="-95" y="-16"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_TGHskBaLEeaWc-G5enLUZQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TGHskRaLEeaWc-G5enLUZQ" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_aEUNwBaLEeaWc-G5enLUZQ" name="cssClass">

-          <stringListValue>portOutside</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="model.uml#_TF97kBaLEeaWc-G5enLUZQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TGHFgRaLEeaWc-G5enLUZQ" x="436" y="6" width="20" height="20"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_rfKEgBX9EeaWc-G5enLUZQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSzBX9EeaWc-G5enLUZQ" x="754" y="82" width="575" height="234"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_aBFGEf_uEeWeEdC7hbdSmw" name="diagram_compatibility_version" stringValue="1.2.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_aBFGEv_uEeWeEdC7hbdSmw"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_aBFGE__uEeWeEdC7hbdSmw">

-      <owner xmi:type="uml:Model" href="model.uml#_Z_d8gP_uEeWeEdC7hbdSmw"/>

-    </styles>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_oehxoP_vEeWeEdC7hbdSmw" name="css_stylesheets"/>

-    <element xmi:type="uml:Model" href="model.uml#_Z_d8gP_uEeWeEdC7hbdSmw"/>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_p__kYP_vEeWeEdC7hbdSmw">

-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_od5fgP_vEeWeEdC7hbdSmw" path="/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/style.css"/>

-  </css:ModelStyleSheets>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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">
+  <notation:Diagram xmi:id="_aA0nYP_uEeWeEdC7hbdSmw" type="PapyrusUMLComponentDiagram" name="Component Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_bSd1cP_uEeWeEdC7hbdSmw" type="Component_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_bTGuoP_uEeWeEdC7hbdSmw" type="Component_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_bTGuof_uEeWeEdC7hbdSmw" type="Component_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bTHVsP_uEeWeEdC7hbdSmw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_bTH8wP_uEeWeEdC7hbdSmw" type="Component_StructureCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_bTH8wf_uEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bTH8wv_uEeWeEdC7hbdSmw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_bTUKAP_uEeWeEdC7hbdSmw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_bTUxEP_uEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bTUxEf_uEeWeEdC7hbdSmw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_b1d00P_uEeWeEdC7hbdSmw" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_b1eb4P_uEeWeEdC7hbdSmw" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_b1eb4f_uEeWeEdC7hbdSmw" x="24" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_b1eb4v_uEeWeEdC7hbdSmw" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_b1eb4__uEeWeEdC7hbdSmw" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_Ansa8P_5EeWeEdC7hbdSmw" name="cssClass">
+          <stringListValue>portOnline</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_b0AcQP_uEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b1d00f_uEeWeEdC7hbdSmw" y="43" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_2TD4gP_vEeWeEdC7hbdSmw" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_2TD4gv_vEeWeEdC7hbdSmw" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2TD4g__vEeWeEdC7hbdSmw" x="23" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_2TD4hP_vEeWeEdC7hbdSmw" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2TD4hf_vEeWeEdC7hbdSmw" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_4dNb4P_vEeWeEdC7hbdSmw" name="cssClass">
+          <stringListValue>portInside</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_2TAOIP_vEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TD4gf_vEeWeEdC7hbdSmw" x="10" y="81" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_2nZJwP_vEeWeEdC7hbdSmw" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_2nZJwv_vEeWeEdC7hbdSmw" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2nZJw__vEeWeEdC7hbdSmw" x="23" y="4"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_2nZJxP_vEeWeEdC7hbdSmw" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2nZJxf_vEeWeEdC7hbdSmw" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_5Qf6AP_vEeWeEdC7hbdSmw" name="cssClass">
+          <stringListValue>portOutside</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_2nOKoP_vEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2nZJwf_vEeWeEdC7hbdSmw" x="-9" y="116" width="20" height="20"/>
+      </children>
+      <element xmi:type="uml:Component" href="model.uml#_bSWgsP_uEeWeEdC7hbdSmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bSd1cf_uEeWeEdC7hbdSmw" x="268" y="111" width="193" height="145"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UVLLoBXFEeaQOqKbZy9Uvg" type="Component_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UVdfgBXFEeaQOqKbZy9Uvg" type="Component_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UVdfgRXFEeaQOqKbZy9Uvg" type="Component_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UVdfghXFEeaQOqKbZy9Uvg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UVeGkBXFEeaQOqKbZy9Uvg" type="Component_StructureCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UVeGkRXFEeaQOqKbZy9Uvg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVeGkhXFEeaQOqKbZy9Uvg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UVmCYBXFEeaQOqKbZy9Uvg" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UVmCYRXFEeaQOqKbZy9Uvg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVmCYhXFEeaQOqKbZy9Uvg"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_U9UJsBXFEeaQOqKbZy9Uvg" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_U9UJshXFEeaQOqKbZy9Uvg" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_U9UJsxXFEeaQOqKbZy9Uvg" x="23" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_U9UwwBXFEeaQOqKbZy9Uvg" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_U9Wl8BXFEeaQOqKbZy9Uvg" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="model.uml#_U89kYBXFEeaQOqKbZy9Uvg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U9UJsRXFEeaQOqKbZy9Uvg" x="269" y="-10" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_V5lksBXFEeaQOqKbZy9Uvg" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_V5lkshXFEeaQOqKbZy9Uvg" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_V5lksxXFEeaQOqKbZy9Uvg" x="23" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_V5mLwBXFEeaQOqKbZy9Uvg" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_V5mLwRXFEeaQOqKbZy9Uvg" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="model.uml#_V5W7MBXFEeaQOqKbZy9Uvg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V5lksRXFEeaQOqKbZy9Uvg" x="269" y="163" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_WuQi4BXFEeaQOqKbZy9Uvg" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_WuRJ8RXFEeaQOqKbZy9Uvg" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_WuRJ8hXFEeaQOqKbZy9Uvg" x="23" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_WuRJ8xXFEeaQOqKbZy9Uvg" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_WuRJ9BXFEeaQOqKbZy9Uvg" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="model.uml#_Wt26QBXFEeaQOqKbZy9Uvg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WuRJ8BXFEeaQOqKbZy9Uvg" x="-10" y="-10" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_X45KABXFEeaQOqKbZy9Uvg" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_X45KAhXFEeaQOqKbZy9Uvg" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_X45KAxXFEeaQOqKbZy9Uvg" x="23" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_X45KBBXFEeaQOqKbZy9Uvg" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_X45KBRXFEeaQOqKbZy9Uvg" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="model.uml#_X4ruoBXFEeaQOqKbZy9Uvg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X45KARXFEeaQOqKbZy9Uvg" x="-10" y="163" width="20" height="20"/>
+      </children>
+      <element xmi:type="uml:Component" href="model.uml#_UUSa0BXFEeaQOqKbZy9Uvg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVLLoRXFEeaQOqKbZy9Uvg" x="732" y="128" width="279" height="173"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_iDb5IBXKEeajjfMdXxCzwA" type="Component_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iDcgMRXKEeajjfMdXxCzwA" type="Component_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iDcgMhXKEeajjfMdXxCzwA" type="Component_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iDcgMxXKEeajjfMdXxCzwA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iDdHQBXKEeajjfMdXxCzwA" type="Component_StructureCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iDdHQRXKEeajjfMdXxCzwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iDdHQhXKEeajjfMdXxCzwA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iDotcBXKEeajjfMdXxCzwA" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iDotcRXKEeajjfMdXxCzwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iDotchXKEeajjfMdXxCzwA"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iYotEBXKEeajjfMdXxCzwA" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_iYpUIBXKEeajjfMdXxCzwA" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iYpUIRXKEeajjfMdXxCzwA" x="20" y="5"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_iYpUIhXKEeajjfMdXxCzwA" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iYpUIxXKEeajjfMdXxCzwA" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="model.uml#_iYN2UBXKEeajjfMdXxCzwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYotERXKEeajjfMdXxCzwA" x="248" y="19" width="20" height="20"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_lDbn8BXhEea6WZN2jvL3hg" name="cssClass">
+        <stringListValue>isOval</stringListValue>
+      </styles>
+      <element xmi:type="uml:Component" href="model.uml#_iDYOwBXKEeajjfMdXxCzwA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iDcgMBXKEeajjfMdXxCzwA" x="557" y="398" width="292" height="161"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_nzpkQBXKEeajjfMdXxCzwA" type="Component_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_nzqLUBXKEeajjfMdXxCzwA" type="Component_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nzqLURXKEeajjfMdXxCzwA" type="Component_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nzqLUhXKEeajjfMdXxCzwA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_nzqLUxXKEeajjfMdXxCzwA" type="Component_StructureCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_nzqLVBXKEeajjfMdXxCzwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nzqLVRXKEeajjfMdXxCzwA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_nzyHIBXKEeajjfMdXxCzwA" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_nzyHIRXKEeajjfMdXxCzwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nzyHIhXKEeajjfMdXxCzwA"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_phV1IBXKEeajjfMdXxCzwA" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_phWcMBXKEeajjfMdXxCzwA" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_phWcMRXKEeajjfMdXxCzwA" x="22" y="1"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_phWcMhXKEeajjfMdXxCzwA" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_phWcMxXKEeajjfMdXxCzwA" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="model.uml#_phLdEBXKEeajjfMdXxCzwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_phV1IRXKEeajjfMdXxCzwA" x="256" y="-10" width="20" height="20"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_j1q0UBXhEea6WZN2jvL3hg" name="cssClass">
+        <stringListValue>isPackage</stringListValue>
+      </styles>
+      <element xmi:type="uml:Component" href="model.uml#_nznvEBXKEeajjfMdXxCzwA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nzpkQRXKEeajjfMdXxCzwA" x="84" y="389" width="350" height="149"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_aA0nYf_uEeWeEdC7hbdSmw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_aA0nYv_uEeWeEdC7hbdSmw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_aA0nY__uEeWeEdC7hbdSmw">
+      <owner xmi:type="uml:Model" href="model.uml#_Z_d8gP_uEeWeEdC7hbdSmw"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model.uml#_Z_d8gP_uEeWeEdC7hbdSmw"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_aBFGEP_uEeWeEdC7hbdSmw" type="CompositeStructure" name="Composite Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_hv8PMP_uEeWeEdC7hbdSmw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_hv8PMv_uEeWeEdC7hbdSmw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hv82QP_uEeWeEdC7hbdSmw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hv82Qf_uEeWeEdC7hbdSmw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_hv82Qv_uEeWeEdC7hbdSmw" type="Class_StructureCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_iKXhYP_uEeWeEdC7hbdSmw" type="Property_Shape">
+          <children xmi:type="notation:DecorationNode" xmi:id="_iKXhYv_uEeWeEdC7hbdSmw" type="Property_NameLabel"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_iKXhY__uEeWeEdC7hbdSmw" type="Property_FloatingNameLabel">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_iKXhZP_uEeWeEdC7hbdSmw" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_iKZ9oP_uEeWeEdC7hbdSmw" type="Property_StructureCompartment">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_iKZ9of_uEeWeEdC7hbdSmw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iKZ9ov_uEeWeEdC7hbdSmw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_iNHTYP_uEeWeEdC7hbdSmw" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_iNHTYf_uEeWeEdC7hbdSmw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iNHTYv_uEeWeEdC7hbdSmw"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_yI494BaHEeaWc-G5enLUZQ" type="Port_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_yI494haHEeaWc-G5enLUZQ" type="Port_NameLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_yI494xaHEeaWc-G5enLUZQ" x="25" y="3"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_yI495BaHEeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_yI495RaHEeaWc-G5enLUZQ" x="25" y="-10"/>
+            </children>
+            <element xmi:type="uml:Port" href="model.uml#_yIq7cBaHEeaWc-G5enLUZQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yI494RaHEeaWc-G5enLUZQ" x="-10" y="57" width="20" height="20"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_1T-Z0BaHEeaWc-G5enLUZQ" type="Port_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_1T_A4BaHEeaWc-G5enLUZQ" type="Port_NameLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_1T_A4RaHEeaWc-G5enLUZQ" x="25" y="3"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_1T_A4haHEeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_1T_A4xaHEeaWc-G5enLUZQ" x="25" y="-10"/>
+            </children>
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_7GaSgBaHEeaWc-G5enLUZQ" name="cssClass">
+              <stringListValue>portInside</stringListValue>
+            </styles>
+            <element xmi:type="uml:Port" href="model.uml#_1T128BaHEeaWc-G5enLUZQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1T-Z0RaHEeaWc-G5enLUZQ" y="85" width="20" height="20"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_3c_UwBaHEeaWc-G5enLUZQ" type="Port_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_3c_UwhaHEeaWc-G5enLUZQ" type="Port_NameLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_3c_UwxaHEeaWc-G5enLUZQ" x="25" y="3"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_3c_UxBaHEeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_3c_UxRaHEeaWc-G5enLUZQ" x="25" y="-10"/>
+            </children>
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_8TtMEBaHEeaWc-G5enLUZQ" name="cssClass">
+              <stringListValue>portOutside</stringListValue>
+            </styles>
+            <element xmi:type="uml:Port" href="model.uml#_3c2x4BaHEeaWc-G5enLUZQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3c_UwRaHEeaWc-G5enLUZQ" x="-10" y="111" width="20" height="20"/>
+          </children>
+          <element xmi:type="uml:Property" href="model.uml#_iKTP8P_uEeWeEdC7hbdSmw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iKXhYf_uEeWeEdC7hbdSmw" x="252" y="22" width="238" height="161"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_hv82Q__uEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hv82RP_uEeWeEdC7hbdSmw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_hxYZoP_uEeWeEdC7hbdSmw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_hxYZof_uEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hxYZov_uEeWeEdC7hbdSmw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_ilQtoP_uEeWeEdC7hbdSmw" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_ilQtov_uEeWeEdC7hbdSmw" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ilQto__uEeWeEdC7hbdSmw" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_ilQtpP_uEeWeEdC7hbdSmw" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ilQtpf_uEeWeEdC7hbdSmw" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_zUvGMP_vEeWeEdC7hbdSmw" name="cssClass">
+          <stringListValue>portOnline</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_ilKnAP_uEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ilQtof_uEeWeEdC7hbdSmw" y="86" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_uKmjoP_vEeWeEdC7hbdSmw" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_uKo_4P_vEeWeEdC7hbdSmw" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_uKo_4f_vEeWeEdC7hbdSmw" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_uKpm8P_vEeWeEdC7hbdSmw" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_uKpm8f_vEeWeEdC7hbdSmw" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_z8NV4P_vEeWeEdC7hbdSmw" name="cssClass">
+          <stringListValue>portInside</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_uKVd4P_vEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKmjof_vEeWeEdC7hbdSmw" x="10" y="118" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_ufB7gP_vEeWeEdC7hbdSmw" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_ufCikP_vEeWeEdC7hbdSmw" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ufCikf_vEeWeEdC7hbdSmw" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_ufCikv_vEeWeEdC7hbdSmw" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ufCik__vEeWeEdC7hbdSmw" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_0n-2wP_vEeWeEdC7hbdSmw" name="cssClass">
+          <stringListValue>portOutside</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_ue7N0P_vEeWeEdC7hbdSmw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ufB7gf_vEeWeEdC7hbdSmw" x="-9" y="152" width="20" height="20"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_hv5y8P_uEeWeEdC7hbdSmw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hv8PMf_uEeWeEdC7hbdSmw" x="96" y="86" width="575" height="234"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rfKrkBX9EeaWc-G5enLUZQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rfKrkRX9EeaWc-G5enLUZQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rfKrkhX9EeaWc-G5enLUZQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rfKrkxX9EeaWc-G5enLUZQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rfKrlBX9EeaWc-G5enLUZQ" type="Class_StructureCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_rfKrlRX9EeaWc-G5enLUZQ" type="Property_Shape">
+          <children xmi:type="notation:DecorationNode" xmi:id="_rfKrlhX9EeaWc-G5enLUZQ" type="Property_NameLabel"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_rfKrlxX9EeaWc-G5enLUZQ" type="Property_FloatingNameLabel">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_rfKrmBX9EeaWc-G5enLUZQ" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_rfKrmRX9EeaWc-G5enLUZQ" type="Property_StructureCompartment">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_rfKrmhX9EeaWc-G5enLUZQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfKrmxX9EeaWc-G5enLUZQ"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_rfKrnBX9EeaWc-G5enLUZQ" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_rfKrnRX9EeaWc-G5enLUZQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfKrnhX9EeaWc-G5enLUZQ"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_rfKrnxX9EeaWc-G5enLUZQ" type="Port_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_rfKroBX9EeaWc-G5enLUZQ" type="Port_NameLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfKroRX9EeaWc-G5enLUZQ" x="25" y="3"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_rfKrohX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSoBX9EeaWc-G5enLUZQ" x="25" y="-10"/>
+            </children>
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSoRX9EeaWc-G5enLUZQ" name="cssClass">
+              <stringListValue>portOnline</stringListValue>
+            </styles>
+            <element xmi:type="uml:Port" href="model.uml#_nnSdEP_uEeWeEdC7hbdSmw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSohX9EeaWc-G5enLUZQ" x="-11" y="52" width="53" height="20"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_rfLSoxX9EeaWc-G5enLUZQ" type="Port_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_rfLSpBX9EeaWc-G5enLUZQ" type="Port_NameLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSpRX9EeaWc-G5enLUZQ" x="25" y="3"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_rfLSphX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSpxX9EeaWc-G5enLUZQ" x="25" y="-10"/>
+            </children>
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSqBX9EeaWc-G5enLUZQ" name="cssClass">
+              <stringListValue>portInside</stringListValue>
+            </styles>
+            <element xmi:type="uml:Port" href="model.uml#_tM6zYP_vEeWeEdC7hbdSmw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSqRX9EeaWc-G5enLUZQ" x="-1" y="93" width="45" height="20"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_rfLSqhX9EeaWc-G5enLUZQ" type="Port_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_rfLSqxX9EeaWc-G5enLUZQ" type="Port_NameLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSrBX9EeaWc-G5enLUZQ" x="25" y="3"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_rfLSrRX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSrhX9EeaWc-G5enLUZQ" x="25" y="-10"/>
+            </children>
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSrxX9EeaWc-G5enLUZQ" name="cssClass">
+              <stringListValue>portOutside</stringListValue>
+            </styles>
+            <element xmi:type="uml:Port" href="model.uml#_tmei4P_vEeWeEdC7hbdSmw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSsBX9EeaWc-G5enLUZQ" x="-52" y="130" width="52" height="20"/>
+          </children>
+          <element xmi:type="uml:Property" href="model.uml#_rfKEgRX9EeaWc-G5enLUZQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSsRX9EeaWc-G5enLUZQ" x="252" y="22" width="238" height="161"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rfLSshX9EeaWc-G5enLUZQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSsxX9EeaWc-G5enLUZQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rfLStBX9EeaWc-G5enLUZQ" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rfLStRX9EeaWc-G5enLUZQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSthX9EeaWc-G5enLUZQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_rfLStxX9EeaWc-G5enLUZQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSuBX9EeaWc-G5enLUZQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSuRX9EeaWc-G5enLUZQ" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSuhX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSuxX9EeaWc-G5enLUZQ" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSvBX9EeaWc-G5enLUZQ" name="cssClass">
+          <stringListValue>portOnline</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_rfKEghX9EeaWc-G5enLUZQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSvRX9EeaWc-G5enLUZQ" x="-46" y="85" width="55" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_rfLSvhX9EeaWc-G5enLUZQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSvxX9EeaWc-G5enLUZQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSwBX9EeaWc-G5enLUZQ" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSwRX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSwhX9EeaWc-G5enLUZQ" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSwxX9EeaWc-G5enLUZQ" name="cssClass">
+          <stringListValue>portInside</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_rfKEgxX9EeaWc-G5enLUZQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSxBX9EeaWc-G5enLUZQ" x="-1" y="117" width="49" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_rfLSxRX9EeaWc-G5enLUZQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSxhX9EeaWc-G5enLUZQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSxxX9EeaWc-G5enLUZQ" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_rfLSyBX9EeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rfLSyRX9EeaWc-G5enLUZQ" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_rfLSyhX9EeaWc-G5enLUZQ" name="cssClass">
+          <stringListValue>portOutside</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_rfKEhBX9EeaWc-G5enLUZQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSyxX9EeaWc-G5enLUZQ" x="-48" y="151" width="48" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Ql06EBaLEeaWc-G5enLUZQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_Ql1hIBaLEeaWc-G5enLUZQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ql1hIRaLEeaWc-G5enLUZQ" x="-80" y="-20"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Ql1hIhaLEeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ql1hIxaLEeaWc-G5enLUZQ" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_X0v-4BaLEeaWc-G5enLUZQ" name="cssClass">
+          <stringListValue>portInside</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_QldGoBaLEeaWc-G5enLUZQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ql06ERaLEeaWc-G5enLUZQ" x="17" y="-11" width="20" height="49"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_RTsssBaLEeaWc-G5enLUZQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_RTssshaLEeaWc-G5enLUZQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_RTsssxaLEeaWc-G5enLUZQ" x="-93" y="-18"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_RTtTwBaLEeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_RTtTwRaLEeaWc-G5enLUZQ" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_ZEiLwBaLEeaWc-G5enLUZQ" name="cssClass">
+          <stringListValue>portOnline</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_RTjiwBaLEeaWc-G5enLUZQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RTsssRaLEeaWc-G5enLUZQ" x="159" y="-11" width="20" height="46"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_TGHFgBaLEeaWc-G5enLUZQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_TGHFghaLEeaWc-G5enLUZQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TGHFgxaLEeaWc-G5enLUZQ" x="-95" y="-16"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_TGHskBaLEeaWc-G5enLUZQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TGHskRaLEeaWc-G5enLUZQ" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_aEUNwBaLEeaWc-G5enLUZQ" name="cssClass">
+          <stringListValue>portOutside</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="model.uml#_TF97kBaLEeaWc-G5enLUZQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TGHFgRaLEeaWc-G5enLUZQ" x="436" y="6" width="20" height="20"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_rfKEgBX9EeaWc-G5enLUZQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfLSzBX9EeaWc-G5enLUZQ" x="754" y="82" width="575" height="234"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_aBFGEf_uEeWeEdC7hbdSmw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_aBFGEv_uEeWeEdC7hbdSmw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_aBFGE__uEeWeEdC7hbdSmw">
+      <owner xmi:type="uml:Model" href="model.uml#_Z_d8gP_uEeWeEdC7hbdSmw"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_oehxoP_vEeWeEdC7hbdSmw" name="css_stylesheets"/>
+    <element xmi:type="uml:Model" href="model.uml#_Z_d8gP_uEeWeEdC7hbdSmw"/>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_p__kYP_vEeWeEdC7hbdSmw">
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_od5fgP_vEeWeEdC7hbdSmw" path="/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/style.css"/>
+  </css:ModelStyleSheets>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/model.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/model.uml
index c6c71101c03..0f58c0eb79f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/model.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/488744/model.uml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Z_d8gP_uEeWeEdC7hbdSmw" name="RootElement">

-  <packagedElement xmi:type="uml:Component" xmi:id="_bSWgsP_uEeWeEdC7hbdSmw" name="Component">

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_b0AcQP_uEeWeEdC7hbdSmw" name="onlinePort" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_nnSdEP_uEeWeEdC7hbdSmw" name="onlinePort2Resized" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_tM6zYP_vEeWeEdC7hbdSmw" name="insidePort2Resized" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_tmei4P_vEeWeEdC7hbdSmw" name="outsidePort2Resized" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_2TAOIP_vEeWeEdC7hbdSmw" name="insidePort" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_2nOKoP_vEeWeEdC7hbdSmw" name="outsidePort" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_yIq7cBaHEeaWc-G5enLUZQ" name="onlinePort2" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_1T128BaHEeaWc-G5enLUZQ" name="insidePort2" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_3c2x4BaHEeaWc-G5enLUZQ" name="outsidePort2" aggregation="composite"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_hv5y8P_uEeWeEdC7hbdSmw" name="Class">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_iKTP8P_uEeWeEdC7hbdSmw" name="Attribute" type="_bSWgsP_uEeWeEdC7hbdSmw"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_ilKnAP_uEeWeEdC7hbdSmw" name="onlinePort1" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_uKVd4P_vEeWeEdC7hbdSmw" name="insidePort1" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_ue7N0P_vEeWeEdC7hbdSmw" name="outsidePort1" aggregation="composite"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Component" xmi:id="_UUSa0BXFEeaQOqKbZy9Uvg" name="Component4CornerPosition">

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_U89kYBXFEeaQOqKbZy9Uvg" name="NEPort" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_V5W7MBXFEeaQOqKbZy9Uvg" name="SEPort" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_Wt26QBXFEeaQOqKbZy9Uvg" name="NWPort" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_X4ruoBXFEeaQOqKbZy9Uvg" name="SWPort" aggregation="composite"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Component" xmi:id="_iDYOwBXKEeajjfMdXxCzwA" name="OvalComponent">

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_iYN2UBXKEeajjfMdXxCzwA" name="PortOnOval" aggregation="composite"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Component" xmi:id="_nznvEBXKEeajjfMdXxCzwA" name="PackagedComponent">

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_phLdEBXKEeajjfMdXxCzwA" name="PortOnPackage" aggregation="composite"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_rfKEgBX9EeaWc-G5enLUZQ" name="ClassForResizedPort">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_rfKEgRX9EeaWc-G5enLUZQ" name="AttributeForResizedPort" type="_bSWgsP_uEeWeEdC7hbdSmw"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_rfKEghX9EeaWc-G5enLUZQ" name="onlinePort1Resized" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_rfKEgxX9EeaWc-G5enLUZQ" name="insidePort1Resized" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_rfKEhBX9EeaWc-G5enLUZQ" name="outsidePort1Resized" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_QldGoBaLEeaWc-G5enLUZQ" name="topPortInsideResized" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_RTjiwBaLEeaWc-G5enLUZQ" name="topPortOnlineResized" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_TF97kBaLEeaWc-G5enLUZQ" name="topPortOutsideResized" aggregation="composite"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Z_d8gP_uEeWeEdC7hbdSmw" name="RootElement">
+  <packagedElement xmi:type="uml:Component" xmi:id="_bSWgsP_uEeWeEdC7hbdSmw" name="Component">
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_b0AcQP_uEeWeEdC7hbdSmw" name="onlinePort" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_nnSdEP_uEeWeEdC7hbdSmw" name="onlinePort2Resized" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_tM6zYP_vEeWeEdC7hbdSmw" name="insidePort2Resized" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_tmei4P_vEeWeEdC7hbdSmw" name="outsidePort2Resized" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_2TAOIP_vEeWeEdC7hbdSmw" name="insidePort" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_2nOKoP_vEeWeEdC7hbdSmw" name="outsidePort" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_yIq7cBaHEeaWc-G5enLUZQ" name="onlinePort2" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_1T128BaHEeaWc-G5enLUZQ" name="insidePort2" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_3c2x4BaHEeaWc-G5enLUZQ" name="outsidePort2" aggregation="composite"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_hv5y8P_uEeWeEdC7hbdSmw" name="Class">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_iKTP8P_uEeWeEdC7hbdSmw" name="Attribute" type="_bSWgsP_uEeWeEdC7hbdSmw"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_ilKnAP_uEeWeEdC7hbdSmw" name="onlinePort1" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_uKVd4P_vEeWeEdC7hbdSmw" name="insidePort1" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_ue7N0P_vEeWeEdC7hbdSmw" name="outsidePort1" aggregation="composite"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Component" xmi:id="_UUSa0BXFEeaQOqKbZy9Uvg" name="Component4CornerPosition">
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_U89kYBXFEeaQOqKbZy9Uvg" name="NEPort" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_V5W7MBXFEeaQOqKbZy9Uvg" name="SEPort" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_Wt26QBXFEeaQOqKbZy9Uvg" name="NWPort" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_X4ruoBXFEeaQOqKbZy9Uvg" name="SWPort" aggregation="composite"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Component" xmi:id="_iDYOwBXKEeajjfMdXxCzwA" name="OvalComponent">
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_iYN2UBXKEeajjfMdXxCzwA" name="PortOnOval" aggregation="composite"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Component" xmi:id="_nznvEBXKEeajjfMdXxCzwA" name="PackagedComponent">
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_phLdEBXKEeajjfMdXxCzwA" name="PortOnPackage" aggregation="composite"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_rfKEgBX9EeaWc-G5enLUZQ" name="ClassForResizedPort">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_rfKEgRX9EeaWc-G5enLUZQ" name="AttributeForResizedPort" type="_bSWgsP_uEeWeEdC7hbdSmw"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_rfKEghX9EeaWc-G5enLUZQ" name="onlinePort1Resized" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_rfKEgxX9EeaWc-G5enLUZQ" name="insidePort1Resized" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_rfKEhBX9EeaWc-G5enLUZQ" name="outsidePort1Resized" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_QldGoBaLEeaWc-G5enLUZQ" name="topPortInsideResized" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_RTjiwBaLEeaWc-G5enLUZQ" name="topPortOnlineResized" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_TF97kBaLEeaWc-G5enLUZQ" name="topPortOutsideResized" aggregation="composite"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdge.elementtypesconfigurations b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdge.elementtypesconfigurations
index 3da1b9494b2..ad986379ecb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdge.elementtypesconfigurations
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdge.elementtypesconfigurations
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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" xmlns:stereotypepropertyreferenceedgeadvice="http://www.eclipse.org/papyrus/uml/types/stereotypepropertyreferenceedgeadvice/1.0" xmi:id="_7DidYFWZEeeCtfUULxryEg" identifier="StereotypePropertyReferenceEdgeExample" name="StereotypePropertyReferenceEdgeExample" metamodelNsURI="StereotypePropertyReferenceEdgeExample">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_GmRm8FfuEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.singlestereotyperef" name="SingleStereotypeRef" hint="StereotypePropertyReferenceEdge">

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_tmhvYFfuEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.multistereotyperef" name="MultiStereotypeRef" hint="StereotypePropertyReferenceEdge">

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_t2FOUFfuEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.singleeclassref" name="SingleEClassRef" hint="StereotypePropertyReferenceEdge">

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_t9alYFfuEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.multieclassref" name="MultiEClassRef" hint="StereotypePropertyReferenceEdge">

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="stereotypepropertyreferenceedgeadvice:StereotypePropertyReferenceEdgeAdviceConfiguration" xmi:id="_Kn6TkFfyEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.singlestereotyperef_1498208326471" target="_GmRm8FfuEeehb73Gpbl1-Q" featureToSet="SingleStereoRef" edgeLabel="SingleStereoRefLabel" stereotypeQualifiedName="StereotypePropertyReferenceEdgeTest::SourceStereotype"/>

-  <adviceBindingsConfigurations xsi:type="stereotypepropertyreferenceedgeadvice:StereotypePropertyReferenceEdgeAdviceConfiguration" xmi:id="_R1LLgFfyEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.multistereotyperef_1498208374840" target="_tmhvYFfuEeehb73Gpbl1-Q" featureToSet="MultiStereoRef" edgeLabel="MultiStereoRefLabel" stereotypeQualifiedName="StereotypePropertyReferenceEdgeTest::SourceStereotype"/>

-  <adviceBindingsConfigurations xsi:type="stereotypepropertyreferenceedgeadvice:StereotypePropertyReferenceEdgeAdviceConfiguration" xmi:id="_TP-VkFfyEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.singleeclassref_1498208384361" target="_t2FOUFfuEeehb73Gpbl1-Q" featureToSet="SingleEClassRef" edgeLabel="SingleEClassRefLabel" stereotypeQualifiedName="StereotypePropertyReferenceEdgeTest::SourceStereotype"/>

-  <adviceBindingsConfigurations xsi:type="stereotypepropertyreferenceedgeadvice:StereotypePropertyReferenceEdgeAdviceConfiguration" xmi:id="_W5bIgFfyEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.multieclassref_1498208408840" target="_t9alYFfuEeehb73Gpbl1-Q" featureToSet="MultiEClassRef" edgeLabel="MultiEClassRefLabel" stereotypeQualifiedName="StereotypePropertyReferenceEdgeTest::SourceStereotype"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="UTF-8"?>
+<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" xmlns:stereotypepropertyreferenceedgeadvice="http://www.eclipse.org/papyrus/uml/types/stereotypepropertyreferenceedgeadvice/1.0" xmi:id="_7DidYFWZEeeCtfUULxryEg" identifier="StereotypePropertyReferenceEdgeExample" name="StereotypePropertyReferenceEdgeExample" metamodelNsURI="StereotypePropertyReferenceEdgeExample">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_GmRm8FfuEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.singlestereotyperef" name="SingleStereotypeRef" hint="StereotypePropertyReferenceEdge">
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_tmhvYFfuEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.multistereotyperef" name="MultiStereotypeRef" hint="StereotypePropertyReferenceEdge">
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_t2FOUFfuEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.singleeclassref" name="SingleEClassRef" hint="StereotypePropertyReferenceEdge">
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_t9alYFfuEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.multieclassref" name="MultiEClassRef" hint="StereotypePropertyReferenceEdge">
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="stereotypepropertyreferenceedgeadvice:StereotypePropertyReferenceEdgeAdviceConfiguration" xmi:id="_Kn6TkFfyEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.singlestereotyperef_1498208326471" target="_GmRm8FfuEeehb73Gpbl1-Q" featureToSet="SingleStereoRef" edgeLabel="SingleStereoRefLabel" stereotypeQualifiedName="StereotypePropertyReferenceEdgeTest::SourceStereotype"/>
+  <adviceBindingsConfigurations xsi:type="stereotypepropertyreferenceedgeadvice:StereotypePropertyReferenceEdgeAdviceConfiguration" xmi:id="_R1LLgFfyEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.multistereotyperef_1498208374840" target="_tmhvYFfuEeehb73Gpbl1-Q" featureToSet="MultiStereoRef" edgeLabel="MultiStereoRefLabel" stereotypeQualifiedName="StereotypePropertyReferenceEdgeTest::SourceStereotype"/>
+  <adviceBindingsConfigurations xsi:type="stereotypepropertyreferenceedgeadvice:StereotypePropertyReferenceEdgeAdviceConfiguration" xmi:id="_TP-VkFfyEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.singleeclassref_1498208384361" target="_t2FOUFfuEeehb73Gpbl1-Q" featureToSet="SingleEClassRef" edgeLabel="SingleEClassRefLabel" stereotypeQualifiedName="StereotypePropertyReferenceEdgeTest::SourceStereotype"/>
+  <adviceBindingsConfigurations xsi:type="stereotypepropertyreferenceedgeadvice:StereotypePropertyReferenceEdgeAdviceConfiguration" xmi:id="_W5bIgFfyEeehb73Gpbl1-Q" identifier="org.eclipse.papyrus.stereotypepropertyreferenceedgetest.multieclassref_1498208408840" target="_t9alYFfuEeehb73Gpbl1-Q" featureToSet="MultiEClassRef" edgeLabel="MultiEClassRefLabel" stereotypeQualifiedName="StereotypePropertyReferenceEdgeTest::SourceStereotype"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdge.paletteconfiguration b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdge.paletteconfiguration
index ef6e8904f88..2d44ed48482 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdge.paletteconfiguration
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdge.paletteconfiguration
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<paletteconfiguration:PaletteConfiguration 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" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="Mickael ADAM_1497960935454">

-  <drawerConfigurations id="Default_1497960935454" label="Default">

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.edges.test.SingleStereotypeRef" label="SingleStereotypeRef" description="" kind="ConnectionTool">

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="StereotypePropertyReferenceEdge.elementtypesconfigurations#_GmRm8FfuEeehb73Gpbl1-Q"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.edges.test.MultiStereotypeRef" label="MultiStereotypeRef" description="" kind="ConnectionTool">

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="StereotypePropertyReferenceEdge.elementtypesconfigurations#_tmhvYFfuEeehb73Gpbl1-Q"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.edges.test.SingleEclassRef" label="SingleEClassRef" description="" kind="ConnectionTool">

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="StereotypePropertyReferenceEdge.elementtypesconfigurations#_t2FOUFfuEeehb73Gpbl1-Q"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.edges.test.MultiEClassRef" label="MultiEClassRef" description="" kind="ConnectionTool">

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="StereotypePropertyReferenceEdge.elementtypesconfigurations#_t9alYFfuEeehb73Gpbl1-Q"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-</paletteconfiguration:PaletteConfiguration>

+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration 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" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="Mickael ADAM_1497960935454">
+  <drawerConfigurations id="Default_1497960935454" label="Default">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.edges.test.SingleStereotypeRef" label="SingleStereotypeRef" description="" kind="ConnectionTool">
+      <elementDescriptors>
+        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="StereotypePropertyReferenceEdge.elementtypesconfigurations#_GmRm8FfuEeehb73Gpbl1-Q"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.edges.test.MultiStereotypeRef" label="MultiStereotypeRef" description="" kind="ConnectionTool">
+      <elementDescriptors>
+        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="StereotypePropertyReferenceEdge.elementtypesconfigurations#_tmhvYFfuEeehb73Gpbl1-Q"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.edges.test.SingleEclassRef" label="SingleEClassRef" description="" kind="ConnectionTool">
+      <elementDescriptors>
+        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="StereotypePropertyReferenceEdge.elementtypesconfigurations#_t2FOUFfuEeehb73Gpbl1-Q"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.edges.test.MultiEClassRef" label="MultiEClassRef" description="" kind="ConnectionTool">
+      <elementDescriptors>
+        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="StereotypePropertyReferenceEdge.elementtypesconfigurations#_t9alYFfuEeehb73Gpbl1-Q"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.di
index 08128862c28..8c549eecdc6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.notation
index cf560e6cf57..9a5d9d2676c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.notation
@@ -1,226 +1,226 @@
-<?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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_I5uFoFZAEeeZNqfuXnrULQ" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_FtCfkFfzEeehb73Gpbl1-Q" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_FtEUwFfzEeehb73Gpbl1-Q" type="Class_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_FtEUwVfzEeehb73Gpbl1-Q" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FtEUwlfzEeehb73Gpbl1-Q" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_FtE70FfzEeehb73Gpbl1-Q" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_FtE70VfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_FtE70lfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FtE701fzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtE71FfzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_FtE71VfzEeehb73Gpbl1-Q" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_FtE71lfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_FtE711fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FtE72FfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtE72VfzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_FtE72lfzEeehb73Gpbl1-Q" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_FtE721fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_FtE73FfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FtE73VfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtE73lfzEeehb73Gpbl1-Q"/>

-    </children>

-    <element xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_Fs7x4FfzEeehb73Gpbl1-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtCfkVfzEeehb73Gpbl1-Q" x="140" y="140"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_GEbE0FfzEeehb73Gpbl1-Q" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_GEbE0lfzEeehb73Gpbl1-Q" type="Class_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_GEbE01fzEeehb73Gpbl1-Q" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_GEbE1FfzEeehb73Gpbl1-Q" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_GEbE1VfzEeehb73Gpbl1-Q" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GEbE1lfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_GEbE11fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_GEbE2FfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GEbE2VfzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_GEbr4FfzEeehb73Gpbl1-Q" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GEbr4VfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_GEbr4lfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_GEbr41fzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GEbr5FfzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_GEbr5VfzEeehb73Gpbl1-Q" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GEbr5lfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_GEbr51fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_GEbr6FfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GEbr6VfzEeehb73Gpbl1-Q"/>

-    </children>

-    <element xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_GEZPoFfzEeehb73Gpbl1-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GEbE0VfzEeehb73Gpbl1-Q" x="140" y="260"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_GsKaQFfzEeehb73Gpbl1-Q" type="Component_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_GsLBUVfzEeehb73Gpbl1-Q" type="Component_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_GsLBUlfzEeehb73Gpbl1-Q" type="Component_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_GsLBU1fzEeehb73Gpbl1-Q" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_GsLBVFfzEeehb73Gpbl1-Q" type="Component_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GsLBVVfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_GsLBVlfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_GsLBV1fzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GsLBWFfzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_GsLBWVfzEeehb73Gpbl1-Q" type="Component_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GsLBWlfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_GsLBW1fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_GsLBXFfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GsLBXVfzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_GsLoYFfzEeehb73Gpbl1-Q" type="Component_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GsLoYVfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_GsLoYlfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_GsLoY1fzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GsLoZFfzEeehb73Gpbl1-Q"/>

-    </children>

-    <element xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_GsJMIFfzEeehb73Gpbl1-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GsLBUFfzEeehb73Gpbl1-Q" x="420" y="20"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_HHaL0FfzEeehb73Gpbl1-Q" type="Component_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_HHay4FfzEeehb73Gpbl1-Q" type="Component_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_HHay4VfzEeehb73Gpbl1-Q" type="Component_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HHay4lfzEeehb73Gpbl1-Q" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_HHay41fzEeehb73Gpbl1-Q" type="Component_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_HHay5FfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_HHay5VfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_HHay5lfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHay51fzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_HHay6FfzEeehb73Gpbl1-Q" type="Component_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_HHay6VfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_HHay6lfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_HHay61fzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHay7FfzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_HHay7VfzEeehb73Gpbl1-Q" type="Component_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_HHay7lfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_HHay71fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_HHay8FfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHay8VfzEeehb73Gpbl1-Q"/>

-    </children>

-    <element xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_HHY9sFfzEeehb73Gpbl1-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHaL0VfzEeehb73Gpbl1-Q" x="420" y="140"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_IT_6wFfzEeehb73Gpbl1-Q" type="DataType_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_IT_6wlfzEeehb73Gpbl1-Q" type="DataType_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_IT_6w1fzEeehb73Gpbl1-Q" type="DataType_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IUAh0FfzEeehb73Gpbl1-Q" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_IUAh0VfzEeehb73Gpbl1-Q" type="DataType_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_IUAh0lfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_IUAh01fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IUAh1FfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IUAh1VfzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_IUAh1lfzEeehb73Gpbl1-Q" type="DataType_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_IUAh11fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_IUAh2FfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IUAh2VfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IUAh2lfzEeehb73Gpbl1-Q"/>

-    </children>

-    <element xmi:type="uml:DataType" href="StereotypePropertyReferenceEdgeTest.uml#_IT_TsFfzEeehb73Gpbl1-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IT_6wVfzEeehb73Gpbl1-Q" x="420" y="280"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_Iw8VcFfzEeehb73Gpbl1-Q" type="DataType_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Iw8VclfzEeehb73Gpbl1-Q" type="DataType_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Iw8Vc1fzEeehb73Gpbl1-Q" type="DataType_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw88gFfzEeehb73Gpbl1-Q" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Iw88gVfzEeehb73Gpbl1-Q" type="DataType_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Iw88glfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Iw88g1fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Iw88hFfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iw88hVfzEeehb73Gpbl1-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Iw88hlfzEeehb73Gpbl1-Q" type="DataType_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Iw88h1fzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Iw88iFfzEeehb73Gpbl1-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Iw88iVfzEeehb73Gpbl1-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iw88ilfzEeehb73Gpbl1-Q"/>

-    </children>

-    <element xmi:type="uml:DataType" href="StereotypePropertyReferenceEdgeTest.uml#_Iw7HUFfzEeehb73Gpbl1-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iw8VcVfzEeehb73Gpbl1-Q" x="420" y="380"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_UMZFEFfzEeehb73Gpbl1-Q" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_UMZFEVfzEeehb73Gpbl1-Q"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UMZFE1fzEeehb73Gpbl1-Q" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_Fs7x4FfzEeehb73Gpbl1-Q"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMZFElfzEeehb73Gpbl1-Q" x="340" y="140"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_VTX7SFfzEeehb73Gpbl1-Q" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_VTX7SVfzEeehb73Gpbl1-Q"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VTYiUFfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_GEZPoFfzEeehb73Gpbl1-Q"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VTX7SlfzEeehb73Gpbl1-Q" x="340" y="260"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_X9jChFfzEeehb73Gpbl1-Q" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_X9jChVfzEeehb73Gpbl1-Q"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_X9jCh1fzEeehb73Gpbl1-Q" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_GsJMIFfzEeehb73Gpbl1-Q"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X9jChlfzEeehb73Gpbl1-Q" x="620" y="20"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_Z6nMJFfzEeehb73Gpbl1-Q" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_Z6nMJVfzEeehb73Gpbl1-Q"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z6nMJ1fzEeehb73Gpbl1-Q" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_HHY9sFfzEeehb73Gpbl1-Q"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z6nMJlfzEeehb73Gpbl1-Q" x="620" y="140"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_I5uFoVZAEeeZNqfuXnrULQ" name="diagram_compatibility_version" stringValue="1.2.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_I5uFolZAEeeZNqfuXnrULQ"/>

-  <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_nVrscFZ6EeeZJv43aLrf5w" name="css_stylesheets"/>

-  <element xmi:type="uml:Model" href="StereotypePropertyReferenceEdgeTest.uml#_I2B4cFZAEeeZNqfuXnrULQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_UMcIYFfzEeehb73Gpbl1-Q" type="StereotypeCommentLink" source="_FtCfkFfzEeehb73Gpbl1-Q" target="_UMZFEFfzEeehb73Gpbl1-Q">

-    <styles xmi:type="notation:FontStyle" xmi:id="_UMcIYVfzEeehb73Gpbl1-Q"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UMdWgFfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_Fs7x4FfzEeehb73Gpbl1-Q"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UMcIYlfzEeehb73Gpbl1-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UMcvcFfzEeehb73Gpbl1-Q"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UMcvcVfzEeehb73Gpbl1-Q"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_VTYiUVfzEeehb73Gpbl1-Q" type="StereotypeCommentLink" source="_GEbE0FfzEeehb73Gpbl1-Q" target="_VTX7SFfzEeehb73Gpbl1-Q">

-    <styles xmi:type="notation:FontStyle" xmi:id="_VTYiUlfzEeehb73Gpbl1-Q"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VTYiVlfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_GEZPoFfzEeehb73Gpbl1-Q"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VTYiU1fzEeehb73Gpbl1-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VTYiVFfzEeehb73Gpbl1-Q"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VTYiVVfzEeehb73Gpbl1-Q"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_X9jCiFfzEeehb73Gpbl1-Q" type="StereotypeCommentLink" source="_GsKaQFfzEeehb73Gpbl1-Q" target="_X9jChFfzEeehb73Gpbl1-Q">

-    <styles xmi:type="notation:FontStyle" xmi:id="_X9jCiVfzEeehb73Gpbl1-Q"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_X9jpklfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_GsJMIFfzEeehb73Gpbl1-Q"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_X9jCilfzEeehb73Gpbl1-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X9jpkFfzEeehb73Gpbl1-Q"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X9jpkVfzEeehb73Gpbl1-Q"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_Z6nMKFfzEeehb73Gpbl1-Q" type="StereotypeCommentLink" source="_HHaL0FfzEeehb73Gpbl1-Q" target="_Z6nMJFfzEeehb73Gpbl1-Q">

-    <styles xmi:type="notation:FontStyle" xmi:id="_Z6nMKVfzEeehb73Gpbl1-Q"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z6nzMFfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_HHY9sFfzEeehb73Gpbl1-Q"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z6nMKlfzEeehb73Gpbl1-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z6nMK1fzEeehb73Gpbl1-Q"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z6nMLFfzEeehb73Gpbl1-Q"/>

-  </edges>

-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_I5uFo1ZAEeeZNqfuXnrULQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

-    <owner xmi:type="uml:Model" href="StereotypePropertyReferenceEdgeTest.uml#_I2B4cFZAEeeZNqfuXnrULQ"/>

-  </styles>

-</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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_I5uFoFZAEeeZNqfuXnrULQ" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_FtCfkFfzEeehb73Gpbl1-Q" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_FtEUwFfzEeehb73Gpbl1-Q" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_FtEUwVfzEeehb73Gpbl1-Q" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FtEUwlfzEeehb73Gpbl1-Q" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_FtE70FfzEeehb73Gpbl1-Q" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FtE70VfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_FtE70lfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_FtE701fzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtE71FfzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_FtE71VfzEeehb73Gpbl1-Q" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FtE71lfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_FtE711fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_FtE72FfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtE72VfzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_FtE72lfzEeehb73Gpbl1-Q" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FtE721fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_FtE73FfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_FtE73VfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtE73lfzEeehb73Gpbl1-Q"/>
+    </children>
+    <element xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_Fs7x4FfzEeehb73Gpbl1-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtCfkVfzEeehb73Gpbl1-Q" x="140" y="140"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_GEbE0FfzEeehb73Gpbl1-Q" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_GEbE0lfzEeehb73Gpbl1-Q" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_GEbE01fzEeehb73Gpbl1-Q" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_GEbE1FfzEeehb73Gpbl1-Q" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_GEbE1VfzEeehb73Gpbl1-Q" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GEbE1lfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_GEbE11fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_GEbE2FfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GEbE2VfzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_GEbr4FfzEeehb73Gpbl1-Q" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GEbr4VfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_GEbr4lfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_GEbr41fzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GEbr5FfzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_GEbr5VfzEeehb73Gpbl1-Q" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GEbr5lfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_GEbr51fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_GEbr6FfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GEbr6VfzEeehb73Gpbl1-Q"/>
+    </children>
+    <element xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_GEZPoFfzEeehb73Gpbl1-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GEbE0VfzEeehb73Gpbl1-Q" x="140" y="260"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_GsKaQFfzEeehb73Gpbl1-Q" type="Component_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_GsLBUVfzEeehb73Gpbl1-Q" type="Component_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_GsLBUlfzEeehb73Gpbl1-Q" type="Component_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_GsLBU1fzEeehb73Gpbl1-Q" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_GsLBVFfzEeehb73Gpbl1-Q" type="Component_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GsLBVVfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_GsLBVlfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_GsLBV1fzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GsLBWFfzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_GsLBWVfzEeehb73Gpbl1-Q" type="Component_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GsLBWlfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_GsLBW1fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_GsLBXFfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GsLBXVfzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_GsLoYFfzEeehb73Gpbl1-Q" type="Component_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GsLoYVfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_GsLoYlfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_GsLoY1fzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GsLoZFfzEeehb73Gpbl1-Q"/>
+    </children>
+    <element xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_GsJMIFfzEeehb73Gpbl1-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GsLBUFfzEeehb73Gpbl1-Q" x="420" y="20"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_HHaL0FfzEeehb73Gpbl1-Q" type="Component_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_HHay4FfzEeehb73Gpbl1-Q" type="Component_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_HHay4VfzEeehb73Gpbl1-Q" type="Component_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_HHay4lfzEeehb73Gpbl1-Q" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_HHay41fzEeehb73Gpbl1-Q" type="Component_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HHay5FfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_HHay5VfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_HHay5lfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHay51fzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_HHay6FfzEeehb73Gpbl1-Q" type="Component_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HHay6VfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_HHay6lfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_HHay61fzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHay7FfzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_HHay7VfzEeehb73Gpbl1-Q" type="Component_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HHay7lfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_HHay71fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_HHay8FfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHay8VfzEeehb73Gpbl1-Q"/>
+    </children>
+    <element xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_HHY9sFfzEeehb73Gpbl1-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHaL0VfzEeehb73Gpbl1-Q" x="420" y="140"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_IT_6wFfzEeehb73Gpbl1-Q" type="DataType_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_IT_6wlfzEeehb73Gpbl1-Q" type="DataType_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_IT_6w1fzEeehb73Gpbl1-Q" type="DataType_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IUAh0FfzEeehb73Gpbl1-Q" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_IUAh0VfzEeehb73Gpbl1-Q" type="DataType_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IUAh0lfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_IUAh01fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_IUAh1FfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IUAh1VfzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_IUAh1lfzEeehb73Gpbl1-Q" type="DataType_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IUAh11fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_IUAh2FfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_IUAh2VfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IUAh2lfzEeehb73Gpbl1-Q"/>
+    </children>
+    <element xmi:type="uml:DataType" href="StereotypePropertyReferenceEdgeTest.uml#_IT_TsFfzEeehb73Gpbl1-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IT_6wVfzEeehb73Gpbl1-Q" x="420" y="280"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Iw8VcFfzEeehb73Gpbl1-Q" type="DataType_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Iw8VclfzEeehb73Gpbl1-Q" type="DataType_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Iw8Vc1fzEeehb73Gpbl1-Q" type="DataType_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw88gFfzEeehb73Gpbl1-Q" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Iw88gVfzEeehb73Gpbl1-Q" type="DataType_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Iw88glfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Iw88g1fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Iw88hFfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iw88hVfzEeehb73Gpbl1-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Iw88hlfzEeehb73Gpbl1-Q" type="DataType_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Iw88h1fzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Iw88iFfzEeehb73Gpbl1-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Iw88iVfzEeehb73Gpbl1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iw88ilfzEeehb73Gpbl1-Q"/>
+    </children>
+    <element xmi:type="uml:DataType" href="StereotypePropertyReferenceEdgeTest.uml#_Iw7HUFfzEeehb73Gpbl1-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iw8VcVfzEeehb73Gpbl1-Q" x="420" y="380"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UMZFEFfzEeehb73Gpbl1-Q" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_UMZFEVfzEeehb73Gpbl1-Q"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UMZFE1fzEeehb73Gpbl1-Q" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_Fs7x4FfzEeehb73Gpbl1-Q"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMZFElfzEeehb73Gpbl1-Q" x="340" y="140"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_VTX7SFfzEeehb73Gpbl1-Q" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_VTX7SVfzEeehb73Gpbl1-Q"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VTYiUFfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_GEZPoFfzEeehb73Gpbl1-Q"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VTX7SlfzEeehb73Gpbl1-Q" x="340" y="260"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_X9jChFfzEeehb73Gpbl1-Q" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_X9jChVfzEeehb73Gpbl1-Q"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_X9jCh1fzEeehb73Gpbl1-Q" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_GsJMIFfzEeehb73Gpbl1-Q"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X9jChlfzEeehb73Gpbl1-Q" x="620" y="20"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Z6nMJFfzEeehb73Gpbl1-Q" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_Z6nMJVfzEeehb73Gpbl1-Q"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z6nMJ1fzEeehb73Gpbl1-Q" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_HHY9sFfzEeehb73Gpbl1-Q"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z6nMJlfzEeehb73Gpbl1-Q" x="620" y="140"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_I5uFoVZAEeeZNqfuXnrULQ" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_I5uFolZAEeeZNqfuXnrULQ"/>
+  <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_nVrscFZ6EeeZJv43aLrf5w" name="css_stylesheets"/>
+  <element xmi:type="uml:Model" href="StereotypePropertyReferenceEdgeTest.uml#_I2B4cFZAEeeZNqfuXnrULQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_UMcIYFfzEeehb73Gpbl1-Q" type="StereotypeCommentLink" source="_FtCfkFfzEeehb73Gpbl1-Q" target="_UMZFEFfzEeehb73Gpbl1-Q">
+    <styles xmi:type="notation:FontStyle" xmi:id="_UMcIYVfzEeehb73Gpbl1-Q"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UMdWgFfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_Fs7x4FfzEeehb73Gpbl1-Q"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UMcIYlfzEeehb73Gpbl1-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UMcvcFfzEeehb73Gpbl1-Q"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UMcvcVfzEeehb73Gpbl1-Q"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_VTYiUVfzEeehb73Gpbl1-Q" type="StereotypeCommentLink" source="_GEbE0FfzEeehb73Gpbl1-Q" target="_VTX7SFfzEeehb73Gpbl1-Q">
+    <styles xmi:type="notation:FontStyle" xmi:id="_VTYiUlfzEeehb73Gpbl1-Q"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_VTYiVlfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="StereotypePropertyReferenceEdgeTest.uml#_GEZPoFfzEeehb73Gpbl1-Q"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VTYiU1fzEeehb73Gpbl1-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VTYiVFfzEeehb73Gpbl1-Q"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VTYiVVfzEeehb73Gpbl1-Q"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_X9jCiFfzEeehb73Gpbl1-Q" type="StereotypeCommentLink" source="_GsKaQFfzEeehb73Gpbl1-Q" target="_X9jChFfzEeehb73Gpbl1-Q">
+    <styles xmi:type="notation:FontStyle" xmi:id="_X9jCiVfzEeehb73Gpbl1-Q"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_X9jpklfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_GsJMIFfzEeehb73Gpbl1-Q"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_X9jCilfzEeehb73Gpbl1-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X9jpkFfzEeehb73Gpbl1-Q"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X9jpkVfzEeehb73Gpbl1-Q"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Z6nMKFfzEeehb73Gpbl1-Q" type="StereotypeCommentLink" source="_HHaL0FfzEeehb73Gpbl1-Q" target="_Z6nMJFfzEeehb73Gpbl1-Q">
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z6nMKVfzEeehb73Gpbl1-Q"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z6nzMFfzEeehb73Gpbl1-Q" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Component" href="StereotypePropertyReferenceEdgeTest.uml#_HHY9sFfzEeehb73Gpbl1-Q"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z6nMKlfzEeehb73Gpbl1-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z6nMK1fzEeehb73Gpbl1-Q"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z6nMLFfzEeehb73Gpbl1-Q"/>
+  </edges>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_I5uFo1ZAEeeZNqfuXnrULQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="StereotypePropertyReferenceEdgeTest.uml#_I2B4cFZAEeeZNqfuXnrULQ"/>
+  </styles>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.di
index 4f26340f8e6..247ed5e3570 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.uml.architecture.Profile"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.uml.architecture.Profile"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.notation
index d31249e1f4b..6d3690efd2c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.notation
@@ -1,217 +1,217 @@
-<?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" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_6zTNwFdhEeeUyIB-jtaMjQ" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_CPWvoFdiEeeUyIB-jtaMjQ" type="Stereotype_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_CPX9wFdiEeeUyIB-jtaMjQ" type="Stereotype_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_CPX9wVdiEeeUyIB-jtaMjQ" type="Stereotype_AttributeCompartment">

-      <children xmi:type="notation:Shape" xmi:id="_EC7mEFdiEeeUyIB-jtaMjQ" type="Property_ClassAttributeLabel">

-        <element xmi:type="uml:Property" href="StereotypePropertyReferenceEdgeTest.profile.uml#_ECmO4FdiEeeUyIB-jtaMjQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EC7mEVdiEeeUyIB-jtaMjQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_XbogIFdiEeeUyIB-jtaMjQ" type="Property_ClassAttributeLabel">

-        <element xmi:type="uml:Property" href="StereotypePropertyReferenceEdgeTest.profile.uml#_IHluUFdiEeeUyIB-jtaMjQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XbogIVdiEeeUyIB-jtaMjQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Xb_FcFdiEeeUyIB-jtaMjQ" type="Property_ClassAttributeLabel">

-        <element xmi:type="uml:Property" href="StereotypePropertyReferenceEdgeTest.profile.uml#_IZrj4FdiEeeUyIB-jtaMjQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xb_FcVdiEeeUyIB-jtaMjQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_XcWR0FdiEeeUyIB-jtaMjQ" type="Property_ClassAttributeLabel">

-        <element xmi:type="uml:Property" href="StereotypePropertyReferenceEdgeTest.profile.uml#_IgWMkFdiEeeUyIB-jtaMjQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XcWR0VdiEeeUyIB-jtaMjQ"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_CPX9wldiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_CPX9w1diEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_CPX9xFdiEeeUyIB-jtaMjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CPX9xVdiEeeUyIB-jtaMjQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_CPYk0FdiEeeUyIB-jtaMjQ" type="Stereotype_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_CPYk0VdiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_CPYk0ldiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_CPYk01diEeeUyIB-jtaMjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CPYk1FdiEeeUyIB-jtaMjQ"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="StereotypePropertyReferenceEdgeTest.profile.uml#_CPDNoFdiEeeUyIB-jtaMjQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CPWvoVdiEeeUyIB-jtaMjQ" x="160" y="200"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_U183UFdiEeeUyIB-jtaMjQ" type="Stereotype_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_U2AhsFdiEeeUyIB-jtaMjQ" type="Stereotype_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_U2AhsVdiEeeUyIB-jtaMjQ" type="Stereotype_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_U2AhsldiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_U2Ahs1diEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_U2AhtFdiEeeUyIB-jtaMjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U2AhtVdiEeeUyIB-jtaMjQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_U2BIwFdiEeeUyIB-jtaMjQ" type="Stereotype_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_U2BIwVdiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_U2BIwldiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_U2BIw1diEeeUyIB-jtaMjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U2BIxFdiEeeUyIB-jtaMjQ"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="StereotypePropertyReferenceEdgeTest.profile.uml#_U16bEFdiEeeUyIB-jtaMjQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U183UVdiEeeUyIB-jtaMjQ" x="580" y="200"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_v5QFkFdiEeeUyIB-jtaMjQ" type="Stereotype_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_v5RTsFdiEeeUyIB-jtaMjQ" type="Stereotype_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_v5RTsVdiEeeUyIB-jtaMjQ" type="Stereotype_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_v5RTsldiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_v5RTs1diEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_v5RTtFdiEeeUyIB-jtaMjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v5RTtVdiEeeUyIB-jtaMjQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_v5R6wFdiEeeUyIB-jtaMjQ" type="Stereotype_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_v5R6wVdiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_v5R6wldiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_v5R6w1diEeeUyIB-jtaMjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v5R6xFdiEeeUyIB-jtaMjQ"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="StereotypePropertyReferenceEdgeTest.profile.uml#_v5HisFdiEeeUyIB-jtaMjQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v5QFkVdiEeeUyIB-jtaMjQ" x="220" y="400"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_y1YfgFdiEeeUyIB-jtaMjQ" type="Stereotype_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_y1ZtoFdiEeeUyIB-jtaMjQ" type="Stereotype_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_y1ZtoVdiEeeUyIB-jtaMjQ" type="Stereotype_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_y1ZtoldiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_y1Zto1diEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_y1ZtpFdiEeeUyIB-jtaMjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y1ZtpVdiEeeUyIB-jtaMjQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_y1aUsFdiEeeUyIB-jtaMjQ" type="Stereotype_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_y1aUsVdiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_y1aUsldiEeeUyIB-jtaMjQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_y1aUs1diEeeUyIB-jtaMjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y1aUtFdiEeeUyIB-jtaMjQ"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="StereotypePropertyReferenceEdgeTest.profile.uml#_y1UOEFdiEeeUyIB-jtaMjQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y1YfgVdiEeeUyIB-jtaMjQ" x="566" y="399"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_7SWEwFdiEeeUyIB-jtaMjQ" type="Class_MetaclassShape">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7SYhAFdiEeeUyIB-jtaMjQ" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIEFdiEeeUyIB-jtaMjQ" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIEVdiEeeUyIB-jtaMjQ" key="StereotypeList" value="StandardProfile::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIEldiEeeUyIB-jtaMjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIE1diEeeUyIB-jtaMjQ" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIFFdiEeeUyIB-jtaMjQ" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_7SXS4FdiEeeUyIB-jtaMjQ" type="Class_MetaclassNameLabel"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SXS4VdiEeeUyIB-jtaMjQ" x="220" y="100"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_7Tf7UFdiEeeUyIB-jtaMjQ" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_7Tf7UVdiEeeUyIB-jtaMjQ"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7TgiYFdiEeeUyIB-jtaMjQ" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Tf7UldiEeeUyIB-jtaMjQ" x="420" y="100"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_8-zmkFdiEeeUyIB-jtaMjQ" type="Class_MetaclassShape">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8-00sFdiEeeUyIB-jtaMjQ" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-00sVdiEeeUyIB-jtaMjQ" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-1bwFdiEeeUyIB-jtaMjQ" key="StereotypeList" value="StandardProfile::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-1bwVdiEeeUyIB-jtaMjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-1bwldiEeeUyIB-jtaMjQ" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-1bw1diEeeUyIB-jtaMjQ" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_8-0NoFdiEeeUyIB-jtaMjQ" type="Class_MetaclassNameLabel"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8-0NoVdiEeeUyIB-jtaMjQ" x="580" y="100"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_9ABukFdiEeeUyIB-jtaMjQ" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_9ABukVdiEeeUyIB-jtaMjQ"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9ABuk1diEeeUyIB-jtaMjQ" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ABukldiEeeUyIB-jtaMjQ" x="780" y="100"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_-hm2EFdiEeeUyIB-jtaMjQ" type="Class_MetaclassShape">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-h-CcldiEeeUyIB-jtaMjQ" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-pgFdiEeeUyIB-jtaMjQ" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-pgVdiEeeUyIB-jtaMjQ" key="StereotypeList" value="StandardProfile::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-pgldiEeeUyIB-jtaMjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-pg1diEeeUyIB-jtaMjQ" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-phFdiEeeUyIB-jtaMjQ" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_-h-CcFdiEeeUyIB-jtaMjQ" type="Class_MetaclassNameLabel"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-h-CcVdiEeeUyIB-jtaMjQ" x="780" y="240"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_-i8S0FdiEeeUyIB-jtaMjQ" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_-i8S0VdiEeeUyIB-jtaMjQ"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-i8S01diEeeUyIB-jtaMjQ" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-i8S0ldiEeeUyIB-jtaMjQ" x="1020" y="240"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_6zTNwVdhEeeUyIB-jtaMjQ" name="diagram_compatibility_version" stringValue="1.3.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_6zTNwldhEeeUyIB-jtaMjQ"/>

-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_6zTNw1dhEeeUyIB-jtaMjQ" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">

-    <owner xmi:type="uml:Profile" href="StereotypePropertyReferenceEdgeTest.profile.uml#_6trG4FdhEeeUyIB-jtaMjQ"/>

-  </styles>

-  <element xmi:type="uml:Profile" href="StereotypePropertyReferenceEdgeTest.profile.uml#_6trG4FdhEeeUyIB-jtaMjQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_1w5OYFdiEeeUyIB-jtaMjQ" type="Generalization_Edge" source="_v5QFkFdiEeeUyIB-jtaMjQ" target="_CPWvoFdiEeeUyIB-jtaMjQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_1w6cgFdiEeeUyIB-jtaMjQ" type="Generalization_StereotypeLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1w6cgVdiEeeUyIB-jtaMjQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_1w5OYVdiEeeUyIB-jtaMjQ"/>

-    <element xmi:type="uml:Generalization" href="StereotypePropertyReferenceEdgeTest.profile.uml#_1weXoFdiEeeUyIB-jtaMjQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1w5OYldiEeeUyIB-jtaMjQ" points="[260, 400, -643984, -643984]$[260, 351, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1yUxwFdiEeeUyIB-jtaMjQ" id="(0.34782608695652173,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1yUxwVdiEeeUyIB-jtaMjQ" id="(0.4219409282700422,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_2Y1YIFdiEeeUyIB-jtaMjQ" type="Generalization_Edge" source="_y1YfgFdiEeeUyIB-jtaMjQ" target="_U183UFdiEeeUyIB-jtaMjQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_2Y2mQFdiEeeUyIB-jtaMjQ" type="Generalization_StereotypeLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_2Y2mQVdiEeeUyIB-jtaMjQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_2Y1YIVdiEeeUyIB-jtaMjQ"/>

-    <element xmi:type="uml:Generalization" href="StereotypePropertyReferenceEdgeTest.profile.uml#_2YUawFdiEeeUyIB-jtaMjQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2Y1YIldiEeeUyIB-jtaMjQ" points="[620, 399, -643984, -643984]$[620, 300, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2Z7kUFdiEeeUyIB-jtaMjQ" id="(0.48214285714285715,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2Z8LYFdiEeeUyIB-jtaMjQ" id="(0.4,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_7ThJcFdiEeeUyIB-jtaMjQ" type="StereotypeCommentLink" source="_7SWEwFdiEeeUyIB-jtaMjQ" target="_7Tf7UFdiEeeUyIB-jtaMjQ">

-    <styles xmi:type="notation:FontStyle" xmi:id="_7ThJcVdiEeeUyIB-jtaMjQ"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7ThwgldiEeeUyIB-jtaMjQ" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ThJcldiEeeUyIB-jtaMjQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ThwgFdiEeeUyIB-jtaMjQ"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ThwgVdiEeeUyIB-jtaMjQ"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_9ABulFdiEeeUyIB-jtaMjQ" type="StereotypeCommentLink" source="_8-zmkFdiEeeUyIB-jtaMjQ" target="_9ABukFdiEeeUyIB-jtaMjQ">

-    <styles xmi:type="notation:FontStyle" xmi:id="_9ABulVdiEeeUyIB-jtaMjQ"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9ACVoldiEeeUyIB-jtaMjQ" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9ABulldiEeeUyIB-jtaMjQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9ACVoFdiEeeUyIB-jtaMjQ"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9ACVoVdiEeeUyIB-jtaMjQ"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_-i8S1FdiEeeUyIB-jtaMjQ" type="StereotypeCommentLink" source="_-hm2EFdiEeeUyIB-jtaMjQ" target="_-i8S0FdiEeeUyIB-jtaMjQ">

-    <styles xmi:type="notation:FontStyle" xmi:id="_-i8S1VdiEeeUyIB-jtaMjQ"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-i854ldiEeeUyIB-jtaMjQ" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-i8S1ldiEeeUyIB-jtaMjQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-i854FdiEeeUyIB-jtaMjQ"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-i854VdiEeeUyIB-jtaMjQ"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="__yhrYFdiEeeUyIB-jtaMjQ" type="Extension_Edge" source="_CPWvoFdiEeeUyIB-jtaMjQ" target="_7SWEwFdiEeeUyIB-jtaMjQ">

-    <styles xmi:type="notation:FontStyle" xmi:id="__yhrYVdiEeeUyIB-jtaMjQ"/>

-    <element xmi:type="uml:Extension" href="StereotypePropertyReferenceEdgeTest.profile.uml#__xHWIFdiEeeUyIB-jtaMjQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__yhrYldiEeeUyIB-jtaMjQ" points="[260, 200, -643984, -643984]$[260, 150, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__0WQUFdiEeeUyIB-jtaMjQ" id="(0.4219409282700422,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__0W3YFdiEeeUyIB-jtaMjQ" id="(0.4,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_AMXHsFdjEeeUyIB-jtaMjQ" type="Extension_Edge" source="_U183UFdiEeeUyIB-jtaMjQ" target="_8-zmkFdiEeeUyIB-jtaMjQ">

-    <styles xmi:type="notation:FontStyle" xmi:id="_AMXHsVdjEeeUyIB-jtaMjQ"/>

-    <element xmi:type="uml:Extension" href="StereotypePropertyReferenceEdgeTest.profile.uml#_ALTXwFdjEeeUyIB-jtaMjQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AMXHsldjEeeUyIB-jtaMjQ" points="[620, 200, -643984, -643984]$[620, 150, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AOVdoFdjEeeUyIB-jtaMjQ" id="(0.4,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AOVdoVdjEeeUyIB-jtaMjQ" id="(0.4,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" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_6zTNwFdhEeeUyIB-jtaMjQ" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_CPWvoFdiEeeUyIB-jtaMjQ" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_CPX9wFdiEeeUyIB-jtaMjQ" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_CPX9wVdiEeeUyIB-jtaMjQ" type="Stereotype_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_EC7mEFdiEeeUyIB-jtaMjQ" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="StereotypePropertyReferenceEdgeTest.profile.uml#_ECmO4FdiEeeUyIB-jtaMjQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EC7mEVdiEeeUyIB-jtaMjQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_XbogIFdiEeeUyIB-jtaMjQ" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="StereotypePropertyReferenceEdgeTest.profile.uml#_IHluUFdiEeeUyIB-jtaMjQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XbogIVdiEeeUyIB-jtaMjQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Xb_FcFdiEeeUyIB-jtaMjQ" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="StereotypePropertyReferenceEdgeTest.profile.uml#_IZrj4FdiEeeUyIB-jtaMjQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xb_FcVdiEeeUyIB-jtaMjQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_XcWR0FdiEeeUyIB-jtaMjQ" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="StereotypePropertyReferenceEdgeTest.profile.uml#_IgWMkFdiEeeUyIB-jtaMjQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XcWR0VdiEeeUyIB-jtaMjQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_CPX9wldiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_CPX9w1diEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_CPX9xFdiEeeUyIB-jtaMjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CPX9xVdiEeeUyIB-jtaMjQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_CPYk0FdiEeeUyIB-jtaMjQ" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_CPYk0VdiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_CPYk0ldiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_CPYk01diEeeUyIB-jtaMjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CPYk1FdiEeeUyIB-jtaMjQ"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="StereotypePropertyReferenceEdgeTest.profile.uml#_CPDNoFdiEeeUyIB-jtaMjQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CPWvoVdiEeeUyIB-jtaMjQ" x="160" y="200"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_U183UFdiEeeUyIB-jtaMjQ" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_U2AhsFdiEeeUyIB-jtaMjQ" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_U2AhsVdiEeeUyIB-jtaMjQ" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_U2AhsldiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_U2Ahs1diEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_U2AhtFdiEeeUyIB-jtaMjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U2AhtVdiEeeUyIB-jtaMjQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_U2BIwFdiEeeUyIB-jtaMjQ" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_U2BIwVdiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_U2BIwldiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_U2BIw1diEeeUyIB-jtaMjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U2BIxFdiEeeUyIB-jtaMjQ"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="StereotypePropertyReferenceEdgeTest.profile.uml#_U16bEFdiEeeUyIB-jtaMjQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U183UVdiEeeUyIB-jtaMjQ" x="580" y="200"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_v5QFkFdiEeeUyIB-jtaMjQ" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_v5RTsFdiEeeUyIB-jtaMjQ" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_v5RTsVdiEeeUyIB-jtaMjQ" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_v5RTsldiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_v5RTs1diEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_v5RTtFdiEeeUyIB-jtaMjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v5RTtVdiEeeUyIB-jtaMjQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_v5R6wFdiEeeUyIB-jtaMjQ" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_v5R6wVdiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_v5R6wldiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_v5R6w1diEeeUyIB-jtaMjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v5R6xFdiEeeUyIB-jtaMjQ"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="StereotypePropertyReferenceEdgeTest.profile.uml#_v5HisFdiEeeUyIB-jtaMjQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v5QFkVdiEeeUyIB-jtaMjQ" x="220" y="400"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_y1YfgFdiEeeUyIB-jtaMjQ" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_y1ZtoFdiEeeUyIB-jtaMjQ" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_y1ZtoVdiEeeUyIB-jtaMjQ" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_y1ZtoldiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_y1Zto1diEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_y1ZtpFdiEeeUyIB-jtaMjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y1ZtpVdiEeeUyIB-jtaMjQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_y1aUsFdiEeeUyIB-jtaMjQ" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_y1aUsVdiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_y1aUsldiEeeUyIB-jtaMjQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_y1aUs1diEeeUyIB-jtaMjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y1aUtFdiEeeUyIB-jtaMjQ"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="StereotypePropertyReferenceEdgeTest.profile.uml#_y1UOEFdiEeeUyIB-jtaMjQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y1YfgVdiEeeUyIB-jtaMjQ" x="566" y="399"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_7SWEwFdiEeeUyIB-jtaMjQ" type="Class_MetaclassShape">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7SYhAFdiEeeUyIB-jtaMjQ" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIEFdiEeeUyIB-jtaMjQ" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIEVdiEeeUyIB-jtaMjQ" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIEldiEeeUyIB-jtaMjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIE1diEeeUyIB-jtaMjQ" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7SZIFFdiEeeUyIB-jtaMjQ" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7SXS4FdiEeeUyIB-jtaMjQ" type="Class_MetaclassNameLabel"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SXS4VdiEeeUyIB-jtaMjQ" x="220" y="100"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_7Tf7UFdiEeeUyIB-jtaMjQ" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_7Tf7UVdiEeeUyIB-jtaMjQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7TgiYFdiEeeUyIB-jtaMjQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Tf7UldiEeeUyIB-jtaMjQ" x="420" y="100"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_8-zmkFdiEeeUyIB-jtaMjQ" type="Class_MetaclassShape">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8-00sFdiEeeUyIB-jtaMjQ" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-00sVdiEeeUyIB-jtaMjQ" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-1bwFdiEeeUyIB-jtaMjQ" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-1bwVdiEeeUyIB-jtaMjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-1bwldiEeeUyIB-jtaMjQ" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8-1bw1diEeeUyIB-jtaMjQ" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8-0NoFdiEeeUyIB-jtaMjQ" type="Class_MetaclassNameLabel"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8-0NoVdiEeeUyIB-jtaMjQ" x="580" y="100"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_9ABukFdiEeeUyIB-jtaMjQ" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_9ABukVdiEeeUyIB-jtaMjQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9ABuk1diEeeUyIB-jtaMjQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ABukldiEeeUyIB-jtaMjQ" x="780" y="100"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_-hm2EFdiEeeUyIB-jtaMjQ" type="Class_MetaclassShape">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-h-CcldiEeeUyIB-jtaMjQ" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-pgFdiEeeUyIB-jtaMjQ" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-pgVdiEeeUyIB-jtaMjQ" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-pgldiEeeUyIB-jtaMjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-pg1diEeeUyIB-jtaMjQ" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-h-phFdiEeeUyIB-jtaMjQ" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_-h-CcFdiEeeUyIB-jtaMjQ" type="Class_MetaclassNameLabel"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-h-CcVdiEeeUyIB-jtaMjQ" x="780" y="240"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_-i8S0FdiEeeUyIB-jtaMjQ" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_-i8S0VdiEeeUyIB-jtaMjQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-i8S01diEeeUyIB-jtaMjQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-i8S0ldiEeeUyIB-jtaMjQ" x="1020" y="240"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_6zTNwVdhEeeUyIB-jtaMjQ" name="diagram_compatibility_version" stringValue="1.3.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_6zTNwldhEeeUyIB-jtaMjQ"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_6zTNw1dhEeeUyIB-jtaMjQ" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">
+    <owner xmi:type="uml:Profile" href="StereotypePropertyReferenceEdgeTest.profile.uml#_6trG4FdhEeeUyIB-jtaMjQ"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="StereotypePropertyReferenceEdgeTest.profile.uml#_6trG4FdhEeeUyIB-jtaMjQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_1w5OYFdiEeeUyIB-jtaMjQ" type="Generalization_Edge" source="_v5QFkFdiEeeUyIB-jtaMjQ" target="_CPWvoFdiEeeUyIB-jtaMjQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_1w6cgFdiEeeUyIB-jtaMjQ" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1w6cgVdiEeeUyIB-jtaMjQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1w5OYVdiEeeUyIB-jtaMjQ"/>
+    <element xmi:type="uml:Generalization" href="StereotypePropertyReferenceEdgeTest.profile.uml#_1weXoFdiEeeUyIB-jtaMjQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1w5OYldiEeeUyIB-jtaMjQ" points="[260, 400, -643984, -643984]$[260, 351, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1yUxwFdiEeeUyIB-jtaMjQ" id="(0.34782608695652173,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1yUxwVdiEeeUyIB-jtaMjQ" id="(0.4219409282700422,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_2Y1YIFdiEeeUyIB-jtaMjQ" type="Generalization_Edge" source="_y1YfgFdiEeeUyIB-jtaMjQ" target="_U183UFdiEeeUyIB-jtaMjQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_2Y2mQFdiEeeUyIB-jtaMjQ" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_2Y2mQVdiEeeUyIB-jtaMjQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_2Y1YIVdiEeeUyIB-jtaMjQ"/>
+    <element xmi:type="uml:Generalization" href="StereotypePropertyReferenceEdgeTest.profile.uml#_2YUawFdiEeeUyIB-jtaMjQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2Y1YIldiEeeUyIB-jtaMjQ" points="[620, 399, -643984, -643984]$[620, 300, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2Z7kUFdiEeeUyIB-jtaMjQ" id="(0.48214285714285715,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2Z8LYFdiEeeUyIB-jtaMjQ" id="(0.4,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_7ThJcFdiEeeUyIB-jtaMjQ" type="StereotypeCommentLink" source="_7SWEwFdiEeeUyIB-jtaMjQ" target="_7Tf7UFdiEeeUyIB-jtaMjQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_7ThJcVdiEeeUyIB-jtaMjQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7ThwgldiEeeUyIB-jtaMjQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ThJcldiEeeUyIB-jtaMjQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ThwgFdiEeeUyIB-jtaMjQ"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ThwgVdiEeeUyIB-jtaMjQ"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_9ABulFdiEeeUyIB-jtaMjQ" type="StereotypeCommentLink" source="_8-zmkFdiEeeUyIB-jtaMjQ" target="_9ABukFdiEeeUyIB-jtaMjQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_9ABulVdiEeeUyIB-jtaMjQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9ACVoldiEeeUyIB-jtaMjQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9ABulldiEeeUyIB-jtaMjQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9ACVoFdiEeeUyIB-jtaMjQ"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9ACVoVdiEeeUyIB-jtaMjQ"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_-i8S1FdiEeeUyIB-jtaMjQ" type="StereotypeCommentLink" source="_-hm2EFdiEeeUyIB-jtaMjQ" target="_-i8S0FdiEeeUyIB-jtaMjQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_-i8S1VdiEeeUyIB-jtaMjQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-i854ldiEeeUyIB-jtaMjQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-i8S1ldiEeeUyIB-jtaMjQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-i854FdiEeeUyIB-jtaMjQ"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-i854VdiEeeUyIB-jtaMjQ"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="__yhrYFdiEeeUyIB-jtaMjQ" type="Extension_Edge" source="_CPWvoFdiEeeUyIB-jtaMjQ" target="_7SWEwFdiEeeUyIB-jtaMjQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="__yhrYVdiEeeUyIB-jtaMjQ"/>
+    <element xmi:type="uml:Extension" href="StereotypePropertyReferenceEdgeTest.profile.uml#__xHWIFdiEeeUyIB-jtaMjQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__yhrYldiEeeUyIB-jtaMjQ" points="[260, 200, -643984, -643984]$[260, 150, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__0WQUFdiEeeUyIB-jtaMjQ" id="(0.4219409282700422,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__0W3YFdiEeeUyIB-jtaMjQ" id="(0.4,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_AMXHsFdjEeeUyIB-jtaMjQ" type="Extension_Edge" source="_U183UFdiEeeUyIB-jtaMjQ" target="_8-zmkFdiEeeUyIB-jtaMjQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_AMXHsVdjEeeUyIB-jtaMjQ"/>
+    <element xmi:type="uml:Extension" href="StereotypePropertyReferenceEdgeTest.profile.uml#_ALTXwFdjEeeUyIB-jtaMjQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AMXHsldjEeeUyIB-jtaMjQ" points="[620, 200, -643984, -643984]$[620, 150, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AOVdoFdjEeeUyIB-jtaMjQ" id="(0.4,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AOVdoVdjEeeUyIB-jtaMjQ" id="(0.4,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.uml
index 17525ca1aae..10df38041d2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.profile.uml
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_6trG4FdhEeeUyIB-jtaMjQ" name="StereotypePropertyReferenceEdgeTest" metaclassReference="_7STBcFdiEeeUyIB-jtaMjQ _8-wjQFdiEeeUyIB-jtaMjQ _-hkZ0FdiEeeUyIB-jtaMjQ">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5FQkFfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_R5GesFfxEeehb73Gpbl1-Q" name="StereotypePropertyReferenceEdgeTest" nsURI="http:///schemas/StereotypePropertyReferenceEdgeTest/_R5DbYFfxEeehb73Gpbl1-Q/0" nsPrefix="StereotypePropertyReferenceEdgeTest">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5I68FfxEeehb73Gpbl1-Q" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I68VfxEeehb73Gpbl1-Q" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I68lfxEeehb73Gpbl1-Q" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I681fxEeehb73Gpbl1-Q" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I69FfxEeehb73Gpbl1-Q" key="Date" value="2017-06-23"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I69VfxEeehb73Gpbl1-Q" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5GesVfxEeehb73Gpbl1-Q" name="SourceStereotype">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5GeslfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_CPDNoFdiEeeUyIB-jtaMjQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5Ges1fxEeehb73Gpbl1-Q" name="SingleStereoRef" ordered="false" lowerBound="1" eType="_R5GevVfxEeehb73Gpbl1-Q"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5GetVfxEeehb73Gpbl1-Q" name="MultiStereoRef" ordered="false" upperBound="-1" eType="_R5GevVfxEeehb73Gpbl1-Q"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5Get1fxEeehb73Gpbl1-Q" name="SingleEClassRef" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5GeuVfxEeehb73Gpbl1-Q" name="MultiEClassRef" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5Geu1fxEeehb73Gpbl1-Q" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5GevVfxEeehb73Gpbl1-Q" name="TargetStereotype">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5GevlfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_U16bEFdiEeeUyIB-jtaMjQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5Gev1fxEeehb73Gpbl1-Q" name="base_Component" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5GewVfxEeehb73Gpbl1-Q" name="SubSourceStereotype" eSuperTypes="_R5GesVfxEeehb73Gpbl1-Q">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5GewlfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_v5HisFdiEeeUyIB-jtaMjQ"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5GexFfxEeehb73Gpbl1-Q" name="SubTargetStereotype" eSuperTypes="_R5GevVfxEeehb73Gpbl1-Q">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5GexVfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_y1UOEFdiEeeUyIB-jtaMjQ"/>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_7STBcFdiEeeUyIB-jtaMjQ" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_8-wjQFdiEeeUyIB-jtaMjQ" alias="Component">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-  </elementImport>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_-hkZ0FdiEeeUyIB-jtaMjQ" alias="DataType">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>

-  </elementImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_CPDNoFdiEeeUyIB-jtaMjQ" name="SourceStereotype">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_ECmO4FdiEeeUyIB-jtaMjQ" name="SingleStereoRef" type="_U16bEFdiEeeUyIB-jtaMjQ"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_IHluUFdiEeeUyIB-jtaMjQ" name="MultiStereoRef" type="_U16bEFdiEeeUyIB-jtaMjQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iWJF4FdiEeeUyIB-jtaMjQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iWbZwFdiEeeUyIB-jtaMjQ" value="*"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_IZrj4FdiEeeUyIB-jtaMjQ" name="SingleEClassRef">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_IgWMkFdiEeeUyIB-jtaMjQ" name="MultiEClassRef">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hUs3AFdiEeeUyIB-jtaMjQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hVrHYFdiEeeUyIB-jtaMjQ" value="*"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="__xP5AFdiEeeUyIB-jtaMjQ" name="base_Class" association="__xHWIFdiEeeUyIB-jtaMjQ">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_U16bEFdiEeeUyIB-jtaMjQ" name="TargetStereotype">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_ALT-0VdjEeeUyIB-jtaMjQ" name="base_Component" association="_ALTXwFdjEeeUyIB-jtaMjQ">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_v5HisFdiEeeUyIB-jtaMjQ" name="SubSourceStereotype">

-    <generalization xmi:type="uml:Generalization" xmi:id="_1weXoFdiEeeUyIB-jtaMjQ" general="_CPDNoFdiEeeUyIB-jtaMjQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_y1UOEFdiEeeUyIB-jtaMjQ" name="SubTargetStereotype">

-    <generalization xmi:type="uml:Generalization" xmi:id="_2YUawFdiEeeUyIB-jtaMjQ" general="_U16bEFdiEeeUyIB-jtaMjQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="__xHWIFdiEeeUyIB-jtaMjQ" name="E_SourceStereotype_Class1" memberEnd="__xPR8FdiEeeUyIB-jtaMjQ __xP5AFdiEeeUyIB-jtaMjQ">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="__xPR8FdiEeeUyIB-jtaMjQ" name="extension_SourceStereotype" type="_CPDNoFdiEeeUyIB-jtaMjQ" aggregation="composite" association="__xHWIFdiEeeUyIB-jtaMjQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_ALTXwFdjEeeUyIB-jtaMjQ" name="E_TargetStereotype_Component1" memberEnd="_ALT-0FdjEeeUyIB-jtaMjQ _ALT-0VdjEeeUyIB-jtaMjQ">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ALT-0FdjEeeUyIB-jtaMjQ" name="extension_TargetStereotype" type="_U16bEFdiEeeUyIB-jtaMjQ" aggregation="composite" association="_ALTXwFdjEeeUyIB-jtaMjQ"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_6trG4FdhEeeUyIB-jtaMjQ" name="StereotypePropertyReferenceEdgeTest" metaclassReference="_7STBcFdiEeeUyIB-jtaMjQ _8-wjQFdiEeeUyIB-jtaMjQ _-hkZ0FdiEeeUyIB-jtaMjQ">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5FQkFfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_R5GesFfxEeehb73Gpbl1-Q" name="StereotypePropertyReferenceEdgeTest" nsURI="http:///schemas/StereotypePropertyReferenceEdgeTest/_R5DbYFfxEeehb73Gpbl1-Q/0" nsPrefix="StereotypePropertyReferenceEdgeTest">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5I68FfxEeehb73Gpbl1-Q" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I68VfxEeehb73Gpbl1-Q" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I68lfxEeehb73Gpbl1-Q" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I681fxEeehb73Gpbl1-Q" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I69FfxEeehb73Gpbl1-Q" key="Date" value="2017-06-23"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5I69VfxEeehb73Gpbl1-Q" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5GesVfxEeehb73Gpbl1-Q" name="SourceStereotype">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5GeslfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_CPDNoFdiEeeUyIB-jtaMjQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5Ges1fxEeehb73Gpbl1-Q" name="SingleStereoRef" ordered="false" lowerBound="1" eType="_R5GevVfxEeehb73Gpbl1-Q"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5GetVfxEeehb73Gpbl1-Q" name="MultiStereoRef" ordered="false" upperBound="-1" eType="_R5GevVfxEeehb73Gpbl1-Q"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5Get1fxEeehb73Gpbl1-Q" name="SingleEClassRef" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5GeuVfxEeehb73Gpbl1-Q" name="MultiEClassRef" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5Geu1fxEeehb73Gpbl1-Q" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5GevVfxEeehb73Gpbl1-Q" name="TargetStereotype">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5GevlfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_U16bEFdiEeeUyIB-jtaMjQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_R5Gev1fxEeehb73Gpbl1-Q" name="base_Component" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5GewVfxEeehb73Gpbl1-Q" name="SubSourceStereotype" eSuperTypes="_R5GesVfxEeehb73Gpbl1-Q">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5GewlfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_v5HisFdiEeeUyIB-jtaMjQ"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_R5GexFfxEeehb73Gpbl1-Q" name="SubTargetStereotype" eSuperTypes="_R5GevVfxEeehb73Gpbl1-Q">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5GexVfxEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_y1UOEFdiEeeUyIB-jtaMjQ"/>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_7STBcFdiEeeUyIB-jtaMjQ" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_8-wjQFdiEeeUyIB-jtaMjQ" alias="Component">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+  </elementImport>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_-hkZ0FdiEeeUyIB-jtaMjQ" alias="DataType">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
+  </elementImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_CPDNoFdiEeeUyIB-jtaMjQ" name="SourceStereotype">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ECmO4FdiEeeUyIB-jtaMjQ" name="SingleStereoRef" type="_U16bEFdiEeeUyIB-jtaMjQ"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_IHluUFdiEeeUyIB-jtaMjQ" name="MultiStereoRef" type="_U16bEFdiEeeUyIB-jtaMjQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iWJF4FdiEeeUyIB-jtaMjQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iWbZwFdiEeeUyIB-jtaMjQ" value="*"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_IZrj4FdiEeeUyIB-jtaMjQ" name="SingleEClassRef">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_IgWMkFdiEeeUyIB-jtaMjQ" name="MultiEClassRef">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hUs3AFdiEeeUyIB-jtaMjQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hVrHYFdiEeeUyIB-jtaMjQ" value="*"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="__xP5AFdiEeeUyIB-jtaMjQ" name="base_Class" association="__xHWIFdiEeeUyIB-jtaMjQ">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_U16bEFdiEeeUyIB-jtaMjQ" name="TargetStereotype">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ALT-0VdjEeeUyIB-jtaMjQ" name="base_Component" association="_ALTXwFdjEeeUyIB-jtaMjQ">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_v5HisFdiEeeUyIB-jtaMjQ" name="SubSourceStereotype">
+    <generalization xmi:type="uml:Generalization" xmi:id="_1weXoFdiEeeUyIB-jtaMjQ" general="_CPDNoFdiEeeUyIB-jtaMjQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_y1UOEFdiEeeUyIB-jtaMjQ" name="SubTargetStereotype">
+    <generalization xmi:type="uml:Generalization" xmi:id="_2YUawFdiEeeUyIB-jtaMjQ" general="_U16bEFdiEeeUyIB-jtaMjQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="__xHWIFdiEeeUyIB-jtaMjQ" name="E_SourceStereotype_Class1" memberEnd="__xPR8FdiEeeUyIB-jtaMjQ __xP5AFdiEeeUyIB-jtaMjQ">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="__xPR8FdiEeeUyIB-jtaMjQ" name="extension_SourceStereotype" type="_CPDNoFdiEeeUyIB-jtaMjQ" aggregation="composite" association="__xHWIFdiEeeUyIB-jtaMjQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_ALTXwFdjEeeUyIB-jtaMjQ" name="E_TargetStereotype_Component1" memberEnd="_ALT-0FdjEeeUyIB-jtaMjQ _ALT-0VdjEeeUyIB-jtaMjQ">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ALT-0FdjEeeUyIB-jtaMjQ" name="extension_TargetStereotype" type="_U16bEFdiEeeUyIB-jtaMjQ" aggregation="composite" association="_ALTXwFdjEeeUyIB-jtaMjQ"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.uml
index 966cfac7dd6..0b56927ce9b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/518645/StereotypePropertyReferenceEdgeTest.uml
@@ -1,28 +1,28 @@
-<?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:StereotypePropertyReferenceEdgeTest="http:///schemas/StereotypePropertyReferenceEdgeTest/_R5DbYFfxEeehb73Gpbl1-Q/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/StereotypePropertyReferenceEdgeTest/_R5DbYFfxEeehb73Gpbl1-Q/0 StereotypePropertyReferenceEdgeTest.profile.uml#_R5GesFfxEeehb73Gpbl1-Q">

-  <uml:Model xmi:id="_I2B4cFZAEeeZNqfuXnrULQ" name="StereotypPropertyReferenceEdgeModelTest">

-    <packagedElement xmi:type="uml:Class" xmi:id="_Fs7x4FfzEeehb73Gpbl1-Q" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_GEZPoFfzEeehb73Gpbl1-Q" name="Class2"/>

-    <packagedElement xmi:type="uml:Component" xmi:id="_GsJMIFfzEeehb73Gpbl1-Q" name="Component1"/>

-    <packagedElement xmi:type="uml:Component" xmi:id="_HHY9sFfzEeehb73Gpbl1-Q" name="Component2"/>

-    <packagedElement xmi:type="uml:DataType" xmi:id="_IT_TsFfzEeehb73Gpbl1-Q" name="DataType1"/>

-    <packagedElement xmi:type="uml:DataType" xmi:id="_Iw7HUFfzEeehb73Gpbl1-Q" name="DataType2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Sk-bUFfzEeehb73Gpbl1-Q">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SlBeoFfzEeehb73Gpbl1-Q" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBeoVfzEeehb73Gpbl1-Q" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBeolfzEeehb73Gpbl1-Q" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBeo1fzEeehb73Gpbl1-Q" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBepFfzEeehb73Gpbl1-Q" key="Date" value="2017-06-23"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBepVfzEeehb73Gpbl1-Q" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SlA3kFfzEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="StereotypePropertyReferenceEdgeTest.profile.uml#_R5GesFfxEeehb73Gpbl1-Q"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="StereotypePropertyReferenceEdgeTest.profile.uml#_6trG4FdhEeeUyIB-jtaMjQ"/>

-    </profileApplication>

-  </uml:Model>

-  <StereotypePropertyReferenceEdgeTest:SubSourceStereotype xmi:id="_UL25kFfzEeehb73Gpbl1-Q" base_Class="_Fs7x4FfzEeehb73Gpbl1-Q"/>

-  <StereotypePropertyReferenceEdgeTest:SubSourceStereotype xmi:id="_VStz8FfzEeehb73Gpbl1-Q" base_Class="_GEZPoFfzEeehb73Gpbl1-Q"/>

-  <StereotypePropertyReferenceEdgeTest:SubTargetStereotype xmi:id="_X8134FfzEeehb73Gpbl1-Q" base_Component="_GsJMIFfzEeehb73Gpbl1-Q"/>

-  <StereotypePropertyReferenceEdgeTest:SubTargetStereotype xmi:id="_Z5bgYFfzEeehb73Gpbl1-Q" base_Component="_HHY9sFfzEeehb73Gpbl1-Q"/>

-</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:StereotypePropertyReferenceEdgeTest="http:///schemas/StereotypePropertyReferenceEdgeTest/_R5DbYFfxEeehb73Gpbl1-Q/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/StereotypePropertyReferenceEdgeTest/_R5DbYFfxEeehb73Gpbl1-Q/0 StereotypePropertyReferenceEdgeTest.profile.uml#_R5GesFfxEeehb73Gpbl1-Q">
+  <uml:Model xmi:id="_I2B4cFZAEeeZNqfuXnrULQ" name="StereotypPropertyReferenceEdgeModelTest">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Fs7x4FfzEeehb73Gpbl1-Q" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_GEZPoFfzEeehb73Gpbl1-Q" name="Class2"/>
+    <packagedElement xmi:type="uml:Component" xmi:id="_GsJMIFfzEeehb73Gpbl1-Q" name="Component1"/>
+    <packagedElement xmi:type="uml:Component" xmi:id="_HHY9sFfzEeehb73Gpbl1-Q" name="Component2"/>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_IT_TsFfzEeehb73Gpbl1-Q" name="DataType1"/>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_Iw7HUFfzEeehb73Gpbl1-Q" name="DataType2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Sk-bUFfzEeehb73Gpbl1-Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SlBeoFfzEeehb73Gpbl1-Q" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBeoVfzEeehb73Gpbl1-Q" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBeolfzEeehb73Gpbl1-Q" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBeo1fzEeehb73Gpbl1-Q" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBepFfzEeehb73Gpbl1-Q" key="Date" value="2017-06-23"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SlBepVfzEeehb73Gpbl1-Q" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SlA3kFfzEeehb73Gpbl1-Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="StereotypePropertyReferenceEdgeTest.profile.uml#_R5GesFfxEeehb73Gpbl1-Q"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="StereotypePropertyReferenceEdgeTest.profile.uml#_6trG4FdhEeeUyIB-jtaMjQ"/>
+    </profileApplication>
+  </uml:Model>
+  <StereotypePropertyReferenceEdgeTest:SubSourceStereotype xmi:id="_UL25kFfzEeehb73Gpbl1-Q" base_Class="_Fs7x4FfzEeehb73Gpbl1-Q"/>
+  <StereotypePropertyReferenceEdgeTest:SubSourceStereotype xmi:id="_VStz8FfzEeehb73Gpbl1-Q" base_Class="_GEZPoFfzEeehb73Gpbl1-Q"/>
+  <StereotypePropertyReferenceEdgeTest:SubTargetStereotype xmi:id="_X8134FfzEeehb73Gpbl1-Q" base_Component="_GsJMIFfzEeehb73Gpbl1-Q"/>
+  <StereotypePropertyReferenceEdgeTest:SubTargetStereotype xmi:id="_Z5bgYFfzEeehb73Gpbl1-Q" base_Component="_HHY9sFfzEeehb73Gpbl1-Q"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.notation
index d19fa74c5c7..de46f306eed 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.notation
@@ -1,220 +1,220 @@
-<?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: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" xmi:id="_EZXygBT5EeWgELX9raxvAA" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_KDjuIBT5EeWgELX9raxvAA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_KDk8QBT5EeWgELX9raxvAA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_KDk8QRT5EeWgELX9raxvAA" type="1071">

-      <children xmi:type="notation:Shape" xmi:id="_0dGGkBT5EeWgELX9raxvAA" type="3002">

-        <element xmi:type="uml:Property" href="ProfileForStereotypeDisplayTests.profile.uml#_0cuTIBT5EeWgELX9raxvAA"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0dGGkRT5EeWgELX9raxvAA"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_8Gv_kBT5EeWgELX9raxvAA" type="3002">

-        <element xmi:type="uml:Property" href="ProfileForStereotypeDisplayTests.profile.uml#_8GlAcBT5EeWgELX9raxvAA"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8Gv_kRT5EeWgELX9raxvAA"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_KDk8QhT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KDk8QxT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KDk8RBT5EeWgELX9raxvAA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KDk8RRT5EeWgELX9raxvAA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_KDk8RhT5EeWgELX9raxvAA" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_KDk8RxT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KDljUBT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KDljURT5EeWgELX9raxvAA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KDljUhT5EeWgELX9raxvAA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="ProfileForStereotypeDisplayTests.profile.uml#_KDfcsBT5EeWgELX9raxvAA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KDjuIRT5EeWgELX9raxvAA" x="512" y="308" width="163" height="98"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_Kk4SgBT5EeWgELX9raxvAA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Kk4SghT5EeWgELX9raxvAA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Kk45kBT5EeWgELX9raxvAA" type="1071">

-      <children xmi:type="notation:Shape" xmi:id="_K7yhMBT6EeWgELX9raxvAA" type="3002">

-        <element xmi:type="uml:Property" href="ProfileForStereotypeDisplayTests.profile.uml#_K7ls4BT6EeWgELX9raxvAA"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_K7yhMRT6EeWgELX9raxvAA"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Kk45kRT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Kk45khT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Kk45kxT5EeWgELX9raxvAA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kk45lBT5EeWgELX9raxvAA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Kk45lRT5EeWgELX9raxvAA" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Kk45lhT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Kk45lxT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Kk45mBT5EeWgELX9raxvAA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kk45mRT5EeWgELX9raxvAA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="ProfileForStereotypeDisplayTests.profile.uml#_Kk3EYBT5EeWgELX9raxvAA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kk4SgRT5EeWgELX9raxvAA" x="509" y="187" width="164" height="97"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_LDEqYBT5EeWgELX9raxvAA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_LDFRcBT5EeWgELX9raxvAA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_LDFRcRT5EeWgELX9raxvAA" type="1071">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_LDFRchT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_LDFRcxT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_LDFRdBT5EeWgELX9raxvAA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDFRdRT5EeWgELX9raxvAA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_LDFRdhT5EeWgELX9raxvAA" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_LDFRdxT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_LDFReBT5EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_LDFReRT5EeWgELX9raxvAA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDFRehT5EeWgELX9raxvAA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="ProfileForStereotypeDisplayTests.profile.uml#_LDEDUBT5EeWgELX9raxvAA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDEqYRT5EeWgELX9raxvAA" x="507" y="72" width="165" height="98"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_UMIgoBT5EeWgELX9raxvAA" type="1031">

-    <children xmi:type="notation:DecorationNode" xmi:id="_UMJHsBT5EeWgELX9raxvAA" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMJHsRT5EeWgELX9raxvAA" x="54" y="82"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_UMK84BT5EeWgELX9raxvAA" type="1031">

-    <children xmi:type="notation:DecorationNode" xmi:id="_UMK84hT5EeWgELX9raxvAA" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMK84xT5EeWgELX9raxvAA" x="54" y="162"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_UMLj8xT5EeWgELX9raxvAA" type="1031">

-    <children xmi:type="notation:DecorationNode" xmi:id="_UMLj9RT5EeWgELX9raxvAA" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMLj9hT5EeWgELX9raxvAA" x="54" y="242"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_UMMLAxT5EeWgELX9raxvAA" type="1031">

-    <children xmi:type="notation:DecorationNode" xmi:id="_UMMLBRT5EeWgELX9raxvAA" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMMLBhT5EeWgELX9raxvAA" x="54" y="322"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_UOq3QBT5EeWgELX9raxvAA" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_UOq3QRT5EeWgELX9raxvAA" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UOreUBT5EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UOq3QhT5EeWgELX9raxvAA" x="383" y="63"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_UPn5gBT5EeWgELX9raxvAA" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_UPn5gRT5EeWgELX9raxvAA" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UPn5gxT5EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UPn5ghT5EeWgELX9raxvAA" x="383" y="143"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_UQJd8BT5EeWgELX9raxvAA" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_UQJd8RT5EeWgELX9raxvAA" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQJd8xT5EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UQJd8hT5EeWgELX9raxvAA" x="383" y="223"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_UQvT0xT5EeWgELX9raxvAA" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_UQvT1BT5EeWgELX9raxvAA" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQvT1hT5EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UQvT1RT5EeWgELX9raxvAA" x="383" y="303"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_EZXygRT5EeWgELX9raxvAA" name="diagram_compatibility_version" stringValue="1.1.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_EZXyghT5EeWgELX9raxvAA"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_EZXygxT5EeWgELX9raxvAA">

-    <owner xmi:type="uml:Profile" href="ProfileForStereotypeDisplayTests.profile.uml#_EU0CoBT5EeWgELX9raxvAA"/>

-  </styles>

-  <element xmi:type="uml:Profile" href="ProfileForStereotypeDisplayTests.profile.uml#_EU0CoBT5EeWgELX9raxvAA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_UOsFYBT5EeWgELX9raxvAA" type="StereotypeCommentLink" source="_UMIgoBT5EeWgELX9raxvAA" target="_UOq3QBT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_UOsFYRT5EeWgELX9raxvAA"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UOsschT5EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UOsFYhT5EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UOsscBT5EeWgELX9raxvAA"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UOsscRT5EeWgELX9raxvAA"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_UPn5hBT5EeWgELX9raxvAA" type="StereotypeCommentLink" source="_UMK84BT5EeWgELX9raxvAA" target="_UPn5gBT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_UPn5hRT5EeWgELX9raxvAA"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UPn5iRT5EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UPn5hhT5EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UPn5hxT5EeWgELX9raxvAA"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UPn5iBT5EeWgELX9raxvAA"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_UQJd9BT5EeWgELX9raxvAA" type="StereotypeCommentLink" source="_UMLj8xT5EeWgELX9raxvAA" target="_UQJd8BT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_UQJd9RT5EeWgELX9raxvAA"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQJd-RT5EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UQJd9hT5EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQJd9xT5EeWgELX9raxvAA"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQJd-BT5EeWgELX9raxvAA"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_UQvT1xT5EeWgELX9raxvAA" type="StereotypeCommentLink" source="_UMMLAxT5EeWgELX9raxvAA" target="_UQvT0xT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_UQvT2BT5EeWgELX9raxvAA"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQvT3BT5EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UQvT2RT5EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQvT2hT5EeWgELX9raxvAA"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQvT2xT5EeWgELX9raxvAA"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_erVDYBT5EeWgELX9raxvAA" type="1013" source="_KDjuIBT5EeWgELX9raxvAA" target="_UMMLAxT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_erVDYRT5EeWgELX9raxvAA"/>

-    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_epaX0BT5EeWgELX9raxvAA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_erVDYhT5EeWgELX9raxvAA" points="[-18, 0, 408, -18]$[-476, 19, -50, 1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_etY44BT5EeWgELX9raxvAA" id="(0.0,0.21428571428571427)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_etY44RT5EeWgELX9raxvAA" id="(1.0,0.46)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_l-Am0BT5EeWgELX9raxvAA" type="1013" source="_Kk4SgBT5EeWgELX9raxvAA" target="_UMIgoBT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_l-Am0RT5EeWgELX9raxvAA"/>

-    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_l9zygBT5EeWgELX9raxvAA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l-Am0hT5EeWgELX9raxvAA" points="[-17, -6, 405, 128]$[-372, -128, 50, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l-l1oBT5EeWgELX9raxvAA" id="(0.0,0.4948453608247423)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l-l1oRT5EeWgELX9raxvAA" id="(1.0,0.8)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_neXmUBT5EeWgELX9raxvAA" type="1013" source="_KDjuIBT5EeWgELX9raxvAA" target="_UMIgoBT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_neXmURT5EeWgELX9raxvAA"/>

-    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_nd-kwBT5EeWgELX9raxvAA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_neXmUhT5EeWgELX9raxvAA" points="[-24, -13, 408, 210]$[-382, -215, 50, 8]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ne-qUBT5EeWgELX9raxvAA" id="(0.0,0.09183673469387756)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ne-qURT5EeWgELX9raxvAA" id="(1.0,0.96)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_oucuIBT5EeWgELX9raxvAA" type="1013" source="_Kk4SgBT5EeWgELX9raxvAA" target="_UMLj8xT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_oucuIRT5EeWgELX9raxvAA"/>

-    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_ouLBUBT5EeWgELX9raxvAA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oucuIhT5EeWgELX9raxvAA" points="[-18, 2, 379, -60]$[-373, 66, 24, 4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ovIDkBT5EeWgELX9raxvAA" id="(0.0,0.25773195876288657)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ovIDkRT5EeWgELX9raxvAA" id="(1.0,0.52)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_qWpbABT5EeWgELX9raxvAA" type="1013" source="_LDEqYBT5EeWgELX9raxvAA" target="_UMK84BT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_qWpbART5EeWgELX9raxvAA"/>

-    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_qWcmsBT5EeWgELX9raxvAA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qWpbAhT5EeWgELX9raxvAA" points="[-22, 5, 364, -98]$[-375, 104, 11, 1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qXOp0BT5EeWgELX9raxvAA" id="(0.0,0.23469387755102042)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qXPQ4BT5EeWgELX9raxvAA" id="(1.0,0.56)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_rUotQBT5EeWgELX9raxvAA" type="1013" source="_KDjuIBT5EeWgELX9raxvAA" target="_UMLj8xT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_rUotQRT5EeWgELX9raxvAA"/>

-    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_rURg4BT5EeWgELX9raxvAA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rUotQhT5EeWgELX9raxvAA" points="[-27, -4, 380, 42]$[-385, -35, 22, 11]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rVYUIBT5EeWgELX9raxvAA" id="(0.0,0.15306122448979592)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rVYUIRT5EeWgELX9raxvAA" id="(1.0,0.82)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_r9GbcBT5EeWgELX9raxvAA" type="1013" source="_LDEqYBT5EeWgELX9raxvAA" target="_UMIgoBT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_r9GbcRT5EeWgELX9raxvAA"/>

-    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_r85AEBT5EeWgELX9raxvAA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r9GbchT5EeWgELX9raxvAA" points="[-35, 1, 371, -19]$[-388, 21, 18, 1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r9nY0BT5EeWgELX9raxvAA" id="(0.0,0.1836734693877551)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r9nY0RT5EeWgELX9raxvAA" id="(1.0,0.52)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_uEZfIBT5EeWgELX9raxvAA" type="1013" source="_Kk4SgBT5EeWgELX9raxvAA" target="_UMMLAxT5EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_uEZfIRT5EeWgELX9raxvAA"/>

-    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_uEMq0BT5EeWgELX9raxvAA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uEZfIhT5EeWgELX9raxvAA" points="[-18, 6, 405, -133]$[-373, 137, 50, -2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uFBKMBT5EeWgELX9raxvAA" id="(0.0,0.27835051546391754)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uFBxQBT5EeWgELX9raxvAA" id="(1.0,0.24)"/>

-  </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: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" xmi:id="_EZXygBT5EeWgELX9raxvAA" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_KDjuIBT5EeWgELX9raxvAA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_KDk8QBT5EeWgELX9raxvAA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_KDk8QRT5EeWgELX9raxvAA" type="1071">
+      <children xmi:type="notation:Shape" xmi:id="_0dGGkBT5EeWgELX9raxvAA" type="3002">
+        <element xmi:type="uml:Property" href="ProfileForStereotypeDisplayTests.profile.uml#_0cuTIBT5EeWgELX9raxvAA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0dGGkRT5EeWgELX9raxvAA"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_8Gv_kBT5EeWgELX9raxvAA" type="3002">
+        <element xmi:type="uml:Property" href="ProfileForStereotypeDisplayTests.profile.uml#_8GlAcBT5EeWgELX9raxvAA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8Gv_kRT5EeWgELX9raxvAA"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_KDk8QhT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_KDk8QxT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KDk8RBT5EeWgELX9raxvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KDk8RRT5EeWgELX9raxvAA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_KDk8RhT5EeWgELX9raxvAA" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_KDk8RxT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_KDljUBT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KDljURT5EeWgELX9raxvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KDljUhT5EeWgELX9raxvAA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="ProfileForStereotypeDisplayTests.profile.uml#_KDfcsBT5EeWgELX9raxvAA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KDjuIRT5EeWgELX9raxvAA" x="512" y="308" width="163" height="98"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Kk4SgBT5EeWgELX9raxvAA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Kk4SghT5EeWgELX9raxvAA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Kk45kBT5EeWgELX9raxvAA" type="1071">
+      <children xmi:type="notation:Shape" xmi:id="_K7yhMBT6EeWgELX9raxvAA" type="3002">
+        <element xmi:type="uml:Property" href="ProfileForStereotypeDisplayTests.profile.uml#_K7ls4BT6EeWgELX9raxvAA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_K7yhMRT6EeWgELX9raxvAA"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Kk45kRT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Kk45khT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Kk45kxT5EeWgELX9raxvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kk45lBT5EeWgELX9raxvAA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Kk45lRT5EeWgELX9raxvAA" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Kk45lhT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Kk45lxT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Kk45mBT5EeWgELX9raxvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kk45mRT5EeWgELX9raxvAA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="ProfileForStereotypeDisplayTests.profile.uml#_Kk3EYBT5EeWgELX9raxvAA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kk4SgRT5EeWgELX9raxvAA" x="509" y="187" width="164" height="97"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_LDEqYBT5EeWgELX9raxvAA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_LDFRcBT5EeWgELX9raxvAA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_LDFRcRT5EeWgELX9raxvAA" type="1071">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LDFRchT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_LDFRcxT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_LDFRdBT5EeWgELX9raxvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDFRdRT5EeWgELX9raxvAA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_LDFRdhT5EeWgELX9raxvAA" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_LDFRdxT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_LDFReBT5EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_LDFReRT5EeWgELX9raxvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDFRehT5EeWgELX9raxvAA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="ProfileForStereotypeDisplayTests.profile.uml#_LDEDUBT5EeWgELX9raxvAA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LDEqYRT5EeWgELX9raxvAA" x="507" y="72" width="165" height="98"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UMIgoBT5EeWgELX9raxvAA" type="1031">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UMJHsBT5EeWgELX9raxvAA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMJHsRT5EeWgELX9raxvAA" x="54" y="82"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UMK84BT5EeWgELX9raxvAA" type="1031">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UMK84hT5EeWgELX9raxvAA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMK84xT5EeWgELX9raxvAA" x="54" y="162"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UMLj8xT5EeWgELX9raxvAA" type="1031">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UMLj9RT5EeWgELX9raxvAA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMLj9hT5EeWgELX9raxvAA" x="54" y="242"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UMMLAxT5EeWgELX9raxvAA" type="1031">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UMMLBRT5EeWgELX9raxvAA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UMMLBhT5EeWgELX9raxvAA" x="54" y="322"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UOq3QBT5EeWgELX9raxvAA" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_UOq3QRT5EeWgELX9raxvAA" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UOreUBT5EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UOq3QhT5EeWgELX9raxvAA" x="383" y="63"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UPn5gBT5EeWgELX9raxvAA" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_UPn5gRT5EeWgELX9raxvAA" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UPn5gxT5EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UPn5ghT5EeWgELX9raxvAA" x="383" y="143"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UQJd8BT5EeWgELX9raxvAA" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_UQJd8RT5EeWgELX9raxvAA" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQJd8xT5EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UQJd8hT5EeWgELX9raxvAA" x="383" y="223"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UQvT0xT5EeWgELX9raxvAA" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_UQvT1BT5EeWgELX9raxvAA" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQvT1hT5EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UQvT1RT5EeWgELX9raxvAA" x="383" y="303"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_EZXygRT5EeWgELX9raxvAA" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_EZXyghT5EeWgELX9raxvAA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_EZXygxT5EeWgELX9raxvAA">
+    <owner xmi:type="uml:Profile" href="ProfileForStereotypeDisplayTests.profile.uml#_EU0CoBT5EeWgELX9raxvAA"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="ProfileForStereotypeDisplayTests.profile.uml#_EU0CoBT5EeWgELX9raxvAA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_UOsFYBT5EeWgELX9raxvAA" type="StereotypeCommentLink" source="_UMIgoBT5EeWgELX9raxvAA" target="_UOq3QBT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_UOsFYRT5EeWgELX9raxvAA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UOsschT5EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UOsFYhT5EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UOsscBT5EeWgELX9raxvAA"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UOsscRT5EeWgELX9raxvAA"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_UPn5hBT5EeWgELX9raxvAA" type="StereotypeCommentLink" source="_UMK84BT5EeWgELX9raxvAA" target="_UPn5gBT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_UPn5hRT5EeWgELX9raxvAA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UPn5iRT5EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UPn5hhT5EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UPn5hxT5EeWgELX9raxvAA"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UPn5iBT5EeWgELX9raxvAA"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_UQJd9BT5EeWgELX9raxvAA" type="StereotypeCommentLink" source="_UMLj8xT5EeWgELX9raxvAA" target="_UQJd8BT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_UQJd9RT5EeWgELX9raxvAA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQJd-RT5EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UQJd9hT5EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQJd9xT5EeWgELX9raxvAA"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQJd-BT5EeWgELX9raxvAA"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_UQvT1xT5EeWgELX9raxvAA" type="StereotypeCommentLink" source="_UMMLAxT5EeWgELX9raxvAA" target="_UQvT0xT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_UQvT2BT5EeWgELX9raxvAA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UQvT3BT5EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UQvT2RT5EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQvT2hT5EeWgELX9raxvAA"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQvT2xT5EeWgELX9raxvAA"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_erVDYBT5EeWgELX9raxvAA" type="1013" source="_KDjuIBT5EeWgELX9raxvAA" target="_UMMLAxT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_erVDYRT5EeWgELX9raxvAA"/>
+    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_epaX0BT5EeWgELX9raxvAA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_erVDYhT5EeWgELX9raxvAA" points="[-18, 0, 408, -18]$[-476, 19, -50, 1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_etY44BT5EeWgELX9raxvAA" id="(0.0,0.21428571428571427)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_etY44RT5EeWgELX9raxvAA" id="(1.0,0.46)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_l-Am0BT5EeWgELX9raxvAA" type="1013" source="_Kk4SgBT5EeWgELX9raxvAA" target="_UMIgoBT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_l-Am0RT5EeWgELX9raxvAA"/>
+    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_l9zygBT5EeWgELX9raxvAA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l-Am0hT5EeWgELX9raxvAA" points="[-17, -6, 405, 128]$[-372, -128, 50, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l-l1oBT5EeWgELX9raxvAA" id="(0.0,0.4948453608247423)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l-l1oRT5EeWgELX9raxvAA" id="(1.0,0.8)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_neXmUBT5EeWgELX9raxvAA" type="1013" source="_KDjuIBT5EeWgELX9raxvAA" target="_UMIgoBT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_neXmURT5EeWgELX9raxvAA"/>
+    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_nd-kwBT5EeWgELX9raxvAA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_neXmUhT5EeWgELX9raxvAA" points="[-24, -13, 408, 210]$[-382, -215, 50, 8]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ne-qUBT5EeWgELX9raxvAA" id="(0.0,0.09183673469387756)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ne-qURT5EeWgELX9raxvAA" id="(1.0,0.96)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_oucuIBT5EeWgELX9raxvAA" type="1013" source="_Kk4SgBT5EeWgELX9raxvAA" target="_UMLj8xT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_oucuIRT5EeWgELX9raxvAA"/>
+    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_ouLBUBT5EeWgELX9raxvAA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oucuIhT5EeWgELX9raxvAA" points="[-18, 2, 379, -60]$[-373, 66, 24, 4]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ovIDkBT5EeWgELX9raxvAA" id="(0.0,0.25773195876288657)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ovIDkRT5EeWgELX9raxvAA" id="(1.0,0.52)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_qWpbABT5EeWgELX9raxvAA" type="1013" source="_LDEqYBT5EeWgELX9raxvAA" target="_UMK84BT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_qWpbART5EeWgELX9raxvAA"/>
+    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_qWcmsBT5EeWgELX9raxvAA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qWpbAhT5EeWgELX9raxvAA" points="[-22, 5, 364, -98]$[-375, 104, 11, 1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qXOp0BT5EeWgELX9raxvAA" id="(0.0,0.23469387755102042)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qXPQ4BT5EeWgELX9raxvAA" id="(1.0,0.56)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_rUotQBT5EeWgELX9raxvAA" type="1013" source="_KDjuIBT5EeWgELX9raxvAA" target="_UMLj8xT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_rUotQRT5EeWgELX9raxvAA"/>
+    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_rURg4BT5EeWgELX9raxvAA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rUotQhT5EeWgELX9raxvAA" points="[-27, -4, 380, 42]$[-385, -35, 22, 11]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rVYUIBT5EeWgELX9raxvAA" id="(0.0,0.15306122448979592)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rVYUIRT5EeWgELX9raxvAA" id="(1.0,0.82)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_r9GbcBT5EeWgELX9raxvAA" type="1013" source="_LDEqYBT5EeWgELX9raxvAA" target="_UMIgoBT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_r9GbcRT5EeWgELX9raxvAA"/>
+    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_r85AEBT5EeWgELX9raxvAA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r9GbchT5EeWgELX9raxvAA" points="[-35, 1, 371, -19]$[-388, 21, 18, 1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r9nY0BT5EeWgELX9raxvAA" id="(0.0,0.1836734693877551)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r9nY0RT5EeWgELX9raxvAA" id="(1.0,0.52)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_uEZfIBT5EeWgELX9raxvAA" type="1013" source="_Kk4SgBT5EeWgELX9raxvAA" target="_UMMLAxT5EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_uEZfIRT5EeWgELX9raxvAA"/>
+    <element xmi:type="uml:Extension" href="ProfileForStereotypeDisplayTests.profile.uml#_uEMq0BT5EeWgELX9raxvAA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uEZfIhT5EeWgELX9raxvAA" points="[-18, 6, 405, -133]$[-373, 137, 50, -2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uFBKMBT5EeWgELX9raxvAA" id="(0.0,0.27835051546391754)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uFBxQBT5EeWgELX9raxvAA" id="(1.0,0.24)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.uml
index a1346c83333..84f84df6fa7 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/ProfileForStereotypeDisplayTests.profile.uml
@@ -1,188 +1,188 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_EU0CoBT5EeWgELX9raxvAA" name="NominalTestProfile" metaclassReference="_UMFdUBT5EeWgELX9raxvAA _UMGEYBT5EeWgELX9raxvAA _UMGrcBT5EeWgELX9raxvAA _UMGrcRT5EeWgELX9raxvAA">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QhygYBT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_Fh_VgBT7EeWgELX9raxvAA" name="NominalTestProfile" nsURI="http:///schemas/NominalTestProfile/_Fh-HYBT7EeWgELX9raxvAA/1" nsPrefix="NominalTestProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FiBKuBT7EeWgELX9raxvAA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKuRT7EeWgELX9raxvAA" key="Version" value="0.0.2"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKuhT7EeWgELX9raxvAA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKuxT7EeWgELX9raxvAA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKvBT7EeWgELX9raxvAA" key="Date" value="2015-06-17"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKvRT7EeWgELX9raxvAA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Fh_VgRT7EeWgELX9raxvAA" name="stereoA">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Fh_VghT7EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KDfcsBT5EeWgELX9raxvAA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VgxT7EeWgELX9raxvAA" name="base_Package" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VhRT7EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VhxT7EeWgELX9raxvAA" name="base_Operation" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Fh_ViRT7EeWgELX9raxvAA" name="propertyA1" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Fh_VixT7EeWgELX9raxvAA" name="propertyA2" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Fh_VjRT7EeWgELX9raxvAA" name="stereoB">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Fh_VjhT7EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Kk3EYBT5EeWgELX9raxvAA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VjxT7EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VkRT7EeWgELX9raxvAA" name="base_Operation" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VkxT7EeWgELX9raxvAA" name="base_Package" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Fh_VlRT7EeWgELX9raxvAA" name="propertyB1" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Fh_VlxT7EeWgELX9raxvAA" name="stereoC">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Fh_VmBT7EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_LDEDUBT5EeWgELX9raxvAA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VmRT7EeWgELX9raxvAA" name="base_Property" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VmxT7EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_QhygYRT6EeWgELX9raxvAA" name="NominalTestProfile" nsURI="http:///schemas/NominalTestProfile/_QhwrMBT6EeWgELX9raxvAA/0" nsPrefix="NominalTestProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QiqqIBT6EeWgELX9raxvAA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqIRT6EeWgELX9raxvAA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqIhT6EeWgELX9raxvAA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqIxT6EeWgELX9raxvAA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqJBT6EeWgELX9raxvAA" key="Date" value="2015-06-17"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqJRT6EeWgELX9raxvAA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_QhygYhT6EeWgELX9raxvAA" name="stereoA">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QhygYxT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KDfcsBT5EeWgELX9raxvAA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygZBT6EeWgELX9raxvAA" name="base_Package" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygZhT6EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygaBT6EeWgELX9raxvAA" name="base_Operation" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_QhygahT6EeWgELX9raxvAA" name="propertyA1" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_QhygbBT6EeWgELX9raxvAA" name="propertyA2" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_QhygbhT6EeWgELX9raxvAA" name="stereoB">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QhygbxT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Kk3EYBT5EeWgELX9raxvAA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygcBT6EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygchT6EeWgELX9raxvAA" name="base_Operation" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygdBT6EeWgELX9raxvAA" name="base_Package" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_QhygdhT6EeWgELX9raxvAA" name="propertyB1" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_QhygeBT6EeWgELX9raxvAA" name="stereoC">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QhygeRT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_LDEDUBT5EeWgELX9raxvAA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygehT6EeWgELX9raxvAA" name="base_Property" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygfBT6EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_UMFdUBT5EeWgELX9raxvAA" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_UMGEYBT5EeWgELX9raxvAA" alias="Property">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-  </elementImport>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_UMGrcBT5EeWgELX9raxvAA" alias="Operation">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-  </elementImport>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_UMGrcRT5EeWgELX9raxvAA" alias="Package">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-  </elementImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_EgkmsBT5EeWgELX9raxvAA">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_EgkmsRT5EeWgELX9raxvAA">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_KDfcsBT5EeWgELX9raxvAA" name="stereoA">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_eqWzABT5EeWgELX9raxvAA" name="base_Package" association="_epaX0BT5EeWgELX9raxvAA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_nd_y4RT5EeWgELX9raxvAA" name="base_Class" association="_nd-kwBT5EeWgELX9raxvAA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_rUSH8RT5EeWgELX9raxvAA" name="base_Operation" association="_rURg4BT5EeWgELX9raxvAA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_0cuTIBT5EeWgELX9raxvAA" name="propertyA1">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_8GlAcBT5EeWgELX9raxvAA" name="propertyA2">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_Kk3EYBT5EeWgELX9raxvAA" name="stereoB">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_l90ZkRT5EeWgELX9raxvAA" name="base_Class" association="_l9zygBT5EeWgELX9raxvAA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_ouMPcBT5EeWgELX9raxvAA" name="base_Operation" association="_ouLBUBT5EeWgELX9raxvAA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_uENR4RT5EeWgELX9raxvAA" name="base_Package" association="_uEMq0BT5EeWgELX9raxvAA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_K7ls4BT6EeWgELX9raxvAA" name="propertyB1">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_LDEDUBT5EeWgELX9raxvAA" name="stereoC">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_qWd00BT5EeWgELX9raxvAA" name="base_Property" association="_qWcmsBT5EeWgELX9raxvAA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_r85nIRT5EeWgELX9raxvAA" name="base_Class" association="_r85AEBT5EeWgELX9raxvAA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_epaX0BT5EeWgELX9raxvAA" name="E_stereoA_Package1" memberEnd="_eqWL8BT5EeWgELX9raxvAA _eqWzABT5EeWgELX9raxvAA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_eqWL8BT5EeWgELX9raxvAA" name="extension_stereoA" type="_KDfcsBT5EeWgELX9raxvAA" aggregation="composite" association="_epaX0BT5EeWgELX9raxvAA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_l9zygBT5EeWgELX9raxvAA" name="E_stereoB_Class1" memberEnd="_l90ZkBT5EeWgELX9raxvAA _l90ZkRT5EeWgELX9raxvAA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_l90ZkBT5EeWgELX9raxvAA" name="extension_stereoB" type="_Kk3EYBT5EeWgELX9raxvAA" aggregation="composite" association="_l9zygBT5EeWgELX9raxvAA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_nd-kwBT5EeWgELX9raxvAA" name="E_stereoA_Class1" memberEnd="_nd_y4BT5EeWgELX9raxvAA _nd_y4RT5EeWgELX9raxvAA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_nd_y4BT5EeWgELX9raxvAA" name="extension_stereoA" type="_KDfcsBT5EeWgELX9raxvAA" aggregation="composite" association="_nd-kwBT5EeWgELX9raxvAA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_ouLBUBT5EeWgELX9raxvAA" name="E_stereoB_Operation1" memberEnd="_ouLoYBT5EeWgELX9raxvAA _ouMPcBT5EeWgELX9raxvAA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ouLoYBT5EeWgELX9raxvAA" name="extension_stereoB" type="_Kk3EYBT5EeWgELX9raxvAA" aggregation="composite" association="_ouLBUBT5EeWgELX9raxvAA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_qWcmsBT5EeWgELX9raxvAA" name="E_stereoC_Property1" memberEnd="_qWdNwBT5EeWgELX9raxvAA _qWd00BT5EeWgELX9raxvAA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_qWdNwBT5EeWgELX9raxvAA" name="extension_stereoC" type="_LDEDUBT5EeWgELX9raxvAA" aggregation="composite" association="_qWcmsBT5EeWgELX9raxvAA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_rURg4BT5EeWgELX9raxvAA" name="E_stereoA_Operation1" memberEnd="_rUSH8BT5EeWgELX9raxvAA _rUSH8RT5EeWgELX9raxvAA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rUSH8BT5EeWgELX9raxvAA" name="extension_stereoA" type="_KDfcsBT5EeWgELX9raxvAA" aggregation="composite" association="_rURg4BT5EeWgELX9raxvAA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_r85AEBT5EeWgELX9raxvAA" name="E_stereoC_Class1" memberEnd="_r85nIBT5EeWgELX9raxvAA _r85nIRT5EeWgELX9raxvAA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_r85nIBT5EeWgELX9raxvAA" name="extension_stereoC" type="_LDEDUBT5EeWgELX9raxvAA" aggregation="composite" association="_r85AEBT5EeWgELX9raxvAA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_uEMq0BT5EeWgELX9raxvAA" name="E_stereoB_Package1" memberEnd="_uENR4BT5EeWgELX9raxvAA _uENR4RT5EeWgELX9raxvAA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_uENR4BT5EeWgELX9raxvAA" name="extension_stereoB" type="_Kk3EYBT5EeWgELX9raxvAA" aggregation="composite" association="_uEMq0BT5EeWgELX9raxvAA"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_EU0CoBT5EeWgELX9raxvAA" name="NominalTestProfile" metaclassReference="_UMFdUBT5EeWgELX9raxvAA _UMGEYBT5EeWgELX9raxvAA _UMGrcBT5EeWgELX9raxvAA _UMGrcRT5EeWgELX9raxvAA">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QhygYBT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_Fh_VgBT7EeWgELX9raxvAA" name="NominalTestProfile" nsURI="http:///schemas/NominalTestProfile/_Fh-HYBT7EeWgELX9raxvAA/1" nsPrefix="NominalTestProfile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FiBKuBT7EeWgELX9raxvAA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKuRT7EeWgELX9raxvAA" key="Version" value="0.0.2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKuhT7EeWgELX9raxvAA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKuxT7EeWgELX9raxvAA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKvBT7EeWgELX9raxvAA" key="Date" value="2015-06-17"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FiBKvRT7EeWgELX9raxvAA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Fh_VgRT7EeWgELX9raxvAA" name="stereoA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Fh_VghT7EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KDfcsBT5EeWgELX9raxvAA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VgxT7EeWgELX9raxvAA" name="base_Package" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VhRT7EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VhxT7EeWgELX9raxvAA" name="base_Operation" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Fh_ViRT7EeWgELX9raxvAA" name="propertyA1" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Fh_VixT7EeWgELX9raxvAA" name="propertyA2" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Fh_VjRT7EeWgELX9raxvAA" name="stereoB">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Fh_VjhT7EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Kk3EYBT5EeWgELX9raxvAA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VjxT7EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VkRT7EeWgELX9raxvAA" name="base_Operation" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VkxT7EeWgELX9raxvAA" name="base_Package" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Fh_VlRT7EeWgELX9raxvAA" name="propertyB1" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_Fh_VlxT7EeWgELX9raxvAA" name="stereoC">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Fh_VmBT7EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_LDEDUBT5EeWgELX9raxvAA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VmRT7EeWgELX9raxvAA" name="base_Property" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Fh_VmxT7EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_QhygYRT6EeWgELX9raxvAA" name="NominalTestProfile" nsURI="http:///schemas/NominalTestProfile/_QhwrMBT6EeWgELX9raxvAA/0" nsPrefix="NominalTestProfile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QiqqIBT6EeWgELX9raxvAA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqIRT6EeWgELX9raxvAA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqIhT6EeWgELX9raxvAA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqIxT6EeWgELX9raxvAA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqJBT6EeWgELX9raxvAA" key="Date" value="2015-06-17"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QiqqJRT6EeWgELX9raxvAA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_QhygYhT6EeWgELX9raxvAA" name="stereoA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QhygYxT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KDfcsBT5EeWgELX9raxvAA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygZBT6EeWgELX9raxvAA" name="base_Package" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygZhT6EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygaBT6EeWgELX9raxvAA" name="base_Operation" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_QhygahT6EeWgELX9raxvAA" name="propertyA1" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_QhygbBT6EeWgELX9raxvAA" name="propertyA2" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_QhygbhT6EeWgELX9raxvAA" name="stereoB">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QhygbxT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Kk3EYBT5EeWgELX9raxvAA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygcBT6EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygchT6EeWgELX9raxvAA" name="base_Operation" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygdBT6EeWgELX9raxvAA" name="base_Package" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_QhygdhT6EeWgELX9raxvAA" name="propertyB1" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_QhygeBT6EeWgELX9raxvAA" name="stereoC">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QhygeRT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_LDEDUBT5EeWgELX9raxvAA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygehT6EeWgELX9raxvAA" name="base_Property" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_QhygfBT6EeWgELX9raxvAA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_UMFdUBT5EeWgELX9raxvAA" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_UMGEYBT5EeWgELX9raxvAA" alias="Property">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+  </elementImport>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_UMGrcBT5EeWgELX9raxvAA" alias="Operation">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
+  </elementImport>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_UMGrcRT5EeWgELX9raxvAA" alias="Package">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+  </elementImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_EgkmsBT5EeWgELX9raxvAA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_EgkmsRT5EeWgELX9raxvAA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_KDfcsBT5EeWgELX9raxvAA" name="stereoA">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_eqWzABT5EeWgELX9raxvAA" name="base_Package" association="_epaX0BT5EeWgELX9raxvAA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_nd_y4RT5EeWgELX9raxvAA" name="base_Class" association="_nd-kwBT5EeWgELX9raxvAA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_rUSH8RT5EeWgELX9raxvAA" name="base_Operation" association="_rURg4BT5EeWgELX9raxvAA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_0cuTIBT5EeWgELX9raxvAA" name="propertyA1">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_8GlAcBT5EeWgELX9raxvAA" name="propertyA2">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_Kk3EYBT5EeWgELX9raxvAA" name="stereoB">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_l90ZkRT5EeWgELX9raxvAA" name="base_Class" association="_l9zygBT5EeWgELX9raxvAA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ouMPcBT5EeWgELX9raxvAA" name="base_Operation" association="_ouLBUBT5EeWgELX9raxvAA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_uENR4RT5EeWgELX9raxvAA" name="base_Package" association="_uEMq0BT5EeWgELX9raxvAA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_K7ls4BT6EeWgELX9raxvAA" name="propertyB1">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_LDEDUBT5EeWgELX9raxvAA" name="stereoC">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_qWd00BT5EeWgELX9raxvAA" name="base_Property" association="_qWcmsBT5EeWgELX9raxvAA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_r85nIRT5EeWgELX9raxvAA" name="base_Class" association="_r85AEBT5EeWgELX9raxvAA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_epaX0BT5EeWgELX9raxvAA" name="E_stereoA_Package1" memberEnd="_eqWL8BT5EeWgELX9raxvAA _eqWzABT5EeWgELX9raxvAA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_eqWL8BT5EeWgELX9raxvAA" name="extension_stereoA" type="_KDfcsBT5EeWgELX9raxvAA" aggregation="composite" association="_epaX0BT5EeWgELX9raxvAA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_l9zygBT5EeWgELX9raxvAA" name="E_stereoB_Class1" memberEnd="_l90ZkBT5EeWgELX9raxvAA _l90ZkRT5EeWgELX9raxvAA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_l90ZkBT5EeWgELX9raxvAA" name="extension_stereoB" type="_Kk3EYBT5EeWgELX9raxvAA" aggregation="composite" association="_l9zygBT5EeWgELX9raxvAA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_nd-kwBT5EeWgELX9raxvAA" name="E_stereoA_Class1" memberEnd="_nd_y4BT5EeWgELX9raxvAA _nd_y4RT5EeWgELX9raxvAA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_nd_y4BT5EeWgELX9raxvAA" name="extension_stereoA" type="_KDfcsBT5EeWgELX9raxvAA" aggregation="composite" association="_nd-kwBT5EeWgELX9raxvAA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_ouLBUBT5EeWgELX9raxvAA" name="E_stereoB_Operation1" memberEnd="_ouLoYBT5EeWgELX9raxvAA _ouMPcBT5EeWgELX9raxvAA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ouLoYBT5EeWgELX9raxvAA" name="extension_stereoB" type="_Kk3EYBT5EeWgELX9raxvAA" aggregation="composite" association="_ouLBUBT5EeWgELX9raxvAA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_qWcmsBT5EeWgELX9raxvAA" name="E_stereoC_Property1" memberEnd="_qWdNwBT5EeWgELX9raxvAA _qWd00BT5EeWgELX9raxvAA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_qWdNwBT5EeWgELX9raxvAA" name="extension_stereoC" type="_LDEDUBT5EeWgELX9raxvAA" aggregation="composite" association="_qWcmsBT5EeWgELX9raxvAA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_rURg4BT5EeWgELX9raxvAA" name="E_stereoA_Operation1" memberEnd="_rUSH8BT5EeWgELX9raxvAA _rUSH8RT5EeWgELX9raxvAA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rUSH8BT5EeWgELX9raxvAA" name="extension_stereoA" type="_KDfcsBT5EeWgELX9raxvAA" aggregation="composite" association="_rURg4BT5EeWgELX9raxvAA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_r85AEBT5EeWgELX9raxvAA" name="E_stereoC_Class1" memberEnd="_r85nIBT5EeWgELX9raxvAA _r85nIRT5EeWgELX9raxvAA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_r85nIBT5EeWgELX9raxvAA" name="extension_stereoC" type="_LDEDUBT5EeWgELX9raxvAA" aggregation="composite" association="_r85AEBT5EeWgELX9raxvAA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_uEMq0BT5EeWgELX9raxvAA" name="E_stereoB_Package1" memberEnd="_uENR4BT5EeWgELX9raxvAA _uENR4RT5EeWgELX9raxvAA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_uENR4BT5EeWgELX9raxvAA" name="extension_stereoB" type="_Kk3EYBT5EeWgELX9raxvAA" aggregation="composite" association="_uEMq0BT5EeWgELX9raxvAA"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.notation
index f6cc088106a..ba8ee2f7ba0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.notation
@@ -1,53 +1,53 @@
-<?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: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" xmi:id="_cTnvsBT6EeWgELX9raxvAA" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_fB1pcBT6EeWgELX9raxvAA" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_fB2QgBT6EeWgELX9raxvAA" type="5029"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_fB2QgRT6EeWgELX9raxvAA" type="8510">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_fB2QghT6EeWgELX9raxvAA" y="5"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_fB23kBT6EeWgELX9raxvAA" type="7017">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_fB23kRT6EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_fB23khT6EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_fB23kxT6EeWgELX9raxvAA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fB23lBT6EeWgELX9raxvAA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_fB23lRT6EeWgELX9raxvAA" type="7018">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_fB23lhT6EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_fB23lxT6EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_fB23mBT6EeWgELX9raxvAA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fB23mRT6EeWgELX9raxvAA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_fB23mhT6EeWgELX9raxvAA" type="7019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_fB23mxT6EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_fB23nBT6EeWgELX9raxvAA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_fB23nRT6EeWgELX9raxvAA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fB23nhT6EeWgELX9raxvAA"/>

-    </children>

-    <element xmi:type="uml:Class" href="StereotypeDisplayModel.uml#_fBymIBT6EeWgELX9raxvAA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fB1pcRT6EeWgELX9raxvAA" x="258" y="78" width="346" height="252"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_kDovYBT6EeWgELX9raxvAA" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_kDovYRT6EeWgELX9raxvAA" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kDpWcBT6EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="StereotypeDisplayModel.uml#_fBymIBT6EeWgELX9raxvAA"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kDovYhT6EeWgELX9raxvAA" x="458" y="78"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_cTnvsRT6EeWgELX9raxvAA" name="diagram_compatibility_version" stringValue="1.1.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_cTnvshT6EeWgELX9raxvAA"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_cTnvsxT6EeWgELX9raxvAA">

-    <owner xmi:type="uml:Model" href="StereotypeDisplayModel.uml#_cTi3MBT6EeWgELX9raxvAA"/>

-  </styles>

-  <element xmi:type="uml:Model" href="StereotypeDisplayModel.uml#_cTi3MBT6EeWgELX9raxvAA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_kDpWcRT6EeWgELX9raxvAA" type="StereotypeCommentLink" source="_fB1pcBT6EeWgELX9raxvAA" target="_kDovYBT6EeWgELX9raxvAA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_kDpWchT6EeWgELX9raxvAA"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kDpWdhT6EeWgELX9raxvAA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="StereotypeDisplayModel.uml#_fBymIBT6EeWgELX9raxvAA"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kDpWcxT6EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kDpWdBT6EeWgELX9raxvAA"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kDpWdRT6EeWgELX9raxvAA"/>

-  </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: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" xmi:id="_cTnvsBT6EeWgELX9raxvAA" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_fB1pcBT6EeWgELX9raxvAA" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_fB2QgBT6EeWgELX9raxvAA" type="5029"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_fB2QgRT6EeWgELX9raxvAA" type="8510">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fB2QghT6EeWgELX9raxvAA" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_fB23kBT6EeWgELX9raxvAA" type="7017">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fB23kRT6EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_fB23khT6EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_fB23kxT6EeWgELX9raxvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fB23lBT6EeWgELX9raxvAA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_fB23lRT6EeWgELX9raxvAA" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fB23lhT6EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_fB23lxT6EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_fB23mBT6EeWgELX9raxvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fB23mRT6EeWgELX9raxvAA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_fB23mhT6EeWgELX9raxvAA" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fB23mxT6EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_fB23nBT6EeWgELX9raxvAA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_fB23nRT6EeWgELX9raxvAA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fB23nhT6EeWgELX9raxvAA"/>
+    </children>
+    <element xmi:type="uml:Class" href="StereotypeDisplayModel.uml#_fBymIBT6EeWgELX9raxvAA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fB1pcRT6EeWgELX9raxvAA" x="258" y="78" width="346" height="252"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_kDovYBT6EeWgELX9raxvAA" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_kDovYRT6EeWgELX9raxvAA" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kDpWcBT6EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="StereotypeDisplayModel.uml#_fBymIBT6EeWgELX9raxvAA"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kDovYhT6EeWgELX9raxvAA" x="458" y="78"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_cTnvsRT6EeWgELX9raxvAA" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_cTnvshT6EeWgELX9raxvAA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_cTnvsxT6EeWgELX9raxvAA">
+    <owner xmi:type="uml:Model" href="StereotypeDisplayModel.uml#_cTi3MBT6EeWgELX9raxvAA"/>
+  </styles>
+  <element xmi:type="uml:Model" href="StereotypeDisplayModel.uml#_cTi3MBT6EeWgELX9raxvAA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_kDpWcRT6EeWgELX9raxvAA" type="StereotypeCommentLink" source="_fB1pcBT6EeWgELX9raxvAA" target="_kDovYBT6EeWgELX9raxvAA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_kDpWchT6EeWgELX9raxvAA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kDpWdhT6EeWgELX9raxvAA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="StereotypeDisplayModel.uml#_fBymIBT6EeWgELX9raxvAA"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kDpWcxT6EeWgELX9raxvAA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kDpWdBT6EeWgELX9raxvAA"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kDpWdRT6EeWgELX9raxvAA"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.uml
index 06cb00bcefd..19950eab211 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/StereotypeDisplay/StereotypeDisplayModel.uml
@@ -1,20 +1,20 @@
-<?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:NominalTestProfile="http:///schemas/NominalTestProfile/_Fh-HYBT7EeWgELX9raxvAA/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/NominalTestProfile/_Fh-HYBT7EeWgELX9raxvAA/1 ProfileForStereotypeDisplayTests.profile.uml#_Fh_VgBT7EeWgELX9raxvAA">

-  <uml:Model xmi:id="_cTi3MBT6EeWgELX9raxvAA" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_fBymIBT6EeWgELX9raxvAA" name="Class1"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_cUCmcBT6EeWgELX9raxvAA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__TVCMB5uEeWDnczPNXv6Rg" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCMR5uEeWDnczPNXv6Rg" key="Version" value="0.0.2"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCMh5uEeWDnczPNXv6Rg" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCMx5uEeWDnczPNXv6Rg" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCNB5uEeWDnczPNXv6Rg" key="Date" value="2015-06-17"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCNR5uEeWDnczPNXv6Rg" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cUDNgBT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="ProfileForStereotypeDisplayTests.profile.uml#_Fh_VgBT7EeWgELX9raxvAA"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="ProfileForStereotypeDisplayTests.profile.uml#_EU0CoBT5EeWgELX9raxvAA"/>

-    </profileApplication>

-  </uml:Model>

-  <NominalTestProfile:stereoA xmi:id="_kDT_QBT6EeWgELX9raxvAA" base_Class="_fBymIBT6EeWgELX9raxvAA"/>

-</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:NominalTestProfile="http:///schemas/NominalTestProfile/_Fh-HYBT7EeWgELX9raxvAA/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/NominalTestProfile/_Fh-HYBT7EeWgELX9raxvAA/1 ProfileForStereotypeDisplayTests.profile.uml#_Fh_VgBT7EeWgELX9raxvAA">
+  <uml:Model xmi:id="_cTi3MBT6EeWgELX9raxvAA" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_fBymIBT6EeWgELX9raxvAA" name="Class1"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_cUCmcBT6EeWgELX9raxvAA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__TVCMB5uEeWDnczPNXv6Rg" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCMR5uEeWDnczPNXv6Rg" key="Version" value="0.0.2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCMh5uEeWDnczPNXv6Rg" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCMx5uEeWDnczPNXv6Rg" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCNB5uEeWDnczPNXv6Rg" key="Date" value="2015-06-17"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__TVCNR5uEeWDnczPNXv6Rg" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cUDNgBT6EeWgELX9raxvAA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="ProfileForStereotypeDisplayTests.profile.uml#_Fh_VgBT7EeWgELX9raxvAA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="ProfileForStereotypeDisplayTests.profile.uml#_EU0CoBT5EeWgELX9raxvAA"/>
+    </profileApplication>
+  </uml:Model>
+  <NominalTestProfile:stereoA xmi:id="_kDT_QBT6EeWgELX9raxvAA" base_Class="_fBymIBT6EeWgELX9raxvAA"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.di
index 08128862c28..8c549eecdc6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.notation
index 16c24c9f7dd..569e2a19277 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.notation
@@ -1,119 +1,119 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_L3wvYHaSEeeEHdA8pJmIgQ" type="CompositeStructure" name="Composite Structure Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_BPhI4HaTEeeEHdA8pJmIgQ" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_BPkzQHaTEeeEHdA8pJmIgQ" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_BPkzQXaTEeeEHdA8pJmIgQ" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BPkzQnaTEeeEHdA8pJmIgQ" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_BPlaUHaTEeeEHdA8pJmIgQ" type="Class_StructureCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BPlaUXaTEeeEHdA8pJmIgQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPlaUnaTEeeEHdA8pJmIgQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_BP8msHaTEeeEHdA8pJmIgQ" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BP8msXaTEeeEHdA8pJmIgQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BP8msnaTEeeEHdA8pJmIgQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Bq-84HaTEeeEHdA8pJmIgQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_Bq_j8HaTEeeEHdA8pJmIgQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Bq_j8XaTEeeEHdA8pJmIgQ" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Bq_j8naTEeeEHdA8pJmIgQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Bq_j83aTEeeEHdA8pJmIgQ" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="edgeCustomisation.uml#_BqZHAHaTEeeEHdA8pJmIgQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bq-84XaTEeeEHdA8pJmIgQ" x="531" y="50" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_COAxcHaTEeeEHdA8pJmIgQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_COBYgHaTEeeEHdA8pJmIgQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_COBYgXaTEeeEHdA8pJmIgQ" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_COBYgnaTEeeEHdA8pJmIgQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_COBYg3aTEeeEHdA8pJmIgQ" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="edgeCustomisation.uml#_CN3ngHaTEeeEHdA8pJmIgQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_COAxcXaTEeeEHdA8pJmIgQ" x="531" y="210" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_IlDyEHaeEeeEHdA8pJmIgQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_IlEZIHaeEeeEHdA8pJmIgQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_IlEZIXaeEeeEHdA8pJmIgQ" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_IlEZInaeEeeEHdA8pJmIgQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_IlEZI3aeEeeEHdA8pJmIgQ" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="edgeCustomisation.uml#_Ik4y8HaeEeeEHdA8pJmIgQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IlDyEXaeEeeEHdA8pJmIgQ" x="110" y="311" width="20" height="20"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_JEccwHaeEeeEHdA8pJmIgQ" type="Port_Shape">

-        <children xmi:type="notation:DecorationNode" xmi:id="_JEccwnaeEeeEHdA8pJmIgQ" type="Port_NameLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JEccw3aeEeeEHdA8pJmIgQ" x="25" y="3"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_JEdD0HaeEeeEHdA8pJmIgQ" type="Port_StereotypeLabel">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JEdD0XaeEeeEHdA8pJmIgQ" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="edgeCustomisation.uml#_JEVIAHaeEeeEHdA8pJmIgQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JEccwXaeEeeEHdA8pJmIgQ" x="310" y="311" width="20" height="20"/>

-      </children>

-      <element xmi:type="uml:Class" href="edgeCustomisation.uml#_BPZNEHaTEeeEHdA8pJmIgQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPhI4XaTEeeEHdA8pJmIgQ" x="60" y="60" width="541" height="321"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_L3wvYXaSEeeEHdA8pJmIgQ" name="diagram_compatibility_version" stringValue="1.3.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_L3wvYnaSEeeEHdA8pJmIgQ"/>

-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_L3wvY3aSEeeEHdA8pJmIgQ" diagramKindId="org.eclipse.papyrus.uml.diagram.compositeStructure.root.package">

-      <owner xmi:type="uml:Model" href="edgeCustomisation.uml#_L12q4HaSEeeEHdA8pJmIgQ"/>

-    </styles>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_rnyVAHaeEeeEHdA8pJmIgQ" name="css_stylesheets" eObjectListValue="_rnzjIHaeEeeEHdA8pJmIgQ"/>

-    <element xmi:type="uml:Model" href="edgeCustomisation.uml#_L12q4HaSEeeEHdA8pJmIgQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_DWT2QHaTEeeEHdA8pJmIgQ" type="Connector_Edge" source="_Bq-84HaTEeeEHdA8pJmIgQ" target="_COAxcHaTEeeEHdA8pJmIgQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_DWVEYHaTEeeEHdA8pJmIgQ" type="Connector_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QgXbwHaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DWVEYXaTEeeEHdA8pJmIgQ" x="-1" y="58"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DWVEYnaTEeeEHdA8pJmIgQ" type="Connector_NameLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Qgia4HaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DWVEY3aTEeeEHdA8pJmIgQ" x="1" y="-16"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_DWT2QXaTEeeEHdA8pJmIgQ"/>

-      <element xmi:type="uml:Connector" href="edgeCustomisation.uml#_DV2jQHaTEeeEHdA8pJmIgQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DWT2QnaTEeeEHdA8pJmIgQ" points="[611, 126, -643984, -643984]$[680, 200, -643984, -643984]$[611, 273, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Dy9WAHaTEeeEHdA8pJmIgQ" id="(1.0,0.8)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DWy-cHaTEeeEHdA8pJmIgQ" id="(1.0,0.15)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_KTKSoHaeEeeEHdA8pJmIgQ" type="Connector_Edge" source="_IlDyEHaeEeeEHdA8pJmIgQ" target="_JEccwHaeEeeEHdA8pJmIgQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_KTKSo3aeEeeEHdA8pJmIgQ" type="Connector_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_K-2T8HaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KTKSpHaeEeeEHdA8pJmIgQ" x="-1" y="57"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_KTKSpXaeEeeEHdA8pJmIgQ" type="Connector_NameLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_K_B6IHaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KTK5sHaeEeeEHdA8pJmIgQ" x="1" y="-19"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_KTKSoXaeEeeEHdA8pJmIgQ"/>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_6Eh18HafEeeEHdA8pJmIgQ" name="cssClass">

-        <stringListValue>edgeCusto</stringListValue>

-      </styles>

-      <element xmi:type="uml:Connector" href="edgeCustomisation.uml#_KTBvwHaeEeeEHdA8pJmIgQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KTKSonaeEeeEHdA8pJmIgQ" points="[190, 391, -643984, -643984]$[280, 460, -643984, -643984]$[370, 391, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K-rU0HaeEeeEHdA8pJmIgQ" id="(1.0,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KTkiUHaeEeeEHdA8pJmIgQ" id="(0.0,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_M8AkMHaeEeeEHdA8pJmIgQ" type="Connector_Edge" source="_JEccwHaeEeeEHdA8pJmIgQ" target="_COAxcHaTEeeEHdA8pJmIgQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_M8AkM3aeEeeEHdA8pJmIgQ" type="Connector_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NoyxsHaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_M8AkNHaeEeeEHdA8pJmIgQ" x="1" y="59"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_M8AkNXaeEeeEHdA8pJmIgQ" type="Connector_NameLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NpXZcHaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_M8AkNnaeEeeEHdA8pJmIgQ" x="1" y="-18"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_M8AkMXaeEeeEHdA8pJmIgQ"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_XzqDMHaeEeeEHdA8pJmIgQ" name="sourceDecoration" stringValue="solid_diamond_filled"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_ZAseEHaeEeeEHdA8pJmIgQ" name="targetDecoration" stringValue="open_arrow"/>

-      <element xmi:type="uml:Connector" href="edgeCustomisation.uml#_M7zv4HaeEeeEHdA8pJmIgQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M8AkMnaeEeeEHdA8pJmIgQ" points="[390, 381, -643984, -643984]$[600, 460, -643984, -643984]$[680, 380, -643984, -643984]$[607, 290, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NooZoHaeEeeEHdA8pJmIgQ" id="(1.0,0.5)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NooZoXaeEeeEHdA8pJmIgQ" id="(0.8,1.0)"/>

-    </edges>

-  </notation:Diagram>

-  <css:EmbeddedStyleSheet xmi:id="_rnzjIHaeEeeEHdA8pJmIgQ" label="" content=".edgeCusto{&#xD;&#xA;sourceDecoration: &quot;open_arrow&quot;;&#xD;&#xA;targetDecoration: &quot;open_arrow&quot;;&#xD;&#xA;}"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_L3wvYHaSEeeEHdA8pJmIgQ" type="CompositeStructure" name="Composite Structure Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_BPhI4HaTEeeEHdA8pJmIgQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BPkzQHaTEeeEHdA8pJmIgQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BPkzQXaTEeeEHdA8pJmIgQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BPkzQnaTEeeEHdA8pJmIgQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BPlaUHaTEeeEHdA8pJmIgQ" type="Class_StructureCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BPlaUXaTEeeEHdA8pJmIgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPlaUnaTEeeEHdA8pJmIgQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BP8msHaTEeeEHdA8pJmIgQ" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BP8msXaTEeeEHdA8pJmIgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BP8msnaTEeeEHdA8pJmIgQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Bq-84HaTEeeEHdA8pJmIgQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_Bq_j8HaTEeeEHdA8pJmIgQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Bq_j8XaTEeeEHdA8pJmIgQ" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Bq_j8naTEeeEHdA8pJmIgQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Bq_j83aTEeeEHdA8pJmIgQ" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="edgeCustomisation.uml#_BqZHAHaTEeeEHdA8pJmIgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bq-84XaTEeeEHdA8pJmIgQ" x="531" y="50" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_COAxcHaTEeeEHdA8pJmIgQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_COBYgHaTEeeEHdA8pJmIgQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_COBYgXaTEeeEHdA8pJmIgQ" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_COBYgnaTEeeEHdA8pJmIgQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_COBYg3aTEeeEHdA8pJmIgQ" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="edgeCustomisation.uml#_CN3ngHaTEeeEHdA8pJmIgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_COAxcXaTEeeEHdA8pJmIgQ" x="531" y="210" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_IlDyEHaeEeeEHdA8pJmIgQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_IlEZIHaeEeeEHdA8pJmIgQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_IlEZIXaeEeeEHdA8pJmIgQ" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_IlEZInaeEeeEHdA8pJmIgQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_IlEZI3aeEeeEHdA8pJmIgQ" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="edgeCustomisation.uml#_Ik4y8HaeEeeEHdA8pJmIgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IlDyEXaeEeeEHdA8pJmIgQ" x="110" y="311" width="20" height="20"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_JEccwHaeEeeEHdA8pJmIgQ" type="Port_Shape">
+        <children xmi:type="notation:DecorationNode" xmi:id="_JEccwnaeEeeEHdA8pJmIgQ" type="Port_NameLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JEccw3aeEeeEHdA8pJmIgQ" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_JEdD0HaeEeeEHdA8pJmIgQ" type="Port_StereotypeLabel">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JEdD0XaeEeeEHdA8pJmIgQ" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="edgeCustomisation.uml#_JEVIAHaeEeeEHdA8pJmIgQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JEccwXaeEeeEHdA8pJmIgQ" x="310" y="311" width="20" height="20"/>
+      </children>
+      <element xmi:type="uml:Class" href="edgeCustomisation.uml#_BPZNEHaTEeeEHdA8pJmIgQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPhI4XaTEeeEHdA8pJmIgQ" x="60" y="60" width="541" height="321"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_L3wvYXaSEeeEHdA8pJmIgQ" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_L3wvYnaSEeeEHdA8pJmIgQ"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_L3wvY3aSEeeEHdA8pJmIgQ" diagramKindId="org.eclipse.papyrus.uml.diagram.compositeStructure.root.package">
+      <owner xmi:type="uml:Model" href="edgeCustomisation.uml#_L12q4HaSEeeEHdA8pJmIgQ"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_rnyVAHaeEeeEHdA8pJmIgQ" name="css_stylesheets" eObjectListValue="_rnzjIHaeEeeEHdA8pJmIgQ"/>
+    <element xmi:type="uml:Model" href="edgeCustomisation.uml#_L12q4HaSEeeEHdA8pJmIgQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_DWT2QHaTEeeEHdA8pJmIgQ" type="Connector_Edge" source="_Bq-84HaTEeeEHdA8pJmIgQ" target="_COAxcHaTEeeEHdA8pJmIgQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DWVEYHaTEeeEHdA8pJmIgQ" type="Connector_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QgXbwHaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DWVEYXaTEeeEHdA8pJmIgQ" x="-1" y="58"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DWVEYnaTEeeEHdA8pJmIgQ" type="Connector_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Qgia4HaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DWVEY3aTEeeEHdA8pJmIgQ" x="1" y="-16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_DWT2QXaTEeeEHdA8pJmIgQ"/>
+      <element xmi:type="uml:Connector" href="edgeCustomisation.uml#_DV2jQHaTEeeEHdA8pJmIgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DWT2QnaTEeeEHdA8pJmIgQ" points="[611, 126, -643984, -643984]$[680, 200, -643984, -643984]$[611, 273, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Dy9WAHaTEeeEHdA8pJmIgQ" id="(1.0,0.8)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DWy-cHaTEeeEHdA8pJmIgQ" id="(1.0,0.15)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_KTKSoHaeEeeEHdA8pJmIgQ" type="Connector_Edge" source="_IlDyEHaeEeeEHdA8pJmIgQ" target="_JEccwHaeEeeEHdA8pJmIgQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_KTKSo3aeEeeEHdA8pJmIgQ" type="Connector_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_K-2T8HaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KTKSpHaeEeeEHdA8pJmIgQ" x="-1" y="57"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_KTKSpXaeEeeEHdA8pJmIgQ" type="Connector_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_K_B6IHaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KTK5sHaeEeeEHdA8pJmIgQ" x="1" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_KTKSoXaeEeeEHdA8pJmIgQ"/>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_6Eh18HafEeeEHdA8pJmIgQ" name="cssClass">
+        <stringListValue>edgeCusto</stringListValue>
+      </styles>
+      <element xmi:type="uml:Connector" href="edgeCustomisation.uml#_KTBvwHaeEeeEHdA8pJmIgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KTKSonaeEeeEHdA8pJmIgQ" points="[190, 391, -643984, -643984]$[280, 460, -643984, -643984]$[370, 391, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K-rU0HaeEeeEHdA8pJmIgQ" id="(1.0,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KTkiUHaeEeeEHdA8pJmIgQ" id="(0.0,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_M8AkMHaeEeeEHdA8pJmIgQ" type="Connector_Edge" source="_JEccwHaeEeeEHdA8pJmIgQ" target="_COAxcHaTEeeEHdA8pJmIgQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_M8AkM3aeEeeEHdA8pJmIgQ" type="Connector_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NoyxsHaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_M8AkNHaeEeeEHdA8pJmIgQ" x="1" y="59"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_M8AkNXaeEeeEHdA8pJmIgQ" type="Connector_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NpXZcHaeEeeEHdA8pJmIgQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_M8AkNnaeEeeEHdA8pJmIgQ" x="1" y="-18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_M8AkMXaeEeeEHdA8pJmIgQ"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_XzqDMHaeEeeEHdA8pJmIgQ" name="sourceDecoration" stringValue="solid_diamond_filled"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_ZAseEHaeEeeEHdA8pJmIgQ" name="targetDecoration" stringValue="open_arrow"/>
+      <element xmi:type="uml:Connector" href="edgeCustomisation.uml#_M7zv4HaeEeeEHdA8pJmIgQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M8AkMnaeEeeEHdA8pJmIgQ" points="[390, 381, -643984, -643984]$[600, 460, -643984, -643984]$[680, 380, -643984, -643984]$[607, 290, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NooZoHaeEeeEHdA8pJmIgQ" id="(1.0,0.5)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NooZoXaeEeeEHdA8pJmIgQ" id="(0.8,1.0)"/>
+    </edges>
+  </notation:Diagram>
+  <css:EmbeddedStyleSheet xmi:id="_rnzjIHaeEeeEHdA8pJmIgQ" label="" content=".edgeCusto{&#xD;&#xA;sourceDecoration: &quot;open_arrow&quot;;&#xD;&#xA;targetDecoration: &quot;open_arrow&quot;;&#xD;&#xA;}"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.uml
index 5cd95853a7b..cc521594442 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/edgeCustomisation/edgeCustomisation.uml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_L12q4HaSEeeEHdA8pJmIgQ" name="edgeCustomisation">

-  <packagedElement xmi:type="uml:Class" xmi:id="_BPZNEHaTEeeEHdA8pJmIgQ" name="Class1">

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_BqZHAHaTEeeEHdA8pJmIgQ" name="Port1" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_CN3ngHaTEeeEHdA8pJmIgQ" name="Port2" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_Ik4y8HaeEeeEHdA8pJmIgQ" name="Port3" aggregation="composite"/>

-    <ownedAttribute xmi:type="uml:Port" xmi:id="_JEVIAHaeEeeEHdA8pJmIgQ" name="Port4" aggregation="composite"/>

-    <ownedConnector xmi:type="uml:Connector" xmi:id="_DV2jQHaTEeeEHdA8pJmIgQ" name="DefaultConnector">

-      <end xmi:type="uml:ConnectorEnd" xmi:id="_DV6NoHaTEeeEHdA8pJmIgQ" role="_BqZHAHaTEeeEHdA8pJmIgQ"/>

-      <end xmi:type="uml:ConnectorEnd" xmi:id="_DV60sHaTEeeEHdA8pJmIgQ" role="_CN3ngHaTEeeEHdA8pJmIgQ"/>

-    </ownedConnector>

-    <ownedConnector xmi:type="uml:Connector" xmi:id="_KTBvwHaeEeeEHdA8pJmIgQ" name="CSSConnector">

-      <end xmi:type="uml:ConnectorEnd" xmi:id="_KTCW0HaeEeeEHdA8pJmIgQ" role="_Ik4y8HaeEeeEHdA8pJmIgQ"/>

-      <end xmi:type="uml:ConnectorEnd" xmi:id="_KTCW0XaeEeeEHdA8pJmIgQ" role="_JEVIAHaeEeeEHdA8pJmIgQ"/>

-    </ownedConnector>

-    <ownedConnector xmi:type="uml:Connector" xmi:id="_M7zv4HaeEeeEHdA8pJmIgQ" name="PropertiesSetConnector">

-      <end xmi:type="uml:ConnectorEnd" xmi:id="_M70W8HaeEeeEHdA8pJmIgQ" role="_JEVIAHaeEeeEHdA8pJmIgQ"/>

-      <end xmi:type="uml:ConnectorEnd" xmi:id="_M70W8XaeEeeEHdA8pJmIgQ" role="_CN3ngHaTEeeEHdA8pJmIgQ"/>

-    </ownedConnector>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_L12q4HaSEeeEHdA8pJmIgQ" name="edgeCustomisation">
+  <packagedElement xmi:type="uml:Class" xmi:id="_BPZNEHaTEeeEHdA8pJmIgQ" name="Class1">
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_BqZHAHaTEeeEHdA8pJmIgQ" name="Port1" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_CN3ngHaTEeeEHdA8pJmIgQ" name="Port2" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_Ik4y8HaeEeeEHdA8pJmIgQ" name="Port3" aggregation="composite"/>
+    <ownedAttribute xmi:type="uml:Port" xmi:id="_JEVIAHaeEeeEHdA8pJmIgQ" name="Port4" aggregation="composite"/>
+    <ownedConnector xmi:type="uml:Connector" xmi:id="_DV2jQHaTEeeEHdA8pJmIgQ" name="DefaultConnector">
+      <end xmi:type="uml:ConnectorEnd" xmi:id="_DV6NoHaTEeeEHdA8pJmIgQ" role="_BqZHAHaTEeeEHdA8pJmIgQ"/>
+      <end xmi:type="uml:ConnectorEnd" xmi:id="_DV60sHaTEeeEHdA8pJmIgQ" role="_CN3ngHaTEeeEHdA8pJmIgQ"/>
+    </ownedConnector>
+    <ownedConnector xmi:type="uml:Connector" xmi:id="_KTBvwHaeEeeEHdA8pJmIgQ" name="CSSConnector">
+      <end xmi:type="uml:ConnectorEnd" xmi:id="_KTCW0HaeEeeEHdA8pJmIgQ" role="_Ik4y8HaeEeeEHdA8pJmIgQ"/>
+      <end xmi:type="uml:ConnectorEnd" xmi:id="_KTCW0XaeEeeEHdA8pJmIgQ" role="_JEVIAHaeEeeEHdA8pJmIgQ"/>
+    </ownedConnector>
+    <ownedConnector xmi:type="uml:Connector" xmi:id="_M7zv4HaeEeeEHdA8pJmIgQ" name="PropertiesSetConnector">
+      <end xmi:type="uml:ConnectorEnd" xmi:id="_M70W8HaeEeeEHdA8pJmIgQ" role="_JEVIAHaeEeeEHdA8pJmIgQ"/>
+      <end xmi:type="uml:ConnectorEnd" xmi:id="_M70W8XaeEeeEHdA8pJmIgQ" role="_CN3ngHaTEeeEHdA8pJmIgQ"/>
+    </ownedConnector>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/model.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/model.di
index bb3ccc71939..ac2c4602fe1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/model.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_JJpbcAZ6EeSBoZZVjT_gSA"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_JJpbcAZ6EeSBoZZVjT_gSA"/>

-        </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="model.notation#_JJpbcAZ6EeSBoZZVjT_gSA"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_JJpbcAZ6EeSBoZZVjT_gSA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/model.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/model.uml
index 2406a58e5b8..4c851c9f3ef 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/model.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/model.uml
@@ -1,302 +1,302 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_JJC-gAZ6EeSBoZZVjT_gSA" name="model">

-  <ownedComment xmi:type="uml:Comment" xmi:id="_we-fwBCxEeSJbdueZ0I1wQ">

-    <body>Test1</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_hNGbsBCyEeSJbdueZ0I1wQ">

-    <body>Test2</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_lndHIBCyEeSJbdueZ0I1wQ">

-    <body>Test3</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_-N0Y4BCyEeSJbdueZ0I1wQ">

-    <body>Test4</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_C8KXUBCzEeSJbdueZ0I1wQ">

-    <body>Test5</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_JojW0BCzEeSJbdueZ0I1wQ">

-    <body>Test6</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_WOcgUBCzEeSJbdueZ0I1wQ">

-    <body>Test7</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_eSMUUBCzEeSJbdueZ0I1wQ">

-    <body>Test8</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_ic7PYBCzEeSJbdueZ0I1wQ">

-    <body>Test9</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_pndjcBCzEeSJbdueZ0I1wQ">

-    <body>Test10</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_149xUBCzEeSJbdueZ0I1wQ">

-    <body>Test11</body>

-  </ownedComment>

-  <packagedElement xmi:type="uml:Class" xmi:id="_kpL3wAaQEeSBoZZVjT_gSA" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_ngSnwAaQEeSBoZZVjT_gSA" name="class2" type="_lQUJMAaQEeSBoZZVjT_gSA" association="_ngTO0AaQEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ngSnwQaQEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ngSnwgaQEeSBoZZVjT_gSA" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_oOnGUAaQEeSBoZZVjT_gSA" name="class3" type="_l0qMYAaQEeSBoZZVjT_gSA" association="_oOntYAaQEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oOnGUQaQEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oOnGUgaQEeSBoZZVjT_gSA" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_lQUJMAaQEeSBoZZVjT_gSA" name="Class2"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_l0qMYAaQEeSBoZZVjT_gSA" name="Class3"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_ngTO0AaQEeSBoZZVjT_gSA" name="Association1" memberEnd="_ngTO0QaQEeSBoZZVjT_gSA _ngSnwAaQEeSBoZZVjT_gSA">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_ngTO0QaQEeSBoZZVjT_gSA" name="class1" type="_kpL3wAaQEeSBoZZVjT_gSA" association="_ngTO0AaQEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ngTO0gaQEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ngTO0waQEeSBoZZVjT_gSA" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_oOntYAaQEeSBoZZVjT_gSA" name="Association2" memberEnd="_oOntYQaQEeSBoZZVjT_gSA _oOnGUAaQEeSBoZZVjT_gSA">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_oOntYQaQEeSBoZZVjT_gSA" name="class1" type="_kpL3wAaQEeSBoZZVjT_gSA" association="_oOntYAaQEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oOntYgaQEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oOntYwaQEeSBoZZVjT_gSA" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_nLMEAAacEeSBoZZVjT_gSA" name="Class4">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_qC6fEAacEeSBoZZVjT_gSA" name="class5" type="_oCKvUAacEeSBoZZVjT_gSA" association="_qC6fEwacEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qC6fEQacEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qC6fEgacEeSBoZZVjT_gSA" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_oCKvUAacEeSBoZZVjT_gSA" name="Class5"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_qC6fEwacEeSBoZZVjT_gSA" name="Association3" memberEnd="_qC6fFAacEeSBoZZVjT_gSA _qC6fEAacEeSBoZZVjT_gSA">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_qC6fFAacEeSBoZZVjT_gSA" name="class4" type="_nLMEAAacEeSBoZZVjT_gSA" association="_qC6fEwacEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qC6fFQacEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qC6fFgacEeSBoZZVjT_gSA" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_tjqpAAacEeSBoZZVjT_gSA" name="Class6">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_uiK4oAacEeSBoZZVjT_gSA" name="class7" type="_uGCWQAacEeSBoZZVjT_gSA" association="_uiLfsgacEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uiLfsAacEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uiLfsQacEeSBoZZVjT_gSA" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_uGCWQAacEeSBoZZVjT_gSA" name="Class7"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_uiLfsgacEeSBoZZVjT_gSA" name="Association4" memberEnd="_uiLfswacEeSBoZZVjT_gSA _uiK4oAacEeSBoZZVjT_gSA">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_uiLfswacEeSBoZZVjT_gSA" name="class6" type="_tjqpAAacEeSBoZZVjT_gSA" association="_uiLfsgacEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uiLftAacEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uiLftQacEeSBoZZVjT_gSA" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_F4MucAaeEeSBoZZVjT_gSA" clientDependency="_-WDO0AahEeSBoZZVjT_gSA" name="Class8">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_9zFEoAahEeSBoZZVjT_gSA" name="class9" type="_8oVv0AahEeSBoZZVjT_gSA" association="_9zFrsAahEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9zFEoQahEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9zFEogahEeSBoZZVjT_gSA" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_8oVv0AahEeSBoZZVjT_gSA" name="Class9"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_9zFrsAahEeSBoZZVjT_gSA" name="Association5" memberEnd="_9zFrsQahEeSBoZZVjT_gSA _9zFEoAahEeSBoZZVjT_gSA">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_9zFrsQahEeSBoZZVjT_gSA" name="class8" type="_F4MucAaeEeSBoZZVjT_gSA" association="_9zFrsAahEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9zFrsgahEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9zFrswahEeSBoZZVjT_gSA" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Dependency" xmi:id="_-WDO0AahEeSBoZZVjT_gSA" name="Dependency1" client="_F4MucAaeEeSBoZZVjT_gSA" supplier="_8oVv0AahEeSBoZZVjT_gSA"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_MpjwsAaiEeSBoZZVjT_gSA" name="Class10">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Qo-zoAaiEeSBoZZVjT_gSA" name="class11" type="_NDq50AaiEeSBoZZVjT_gSA" association="_Qo-zowaiEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Qo-zoQaiEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qo-zogaiEeSBoZZVjT_gSA" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_R5YrkAaiEeSBoZZVjT_gSA" name="class12" type="_PvF-QAaiEeSBoZZVjT_gSA" association="_R5YrkwaiEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R5YrkQaiEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R5YrkgaiEeSBoZZVjT_gSA" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_NDq50AaiEeSBoZZVjT_gSA" name="Class11"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_PvF-QAaiEeSBoZZVjT_gSA" name="Class12"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_Qo-zowaiEeSBoZZVjT_gSA" name="Association6" memberEnd="_Qo-zpAaiEeSBoZZVjT_gSA _Qo-zoAaiEeSBoZZVjT_gSA">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_Qo-zpAaiEeSBoZZVjT_gSA" name="class10" type="_MpjwsAaiEeSBoZZVjT_gSA" association="_Qo-zowaiEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Qo-zpQaiEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qo-zpgaiEeSBoZZVjT_gSA" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_R5YrkwaiEeSBoZZVjT_gSA" name="Association7" memberEnd="_R5YrlAaiEeSBoZZVjT_gSA _R5YrkAaiEeSBoZZVjT_gSA">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_R5YrlAaiEeSBoZZVjT_gSA" name="class10" type="_MpjwsAaiEeSBoZZVjT_gSA" association="_R5YrkwaiEeSBoZZVjT_gSA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R5YrlQaiEeSBoZZVjT_gSA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R5YrlgaiEeSBoZZVjT_gSA" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_upr04AanEeSjBLKX2Tfccg" name="Class13">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_x1JrUAanEeSjBLKX2Tfccg" name="class14" type="_v1jLEAanEeSjBLKX2Tfccg" association="_x1JrUwanEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x1JrUQanEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x1JrUganEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_z3J_UAanEeSjBLKX2Tfccg" name="class15" type="_xDrLEAanEeSjBLKX2Tfccg" association="_z3J_UwanEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z3J_UQanEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z3J_UganEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_v1jLEAanEeSjBLKX2Tfccg" name="Class14"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_xDrLEAanEeSjBLKX2Tfccg" name="Class15"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_x1JrUwanEeSjBLKX2Tfccg" name="Association8" memberEnd="_x1JrVAanEeSjBLKX2Tfccg _x1JrUAanEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_x1JrVAanEeSjBLKX2Tfccg" name="class13" type="_upr04AanEeSjBLKX2Tfccg" association="_x1JrUwanEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x1JrVQanEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x1JrVganEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_z3J_UwanEeSjBLKX2Tfccg" name="Association9" memberEnd="_z3J_VAanEeSjBLKX2Tfccg _z3J_UAanEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_z3J_VAanEeSjBLKX2Tfccg" name="class13" type="_upr04AanEeSjBLKX2Tfccg" association="_z3J_UwanEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z3J_VQanEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z3J_VganEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_9FySEAanEeSjBLKX2Tfccg" name="Class16">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="__xqpgAanEeSjBLKX2Tfccg" name="class17" type="_-KtSwAanEeSjBLKX2Tfccg" association="__xqpgwanEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__xqpgQanEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__xqpgganEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_DQ3UQAaoEeSjBLKX2Tfccg" name="class18" type="_-wYLoAanEeSjBLKX2Tfccg" association="_DQ3UQwaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DQ3UQQaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DQ3UQgaoEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_-KtSwAanEeSjBLKX2Tfccg" name="Class17"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_-wYLoAanEeSjBLKX2Tfccg" name="Class18"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="__xqpgwanEeSjBLKX2Tfccg" name="Association11" memberEnd="__xqphAanEeSjBLKX2Tfccg __xqpgAanEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="__xqphAanEeSjBLKX2Tfccg" name="class16" type="_9FySEAanEeSjBLKX2Tfccg" association="__xqpgwanEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__xqphQanEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__xqphganEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_DQ3UQwaoEeSjBLKX2Tfccg" name="Association10" memberEnd="_DQ3URAaoEeSjBLKX2Tfccg _DQ3UQAaoEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_DQ3URAaoEeSjBLKX2Tfccg" name="class16" type="_9FySEAanEeSjBLKX2Tfccg" association="_DQ3UQwaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DQ3URQaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DQ3URgaoEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_k1C1kAaoEeSjBLKX2Tfccg" name="Class19">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_oIs-sAaoEeSjBLKX2Tfccg" name="class20" type="_lWeHoAaoEeSjBLKX2Tfccg" association="_oIs-swaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oIs-sQaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oIs-sgaoEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_ow4ZAAaoEeSjBLKX2Tfccg" name="class21" type="_mCQ2oAaoEeSjBLKX2Tfccg" association="_ow4ZAwaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ow4ZAQaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ow4ZAgaoEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_lWeHoAaoEeSjBLKX2Tfccg" name="Class20"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_mCQ2oAaoEeSjBLKX2Tfccg" name="Class21"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_oIs-swaoEeSjBLKX2Tfccg" name="Association12" memberEnd="_oIs-tAaoEeSjBLKX2Tfccg _oIs-sAaoEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_oIs-tAaoEeSjBLKX2Tfccg" name="class19" type="_k1C1kAaoEeSjBLKX2Tfccg" association="_oIs-swaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oIs-tQaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oIs-tgaoEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_ow4ZAwaoEeSjBLKX2Tfccg" name="Association13" memberEnd="_ow4ZBAaoEeSjBLKX2Tfccg _ow4ZAAaoEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_ow4ZBAaoEeSjBLKX2Tfccg" name="class19" type="_k1C1kAaoEeSjBLKX2Tfccg" association="_ow4ZAwaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ow4ZBQaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ow4ZBgaoEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_0ynFgAaoEeSjBLKX2Tfccg" name="Class22">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_4kv6YAaoEeSjBLKX2Tfccg" name="class23" type="_3_qQUAaoEeSjBLKX2Tfccg" association="_4kwhcAaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4kv6YQaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4kv6YgaoEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_6TvLwAaoEeSjBLKX2Tfccg" name="class23" type="_3_qQUAaoEeSjBLKX2Tfccg" association="_6Tvy0AaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6TvLwQaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6TvLwgaoEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_3_qQUAaoEeSjBLKX2Tfccg" name="Class23"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_4kwhcAaoEeSjBLKX2Tfccg" name="Association14" memberEnd="_4kwhcQaoEeSjBLKX2Tfccg _4kv6YAaoEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_4kwhcQaoEeSjBLKX2Tfccg" name="class22" type="_0ynFgAaoEeSjBLKX2Tfccg" association="_4kwhcAaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4kwhcgaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4kwhcwaoEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_6Tvy0AaoEeSjBLKX2Tfccg" name="Association15" memberEnd="_6Tvy0QaoEeSjBLKX2Tfccg _6TvLwAaoEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_6Tvy0QaoEeSjBLKX2Tfccg" name="class22" type="_0ynFgAaoEeSjBLKX2Tfccg" association="_6Tvy0AaoEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6Tvy0gaoEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6Tvy0waoEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_OSTncAazEeSjBLKX2Tfccg" name="Class24">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QL4YMAazEeSjBLKX2Tfccg" name="class25" type="_PaWNkAazEeSjBLKX2Tfccg" association="_QL4_QAazEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QL4YMQazEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QL4YMgazEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_T8p7IAazEeSjBLKX2Tfccg" name="class25" type="_PaWNkAazEeSjBLKX2Tfccg" association="_T8qiMAazEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T8p7IQazEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T8p7IgazEeSjBLKX2Tfccg" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_PaWNkAazEeSjBLKX2Tfccg" name="Class25"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_QL4_QAazEeSjBLKX2Tfccg" name="Association23" memberEnd="_QL4_QQazEeSjBLKX2Tfccg _QL4YMAazEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_QL4_QQazEeSjBLKX2Tfccg" name="class24" type="_OSTncAazEeSjBLKX2Tfccg" association="_QL4_QAazEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QL4_QgazEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QL4_QwazEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_T8qiMAazEeSjBLKX2Tfccg" name="Association22" memberEnd="_T8qiMQazEeSjBLKX2Tfccg _T8p7IAazEeSjBLKX2Tfccg">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_T8qiMQazEeSjBLKX2Tfccg" name="class24" type="_OSTncAazEeSjBLKX2Tfccg" association="_T8qiMAazEeSjBLKX2Tfccg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T8qiMgazEeSjBLKX2Tfccg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T8qiMwazEeSjBLKX2Tfccg" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_-62WIAgvEeSOb7xxF0D0Yw" name="Class26">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Bir7EAgwEeSOb7xxF0D0Yw" name="class28" type="_ADXdYAgwEeSOb7xxF0D0Yw" association="_Bir7EwgwEeSOb7xxF0D0Yw">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bir7EQgwEeSOb7xxF0D0Yw" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bir7EggwEeSOb7xxF0D0Yw" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="__mVjIAgvEeSOb7xxF0D0Yw" name="Class27">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_CLSMIAgwEeSOb7xxF0D0Yw" name="class28" type="_ADXdYAgwEeSOb7xxF0D0Yw" association="_CLSMIwgwEeSOb7xxF0D0Yw">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CLSMIQgwEeSOb7xxF0D0Yw" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CLSMIggwEeSOb7xxF0D0Yw" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_ADXdYAgwEeSOb7xxF0D0Yw" name="Class28"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_Bir7EwgwEeSOb7xxF0D0Yw" name="Association17" memberEnd="_Bir7FAgwEeSOb7xxF0D0Yw _Bir7EAgwEeSOb7xxF0D0Yw">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_Bir7FAgwEeSOb7xxF0D0Yw" name="class26" type="_-62WIAgvEeSOb7xxF0D0Yw" association="_Bir7EwgwEeSOb7xxF0D0Yw">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bir7FQgwEeSOb7xxF0D0Yw" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bir7FggwEeSOb7xxF0D0Yw" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_CLSMIwgwEeSOb7xxF0D0Yw" name="Association16" memberEnd="_CLSMJAgwEeSOb7xxF0D0Yw _CLSMIAgwEeSOb7xxF0D0Yw">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_CLSMJAgwEeSOb7xxF0D0Yw" name="class27" type="__mVjIAgvEeSOb7xxF0D0Yw" association="_CLSMIwgwEeSOb7xxF0D0Yw">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CLSMJQgwEeSOb7xxF0D0Yw" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CLSMJggwEeSOb7xxF0D0Yw" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_wZrlgBCwEeSJbdueZ0I1wQ" name="Class29">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_y-lyQBCwEeSJbdueZ0I1wQ" name="class30" type="_xLFNQBCwEeSJbdueZ0I1wQ" association="_y-mZUBCwEeSJbdueZ0I1wQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y-lyQRCwEeSJbdueZ0I1wQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y-lyQhCwEeSJbdueZ0I1wQ" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_ztuJIBCwEeSJbdueZ0I1wQ" name="class31" type="_yA6CABCwEeSJbdueZ0I1wQ" association="_ztuJIxCwEeSJbdueZ0I1wQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ztuJIRCwEeSJbdueZ0I1wQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ztuJIhCwEeSJbdueZ0I1wQ" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_1QduQBCwEeSJbdueZ0I1wQ" name="class32" type="_0uebgBCwEeSJbdueZ0I1wQ" association="_1QduQxCwEeSJbdueZ0I1wQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1QduQRCwEeSJbdueZ0I1wQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1QduQhCwEeSJbdueZ0I1wQ" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_xLFNQBCwEeSJbdueZ0I1wQ" name="Class30"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_yA6CABCwEeSJbdueZ0I1wQ" name="Class31"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_y-mZUBCwEeSJbdueZ0I1wQ" name="Association20" memberEnd="_y-mZURCwEeSJbdueZ0I1wQ _y-lyQBCwEeSJbdueZ0I1wQ">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_y-mZURCwEeSJbdueZ0I1wQ" name="class29" type="_wZrlgBCwEeSJbdueZ0I1wQ" association="_y-mZUBCwEeSJbdueZ0I1wQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y-nAYBCwEeSJbdueZ0I1wQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y-nAYRCwEeSJbdueZ0I1wQ" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_ztuJIxCwEeSJbdueZ0I1wQ" name="Association21" memberEnd="_ztuJJBCwEeSJbdueZ0I1wQ _ztuJIBCwEeSJbdueZ0I1wQ">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_ztuJJBCwEeSJbdueZ0I1wQ" name="class29" type="_wZrlgBCwEeSJbdueZ0I1wQ" association="_ztuJIxCwEeSJbdueZ0I1wQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ztuJJRCwEeSJbdueZ0I1wQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ztuJJhCwEeSJbdueZ0I1wQ" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_0uebgBCwEeSJbdueZ0I1wQ" name="Class32"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_1QduQxCwEeSJbdueZ0I1wQ" name="Association19" memberEnd="_1QduRBCwEeSJbdueZ0I1wQ _1QduQBCwEeSJbdueZ0I1wQ">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_1QduRBCwEeSJbdueZ0I1wQ" name="class29" type="_wZrlgBCwEeSJbdueZ0I1wQ" association="_1QduQxCwEeSJbdueZ0I1wQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1QduRRCwEeSJbdueZ0I1wQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1QduRhCwEeSJbdueZ0I1wQ" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_JJC-gAZ6EeSBoZZVjT_gSA" name="model">
+  <ownedComment xmi:type="uml:Comment" xmi:id="_we-fwBCxEeSJbdueZ0I1wQ">
+    <body>Test1</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_hNGbsBCyEeSJbdueZ0I1wQ">
+    <body>Test2</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_lndHIBCyEeSJbdueZ0I1wQ">
+    <body>Test3</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_-N0Y4BCyEeSJbdueZ0I1wQ">
+    <body>Test4</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_C8KXUBCzEeSJbdueZ0I1wQ">
+    <body>Test5</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_JojW0BCzEeSJbdueZ0I1wQ">
+    <body>Test6</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_WOcgUBCzEeSJbdueZ0I1wQ">
+    <body>Test7</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_eSMUUBCzEeSJbdueZ0I1wQ">
+    <body>Test8</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_ic7PYBCzEeSJbdueZ0I1wQ">
+    <body>Test9</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_pndjcBCzEeSJbdueZ0I1wQ">
+    <body>Test10</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_149xUBCzEeSJbdueZ0I1wQ">
+    <body>Test11</body>
+  </ownedComment>
+  <packagedElement xmi:type="uml:Class" xmi:id="_kpL3wAaQEeSBoZZVjT_gSA" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ngSnwAaQEeSBoZZVjT_gSA" name="class2" type="_lQUJMAaQEeSBoZZVjT_gSA" association="_ngTO0AaQEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ngSnwQaQEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ngSnwgaQEeSBoZZVjT_gSA" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_oOnGUAaQEeSBoZZVjT_gSA" name="class3" type="_l0qMYAaQEeSBoZZVjT_gSA" association="_oOntYAaQEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oOnGUQaQEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oOnGUgaQEeSBoZZVjT_gSA" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_lQUJMAaQEeSBoZZVjT_gSA" name="Class2"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_l0qMYAaQEeSBoZZVjT_gSA" name="Class3"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_ngTO0AaQEeSBoZZVjT_gSA" name="Association1" memberEnd="_ngTO0QaQEeSBoZZVjT_gSA _ngSnwAaQEeSBoZZVjT_gSA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_ngTO0QaQEeSBoZZVjT_gSA" name="class1" type="_kpL3wAaQEeSBoZZVjT_gSA" association="_ngTO0AaQEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ngTO0gaQEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ngTO0waQEeSBoZZVjT_gSA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_oOntYAaQEeSBoZZVjT_gSA" name="Association2" memberEnd="_oOntYQaQEeSBoZZVjT_gSA _oOnGUAaQEeSBoZZVjT_gSA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_oOntYQaQEeSBoZZVjT_gSA" name="class1" type="_kpL3wAaQEeSBoZZVjT_gSA" association="_oOntYAaQEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oOntYgaQEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oOntYwaQEeSBoZZVjT_gSA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_nLMEAAacEeSBoZZVjT_gSA" name="Class4">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_qC6fEAacEeSBoZZVjT_gSA" name="class5" type="_oCKvUAacEeSBoZZVjT_gSA" association="_qC6fEwacEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qC6fEQacEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qC6fEgacEeSBoZZVjT_gSA" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_oCKvUAacEeSBoZZVjT_gSA" name="Class5"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_qC6fEwacEeSBoZZVjT_gSA" name="Association3" memberEnd="_qC6fFAacEeSBoZZVjT_gSA _qC6fEAacEeSBoZZVjT_gSA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_qC6fFAacEeSBoZZVjT_gSA" name="class4" type="_nLMEAAacEeSBoZZVjT_gSA" association="_qC6fEwacEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qC6fFQacEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qC6fFgacEeSBoZZVjT_gSA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_tjqpAAacEeSBoZZVjT_gSA" name="Class6">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_uiK4oAacEeSBoZZVjT_gSA" name="class7" type="_uGCWQAacEeSBoZZVjT_gSA" association="_uiLfsgacEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uiLfsAacEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uiLfsQacEeSBoZZVjT_gSA" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_uGCWQAacEeSBoZZVjT_gSA" name="Class7"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_uiLfsgacEeSBoZZVjT_gSA" name="Association4" memberEnd="_uiLfswacEeSBoZZVjT_gSA _uiK4oAacEeSBoZZVjT_gSA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_uiLfswacEeSBoZZVjT_gSA" name="class6" type="_tjqpAAacEeSBoZZVjT_gSA" association="_uiLfsgacEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uiLftAacEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uiLftQacEeSBoZZVjT_gSA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_F4MucAaeEeSBoZZVjT_gSA" clientDependency="_-WDO0AahEeSBoZZVjT_gSA" name="Class8">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_9zFEoAahEeSBoZZVjT_gSA" name="class9" type="_8oVv0AahEeSBoZZVjT_gSA" association="_9zFrsAahEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9zFEoQahEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9zFEogahEeSBoZZVjT_gSA" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_8oVv0AahEeSBoZZVjT_gSA" name="Class9"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_9zFrsAahEeSBoZZVjT_gSA" name="Association5" memberEnd="_9zFrsQahEeSBoZZVjT_gSA _9zFEoAahEeSBoZZVjT_gSA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_9zFrsQahEeSBoZZVjT_gSA" name="class8" type="_F4MucAaeEeSBoZZVjT_gSA" association="_9zFrsAahEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9zFrsgahEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9zFrswahEeSBoZZVjT_gSA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_-WDO0AahEeSBoZZVjT_gSA" name="Dependency1" client="_F4MucAaeEeSBoZZVjT_gSA" supplier="_8oVv0AahEeSBoZZVjT_gSA"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_MpjwsAaiEeSBoZZVjT_gSA" name="Class10">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Qo-zoAaiEeSBoZZVjT_gSA" name="class11" type="_NDq50AaiEeSBoZZVjT_gSA" association="_Qo-zowaiEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Qo-zoQaiEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qo-zogaiEeSBoZZVjT_gSA" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_R5YrkAaiEeSBoZZVjT_gSA" name="class12" type="_PvF-QAaiEeSBoZZVjT_gSA" association="_R5YrkwaiEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R5YrkQaiEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R5YrkgaiEeSBoZZVjT_gSA" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_NDq50AaiEeSBoZZVjT_gSA" name="Class11"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_PvF-QAaiEeSBoZZVjT_gSA" name="Class12"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_Qo-zowaiEeSBoZZVjT_gSA" name="Association6" memberEnd="_Qo-zpAaiEeSBoZZVjT_gSA _Qo-zoAaiEeSBoZZVjT_gSA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_Qo-zpAaiEeSBoZZVjT_gSA" name="class10" type="_MpjwsAaiEeSBoZZVjT_gSA" association="_Qo-zowaiEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Qo-zpQaiEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qo-zpgaiEeSBoZZVjT_gSA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_R5YrkwaiEeSBoZZVjT_gSA" name="Association7" memberEnd="_R5YrlAaiEeSBoZZVjT_gSA _R5YrkAaiEeSBoZZVjT_gSA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_R5YrlAaiEeSBoZZVjT_gSA" name="class10" type="_MpjwsAaiEeSBoZZVjT_gSA" association="_R5YrkwaiEeSBoZZVjT_gSA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R5YrlQaiEeSBoZZVjT_gSA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R5YrlgaiEeSBoZZVjT_gSA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_upr04AanEeSjBLKX2Tfccg" name="Class13">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_x1JrUAanEeSjBLKX2Tfccg" name="class14" type="_v1jLEAanEeSjBLKX2Tfccg" association="_x1JrUwanEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x1JrUQanEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x1JrUganEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_z3J_UAanEeSjBLKX2Tfccg" name="class15" type="_xDrLEAanEeSjBLKX2Tfccg" association="_z3J_UwanEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z3J_UQanEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z3J_UganEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_v1jLEAanEeSjBLKX2Tfccg" name="Class14"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_xDrLEAanEeSjBLKX2Tfccg" name="Class15"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_x1JrUwanEeSjBLKX2Tfccg" name="Association8" memberEnd="_x1JrVAanEeSjBLKX2Tfccg _x1JrUAanEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_x1JrVAanEeSjBLKX2Tfccg" name="class13" type="_upr04AanEeSjBLKX2Tfccg" association="_x1JrUwanEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x1JrVQanEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x1JrVganEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_z3J_UwanEeSjBLKX2Tfccg" name="Association9" memberEnd="_z3J_VAanEeSjBLKX2Tfccg _z3J_UAanEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_z3J_VAanEeSjBLKX2Tfccg" name="class13" type="_upr04AanEeSjBLKX2Tfccg" association="_z3J_UwanEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z3J_VQanEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z3J_VganEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_9FySEAanEeSjBLKX2Tfccg" name="Class16">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="__xqpgAanEeSjBLKX2Tfccg" name="class17" type="_-KtSwAanEeSjBLKX2Tfccg" association="__xqpgwanEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__xqpgQanEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__xqpgganEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_DQ3UQAaoEeSjBLKX2Tfccg" name="class18" type="_-wYLoAanEeSjBLKX2Tfccg" association="_DQ3UQwaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DQ3UQQaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DQ3UQgaoEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_-KtSwAanEeSjBLKX2Tfccg" name="Class17"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_-wYLoAanEeSjBLKX2Tfccg" name="Class18"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="__xqpgwanEeSjBLKX2Tfccg" name="Association11" memberEnd="__xqphAanEeSjBLKX2Tfccg __xqpgAanEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="__xqphAanEeSjBLKX2Tfccg" name="class16" type="_9FySEAanEeSjBLKX2Tfccg" association="__xqpgwanEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__xqphQanEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__xqphganEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_DQ3UQwaoEeSjBLKX2Tfccg" name="Association10" memberEnd="_DQ3URAaoEeSjBLKX2Tfccg _DQ3UQAaoEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_DQ3URAaoEeSjBLKX2Tfccg" name="class16" type="_9FySEAanEeSjBLKX2Tfccg" association="_DQ3UQwaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DQ3URQaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DQ3URgaoEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_k1C1kAaoEeSjBLKX2Tfccg" name="Class19">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_oIs-sAaoEeSjBLKX2Tfccg" name="class20" type="_lWeHoAaoEeSjBLKX2Tfccg" association="_oIs-swaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oIs-sQaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oIs-sgaoEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ow4ZAAaoEeSjBLKX2Tfccg" name="class21" type="_mCQ2oAaoEeSjBLKX2Tfccg" association="_ow4ZAwaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ow4ZAQaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ow4ZAgaoEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_lWeHoAaoEeSjBLKX2Tfccg" name="Class20"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_mCQ2oAaoEeSjBLKX2Tfccg" name="Class21"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_oIs-swaoEeSjBLKX2Tfccg" name="Association12" memberEnd="_oIs-tAaoEeSjBLKX2Tfccg _oIs-sAaoEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_oIs-tAaoEeSjBLKX2Tfccg" name="class19" type="_k1C1kAaoEeSjBLKX2Tfccg" association="_oIs-swaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oIs-tQaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oIs-tgaoEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_ow4ZAwaoEeSjBLKX2Tfccg" name="Association13" memberEnd="_ow4ZBAaoEeSjBLKX2Tfccg _ow4ZAAaoEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_ow4ZBAaoEeSjBLKX2Tfccg" name="class19" type="_k1C1kAaoEeSjBLKX2Tfccg" association="_ow4ZAwaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ow4ZBQaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ow4ZBgaoEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_0ynFgAaoEeSjBLKX2Tfccg" name="Class22">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_4kv6YAaoEeSjBLKX2Tfccg" name="class23" type="_3_qQUAaoEeSjBLKX2Tfccg" association="_4kwhcAaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4kv6YQaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4kv6YgaoEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_6TvLwAaoEeSjBLKX2Tfccg" name="class23" type="_3_qQUAaoEeSjBLKX2Tfccg" association="_6Tvy0AaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6TvLwQaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6TvLwgaoEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_3_qQUAaoEeSjBLKX2Tfccg" name="Class23"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_4kwhcAaoEeSjBLKX2Tfccg" name="Association14" memberEnd="_4kwhcQaoEeSjBLKX2Tfccg _4kv6YAaoEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_4kwhcQaoEeSjBLKX2Tfccg" name="class22" type="_0ynFgAaoEeSjBLKX2Tfccg" association="_4kwhcAaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4kwhcgaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4kwhcwaoEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_6Tvy0AaoEeSjBLKX2Tfccg" name="Association15" memberEnd="_6Tvy0QaoEeSjBLKX2Tfccg _6TvLwAaoEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_6Tvy0QaoEeSjBLKX2Tfccg" name="class22" type="_0ynFgAaoEeSjBLKX2Tfccg" association="_6Tvy0AaoEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6Tvy0gaoEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6Tvy0waoEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_OSTncAazEeSjBLKX2Tfccg" name="Class24">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QL4YMAazEeSjBLKX2Tfccg" name="class25" type="_PaWNkAazEeSjBLKX2Tfccg" association="_QL4_QAazEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QL4YMQazEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QL4YMgazEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_T8p7IAazEeSjBLKX2Tfccg" name="class25" type="_PaWNkAazEeSjBLKX2Tfccg" association="_T8qiMAazEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T8p7IQazEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T8p7IgazEeSjBLKX2Tfccg" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_PaWNkAazEeSjBLKX2Tfccg" name="Class25"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_QL4_QAazEeSjBLKX2Tfccg" name="Association23" memberEnd="_QL4_QQazEeSjBLKX2Tfccg _QL4YMAazEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_QL4_QQazEeSjBLKX2Tfccg" name="class24" type="_OSTncAazEeSjBLKX2Tfccg" association="_QL4_QAazEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QL4_QgazEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QL4_QwazEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_T8qiMAazEeSjBLKX2Tfccg" name="Association22" memberEnd="_T8qiMQazEeSjBLKX2Tfccg _T8p7IAazEeSjBLKX2Tfccg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_T8qiMQazEeSjBLKX2Tfccg" name="class24" type="_OSTncAazEeSjBLKX2Tfccg" association="_T8qiMAazEeSjBLKX2Tfccg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T8qiMgazEeSjBLKX2Tfccg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T8qiMwazEeSjBLKX2Tfccg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_-62WIAgvEeSOb7xxF0D0Yw" name="Class26">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Bir7EAgwEeSOb7xxF0D0Yw" name="class28" type="_ADXdYAgwEeSOb7xxF0D0Yw" association="_Bir7EwgwEeSOb7xxF0D0Yw">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bir7EQgwEeSOb7xxF0D0Yw" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bir7EggwEeSOb7xxF0D0Yw" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="__mVjIAgvEeSOb7xxF0D0Yw" name="Class27">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_CLSMIAgwEeSOb7xxF0D0Yw" name="class28" type="_ADXdYAgwEeSOb7xxF0D0Yw" association="_CLSMIwgwEeSOb7xxF0D0Yw">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CLSMIQgwEeSOb7xxF0D0Yw" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CLSMIggwEeSOb7xxF0D0Yw" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ADXdYAgwEeSOb7xxF0D0Yw" name="Class28"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_Bir7EwgwEeSOb7xxF0D0Yw" name="Association17" memberEnd="_Bir7FAgwEeSOb7xxF0D0Yw _Bir7EAgwEeSOb7xxF0D0Yw">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_Bir7FAgwEeSOb7xxF0D0Yw" name="class26" type="_-62WIAgvEeSOb7xxF0D0Yw" association="_Bir7EwgwEeSOb7xxF0D0Yw">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bir7FQgwEeSOb7xxF0D0Yw" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bir7FggwEeSOb7xxF0D0Yw" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_CLSMIwgwEeSOb7xxF0D0Yw" name="Association16" memberEnd="_CLSMJAgwEeSOb7xxF0D0Yw _CLSMIAgwEeSOb7xxF0D0Yw">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_CLSMJAgwEeSOb7xxF0D0Yw" name="class27" type="__mVjIAgvEeSOb7xxF0D0Yw" association="_CLSMIwgwEeSOb7xxF0D0Yw">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CLSMJQgwEeSOb7xxF0D0Yw" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CLSMJggwEeSOb7xxF0D0Yw" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_wZrlgBCwEeSJbdueZ0I1wQ" name="Class29">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_y-lyQBCwEeSJbdueZ0I1wQ" name="class30" type="_xLFNQBCwEeSJbdueZ0I1wQ" association="_y-mZUBCwEeSJbdueZ0I1wQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y-lyQRCwEeSJbdueZ0I1wQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y-lyQhCwEeSJbdueZ0I1wQ" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ztuJIBCwEeSJbdueZ0I1wQ" name="class31" type="_yA6CABCwEeSJbdueZ0I1wQ" association="_ztuJIxCwEeSJbdueZ0I1wQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ztuJIRCwEeSJbdueZ0I1wQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ztuJIhCwEeSJbdueZ0I1wQ" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_1QduQBCwEeSJbdueZ0I1wQ" name="class32" type="_0uebgBCwEeSJbdueZ0I1wQ" association="_1QduQxCwEeSJbdueZ0I1wQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1QduQRCwEeSJbdueZ0I1wQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1QduQhCwEeSJbdueZ0I1wQ" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_xLFNQBCwEeSJbdueZ0I1wQ" name="Class30"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_yA6CABCwEeSJbdueZ0I1wQ" name="Class31"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_y-mZUBCwEeSJbdueZ0I1wQ" name="Association20" memberEnd="_y-mZURCwEeSJbdueZ0I1wQ _y-lyQBCwEeSJbdueZ0I1wQ">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_y-mZURCwEeSJbdueZ0I1wQ" name="class29" type="_wZrlgBCwEeSJbdueZ0I1wQ" association="_y-mZUBCwEeSJbdueZ0I1wQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y-nAYBCwEeSJbdueZ0I1wQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y-nAYRCwEeSJbdueZ0I1wQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_ztuJIxCwEeSJbdueZ0I1wQ" name="Association21" memberEnd="_ztuJJBCwEeSJbdueZ0I1wQ _ztuJIBCwEeSJbdueZ0I1wQ">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_ztuJJBCwEeSJbdueZ0I1wQ" name="class29" type="_wZrlgBCwEeSJbdueZ0I1wQ" association="_ztuJIxCwEeSJbdueZ0I1wQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ztuJJRCwEeSJbdueZ0I1wQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ztuJJhCwEeSJbdueZ0I1wQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_0uebgBCwEeSJbdueZ0I1wQ" name="Class32"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_1QduQxCwEeSJbdueZ0I1wQ" name="Association19" memberEnd="_1QduRBCwEeSJbdueZ0I1wQ _1QduQBCwEeSJbdueZ0I1wQ">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_1QduRBCwEeSJbdueZ0I1wQ" name="class29" type="_wZrlgBCwEeSJbdueZ0I1wQ" association="_1QduQxCwEeSJbdueZ0I1wQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1QduRRCwEeSJbdueZ0I1wQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1QduRhCwEeSJbdueZ0I1wQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.notation
index 0f95c9ce28f..a09e9b5806e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.notation
@@ -1,57 +1,57 @@
-<?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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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">

-  <notation:Diagram xmi:id="_t3lX0BXNEeWs_bTNvrOd5w" type="PapyrusUMLComponentDiagram" name="ComponentDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_uiJXwBXNEeWs_bTNvrOd5w" type="2002">

-      <children xmi:type="notation:DecorationNode" xmi:id="_uiLM8BXNEeWs_bTNvrOd5w" type="5004"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_uiL0ABXNEeWs_bTNvrOd5w" type="6030">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uiL0ARXNEeWs_bTNvrOd5w" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_uiMbEBXNEeWs_bTNvrOd5w" type="7001">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_uiMbERXNEeWs_bTNvrOd5w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uiMbEhXNEeWs_bTNvrOd5w"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_uilcoBXNEeWs_bTNvrOd5w" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_uilcoRXNEeWs_bTNvrOd5w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uilcohXNEeWs_bTNvrOd5w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_vqLW0BXNEeWs_bTNvrOd5w" type="3069">

-        <children xmi:type="notation:DecorationNode" xmi:id="_vqLW0hXNEeWs_bTNvrOd5w" type="5006">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vqLW0xXNEeWs_bTNvrOd5w" x="28" y="4"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_vqLW1BXNEeWs_bTNvrOd5w" type="5007">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vqLW1RXNEeWs_bTNvrOd5w" x="25" y="-10"/>

-        </children>

-        <element xmi:type="uml:Port" href="model.uml#_vp_JkBXNEeWs_bTNvrOd5w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vqLW0RXNEeWs_bTNvrOd5w" x="150" y="30"/>

-      </children>

-      <element xmi:type="uml:Component" href="model.uml#_uhnMQBXNEeWs_bTNvrOd5w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uiJXwRXNEeWs_bTNvrOd5w" x="92" y="147"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_cK0QUBjcEeWMjJEqhdMs0g" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_cK0QURjcEeWMjJEqhdMs0g" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_cK0QUxjcEeWMjJEqhdMs0g" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Component" href="model.uml#_uhnMQBXNEeWs_bTNvrOd5w"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cK0QUhjcEeWMjJEqhdMs0g" x="292" y="147"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_t3lX0RXNEeWs_bTNvrOd5w" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_t3lX0hXNEeWs_bTNvrOd5w"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_t3lX0xXNEeWs_bTNvrOd5w">

-      <owner xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>

-    </styles>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_Rtt6IBjuEeWMjJEqhdMs0g" name="css_stylesheets" eObjectListValue="_RtvvUBjuEeWMjJEqhdMs0g"/>

-    <element xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>

-    <edges xmi:type="notation:Connector" xmi:id="_cK0QVBjcEeWMjJEqhdMs0g" type="StereotypeCommentLink" source="_uiJXwBXNEeWs_bTNvrOd5w" target="_cK0QUBjcEeWMjJEqhdMs0g">

-      <styles xmi:type="notation:FontStyle" xmi:id="_cK0QVRjcEeWMjJEqhdMs0g"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_cK0QWRjcEeWMjJEqhdMs0g" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Component" href="model.uml#_uhnMQBXNEeWs_bTNvrOd5w"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cK0QVhjcEeWMjJEqhdMs0g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cK0QVxjcEeWMjJEqhdMs0g"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cK0QWBjcEeWMjJEqhdMs0g"/>

-    </edges>

-  </notation:Diagram>

-  <css:EmbeddedStyleSheet xmi:id="_RtvvUBjuEeWMjJEqhdMs0g" label="CSSTest" content=""/>

-</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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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">
+  <notation:Diagram xmi:id="_t3lX0BXNEeWs_bTNvrOd5w" type="PapyrusUMLComponentDiagram" name="ComponentDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_uiJXwBXNEeWs_bTNvrOd5w" type="2002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_uiLM8BXNEeWs_bTNvrOd5w" type="5004"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uiL0ABXNEeWs_bTNvrOd5w" type="6030">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uiL0ARXNEeWs_bTNvrOd5w" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_uiMbEBXNEeWs_bTNvrOd5w" type="7001">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_uiMbERXNEeWs_bTNvrOd5w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uiMbEhXNEeWs_bTNvrOd5w"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_uilcoBXNEeWs_bTNvrOd5w" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_uilcoRXNEeWs_bTNvrOd5w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uilcohXNEeWs_bTNvrOd5w"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_vqLW0BXNEeWs_bTNvrOd5w" type="3069">
+        <children xmi:type="notation:DecorationNode" xmi:id="_vqLW0hXNEeWs_bTNvrOd5w" type="5006">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vqLW0xXNEeWs_bTNvrOd5w" x="28" y="4"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_vqLW1BXNEeWs_bTNvrOd5w" type="5007">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vqLW1RXNEeWs_bTNvrOd5w" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="model.uml#_vp_JkBXNEeWs_bTNvrOd5w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vqLW0RXNEeWs_bTNvrOd5w" x="150" y="30"/>
+      </children>
+      <element xmi:type="uml:Component" href="model.uml#_uhnMQBXNEeWs_bTNvrOd5w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uiJXwRXNEeWs_bTNvrOd5w" x="92" y="147"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_cK0QUBjcEeWMjJEqhdMs0g" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_cK0QURjcEeWMjJEqhdMs0g" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_cK0QUxjcEeWMjJEqhdMs0g" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Component" href="model.uml#_uhnMQBXNEeWs_bTNvrOd5w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cK0QUhjcEeWMjJEqhdMs0g" x="292" y="147"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_t3lX0RXNEeWs_bTNvrOd5w" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_t3lX0hXNEeWs_bTNvrOd5w"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_t3lX0xXNEeWs_bTNvrOd5w">
+      <owner xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_Rtt6IBjuEeWMjJEqhdMs0g" name="css_stylesheets" eObjectListValue="_RtvvUBjuEeWMjJEqhdMs0g"/>
+    <element xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_cK0QVBjcEeWMjJEqhdMs0g" type="StereotypeCommentLink" source="_uiJXwBXNEeWs_bTNvrOd5w" target="_cK0QUBjcEeWMjJEqhdMs0g">
+      <styles xmi:type="notation:FontStyle" xmi:id="_cK0QVRjcEeWMjJEqhdMs0g"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_cK0QWRjcEeWMjJEqhdMs0g" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Component" href="model.uml#_uhnMQBXNEeWs_bTNvrOd5w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cK0QVhjcEeWMjJEqhdMs0g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cK0QVxjcEeWMjJEqhdMs0g"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cK0QWBjcEeWMjJEqhdMs0g"/>
+    </edges>
+  </notation:Diagram>
+  <css:EmbeddedStyleSheet xmi:id="_RtvvUBjuEeWMjJEqhdMs0g" label="CSSTest" content=""/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.notation
index 89351c645ca..f7d6538c8ca 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.notation
@@ -1,56 +1,56 @@
-<?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: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" xmi:id="_Pk7t4BjcEeWMjJEqhdMs0g" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_R92tEBjcEeWMjJEqhdMs0g" type="1031">

-    <children xmi:type="notation:DecorationNode" xmi:id="_R93UIBjcEeWMjJEqhdMs0g" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R93UIRjcEeWMjJEqhdMs0g" x="241" y="58"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_R-JA8BjcEeWMjJEqhdMs0g" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_R-JA8RjcEeWMjJEqhdMs0g" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_R-JA8xjcEeWMjJEqhdMs0g" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R-JA8hjcEeWMjJEqhdMs0g" x="956" y="201"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_ShjQABjcEeWMjJEqhdMs0g" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Shj3EBjcEeWMjJEqhdMs0g" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Shj3ERjcEeWMjJEqhdMs0g" type="1071">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Shj3EhjcEeWMjJEqhdMs0g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Shj3ExjcEeWMjJEqhdMs0g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Shj3FBjcEeWMjJEqhdMs0g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Shj3FRjcEeWMjJEqhdMs0g"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Shj3FhjcEeWMjJEqhdMs0g" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Shj3FxjcEeWMjJEqhdMs0g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Shj3GBjcEeWMjJEqhdMs0g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Shj3GRjcEeWMjJEqhdMs0g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Shj3GhjcEeWMjJEqhdMs0g"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="model.profile.uml#_ShiB4BjcEeWMjJEqhdMs0g"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShjQARjcEeWMjJEqhdMs0g" x="247" y="157"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_Pk7t4RjcEeWMjJEqhdMs0g" name="diagram_compatibility_version" stringValue="1.1.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_Pk7t4hjcEeWMjJEqhdMs0g"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Pk7t4xjcEeWMjJEqhdMs0g">

-    <owner xmi:type="uml:Profile" href="model.profile.uml#_PkuSgBjcEeWMjJEqhdMs0g"/>

-  </styles>

-  <element xmi:type="uml:Profile" href="model.profile.uml#_PkuSgBjcEeWMjJEqhdMs0g"/>

-  <edges xmi:type="notation:Connector" xmi:id="_R-JA9BjcEeWMjJEqhdMs0g" type="StereotypeCommentLink" source="_R92tEBjcEeWMjJEqhdMs0g" target="_R-JA8BjcEeWMjJEqhdMs0g">

-    <styles xmi:type="notation:FontStyle" xmi:id="_R-JA9RjcEeWMjJEqhdMs0g"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_R-JA-RjcEeWMjJEqhdMs0g" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R-JA9hjcEeWMjJEqhdMs0g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R-JA9xjcEeWMjJEqhdMs0g"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R-JA-BjcEeWMjJEqhdMs0g"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_TKFPoBjcEeWMjJEqhdMs0g" type="1013" source="_ShjQABjcEeWMjJEqhdMs0g" target="_R92tEBjcEeWMjJEqhdMs0g">

-    <styles xmi:type="notation:FontStyle" xmi:id="_TKFPoRjcEeWMjJEqhdMs0g"/>

-    <element xmi:type="uml:Extension" href="model.profile.uml#_TJ-h8BjcEeWMjJEqhdMs0g"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TKFPohjcEeWMjJEqhdMs0g" points="[-3, -16, 2, 129]$[-3, -120, 2, 25]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WlXDsBjcEeWMjJEqhdMs0g" id="(0.55,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WUOQYBjcEeWMjJEqhdMs0g" id="(0.61,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: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" xmi:id="_Pk7t4BjcEeWMjJEqhdMs0g" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_R92tEBjcEeWMjJEqhdMs0g" type="1031">
+    <children xmi:type="notation:DecorationNode" xmi:id="_R93UIBjcEeWMjJEqhdMs0g" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R93UIRjcEeWMjJEqhdMs0g" x="241" y="58"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_R-JA8BjcEeWMjJEqhdMs0g" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_R-JA8RjcEeWMjJEqhdMs0g" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_R-JA8xjcEeWMjJEqhdMs0g" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R-JA8hjcEeWMjJEqhdMs0g" x="956" y="201"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ShjQABjcEeWMjJEqhdMs0g" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Shj3EBjcEeWMjJEqhdMs0g" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Shj3ERjcEeWMjJEqhdMs0g" type="1071">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Shj3EhjcEeWMjJEqhdMs0g"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Shj3ExjcEeWMjJEqhdMs0g"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Shj3FBjcEeWMjJEqhdMs0g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Shj3FRjcEeWMjJEqhdMs0g"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Shj3FhjcEeWMjJEqhdMs0g" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Shj3FxjcEeWMjJEqhdMs0g"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Shj3GBjcEeWMjJEqhdMs0g"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Shj3GRjcEeWMjJEqhdMs0g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Shj3GhjcEeWMjJEqhdMs0g"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="model.profile.uml#_ShiB4BjcEeWMjJEqhdMs0g"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShjQARjcEeWMjJEqhdMs0g" x="247" y="157"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_Pk7t4RjcEeWMjJEqhdMs0g" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_Pk7t4hjcEeWMjJEqhdMs0g"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Pk7t4xjcEeWMjJEqhdMs0g">
+    <owner xmi:type="uml:Profile" href="model.profile.uml#_PkuSgBjcEeWMjJEqhdMs0g"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="model.profile.uml#_PkuSgBjcEeWMjJEqhdMs0g"/>
+  <edges xmi:type="notation:Connector" xmi:id="_R-JA9BjcEeWMjJEqhdMs0g" type="StereotypeCommentLink" source="_R92tEBjcEeWMjJEqhdMs0g" target="_R-JA8BjcEeWMjJEqhdMs0g">
+    <styles xmi:type="notation:FontStyle" xmi:id="_R-JA9RjcEeWMjJEqhdMs0g"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_R-JA-RjcEeWMjJEqhdMs0g" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R-JA9hjcEeWMjJEqhdMs0g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R-JA9xjcEeWMjJEqhdMs0g"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R-JA-BjcEeWMjJEqhdMs0g"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_TKFPoBjcEeWMjJEqhdMs0g" type="1013" source="_ShjQABjcEeWMjJEqhdMs0g" target="_R92tEBjcEeWMjJEqhdMs0g">
+    <styles xmi:type="notation:FontStyle" xmi:id="_TKFPoRjcEeWMjJEqhdMs0g"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_TJ-h8BjcEeWMjJEqhdMs0g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TKFPohjcEeWMjJEqhdMs0g" points="[-3, -16, 2, 129]$[-3, -120, 2, 25]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WlXDsBjcEeWMjJEqhdMs0g" id="(0.55,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WUOQYBjcEeWMjJEqhdMs0g" id="(0.61,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.uml
index 6487eb0dba0..a86ed6b7d48 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.profile.uml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_PkuSgBjcEeWMjJEqhdMs0g" name="RootElement" metaclassReference="_R9tjIBjcEeWMjJEqhdMs0g">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YON34BjcEeWMjJEqhdMs0g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_YON34RjcEeWMjJEqhdMs0g" name="RootElement" nsURI="http:///schemas/RootElement/_YOMpwBjcEeWMjJEqhdMs0g/0" nsPrefix="RootElement">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YOPtERjcEeWMjJEqhdMs0g" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtEhjcEeWMjJEqhdMs0g" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtExjcEeWMjJEqhdMs0g" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtFBjcEeWMjJEqhdMs0g" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtFRjcEeWMjJEqhdMs0g" key="Date" value="2015-06-22"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtFhjcEeWMjJEqhdMs0g" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_YON34hjcEeWMjJEqhdMs0g" name="StereotypeTest">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YON34xjcEeWMjJEqhdMs0g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ShiB4BjcEeWMjJEqhdMs0g"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YON35BjcEeWMjJEqhdMs0g" name="base_Component" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_R9tjIBjcEeWMjJEqhdMs0g" alias="Component">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-  </elementImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_ShiB4BjcEeWMjJEqhdMs0g" name="StereotypeTest">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_TJ_JABjcEeWMjJEqhdMs0g" name="base_Component" association="_TJ-h8BjcEeWMjJEqhdMs0g">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_TJ-h8BjcEeWMjJEqhdMs0g" name="E_StereotypeTest_Component1" memberEnd="_TJ-h8RjcEeWMjJEqhdMs0g _TJ_JABjcEeWMjJEqhdMs0g">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_TJ-h8RjcEeWMjJEqhdMs0g" name="extension_StereotypeTest" type="_ShiB4BjcEeWMjJEqhdMs0g" aggregation="composite" association="_TJ-h8BjcEeWMjJEqhdMs0g"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_PkuSgBjcEeWMjJEqhdMs0g" name="RootElement" metaclassReference="_R9tjIBjcEeWMjJEqhdMs0g">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YON34BjcEeWMjJEqhdMs0g" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_YON34RjcEeWMjJEqhdMs0g" name="RootElement" nsURI="http:///schemas/RootElement/_YOMpwBjcEeWMjJEqhdMs0g/0" nsPrefix="RootElement">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YOPtERjcEeWMjJEqhdMs0g" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtEhjcEeWMjJEqhdMs0g" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtExjcEeWMjJEqhdMs0g" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtFBjcEeWMjJEqhdMs0g" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtFRjcEeWMjJEqhdMs0g" key="Date" value="2015-06-22"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOPtFhjcEeWMjJEqhdMs0g" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_YON34hjcEeWMjJEqhdMs0g" name="StereotypeTest">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YON34xjcEeWMjJEqhdMs0g" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ShiB4BjcEeWMjJEqhdMs0g"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YON35BjcEeWMjJEqhdMs0g" name="base_Component" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_R9tjIBjcEeWMjJEqhdMs0g" alias="Component">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+  </elementImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_ShiB4BjcEeWMjJEqhdMs0g" name="StereotypeTest">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_TJ_JABjcEeWMjJEqhdMs0g" name="base_Component" association="_TJ-h8BjcEeWMjJEqhdMs0g">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Component"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_TJ-h8BjcEeWMjJEqhdMs0g" name="E_StereotypeTest_Component1" memberEnd="_TJ-h8RjcEeWMjJEqhdMs0g _TJ_JABjcEeWMjJEqhdMs0g">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_TJ-h8RjcEeWMjJEqhdMs0g" name="extension_StereotypeTest" type="_ShiB4BjcEeWMjJEqhdMs0g" aggregation="composite" association="_TJ-h8BjcEeWMjJEqhdMs0g"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.uml
index 0971878c71f..48444374db7 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/resources/shapeCustomisation/model.uml
@@ -1,22 +1,22 @@
-<?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:RootElement="http:///schemas/RootElement/_YOMpwBjcEeWMjJEqhdMs0g/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_YOMpwBjcEeWMjJEqhdMs0g/0 model.profile.uml#_YON34RjcEeWMjJEqhdMs0g">

-  <uml:Model xmi:id="_ANMzQP4fEeSePJTjmnYBcA" name="RootElement">

-    <packagedElement xmi:type="uml:Component" xmi:id="_uhnMQBXNEeWs_bTNvrOd5w" name="Component1">

-      <ownedAttribute xmi:type="uml:Port" xmi:id="_vp_JkBXNEeWs_bTNvrOd5w" name="Port1" aggregation="composite"/>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_bJmD4BjcEeWMjJEqhdMs0g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bJogIBjcEeWMjJEqhdMs0g" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogIRjcEeWMjJEqhdMs0g" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogIhjcEeWMjJEqhdMs0g" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogIxjcEeWMjJEqhdMs0g" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogJBjcEeWMjJEqhdMs0g" key="Date" value="2015-06-22"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogJRjcEeWMjJEqhdMs0g" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bJn5EBjcEeWMjJEqhdMs0g" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="model.profile.uml#_YON34RjcEeWMjJEqhdMs0g"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_PkuSgBjcEeWMjJEqhdMs0g"/>

-    </profileApplication>

-  </uml:Model>

-  <RootElement:StereotypeTest xmi:id="_cKsUgBjcEeWMjJEqhdMs0g" base_Component="_uhnMQBXNEeWs_bTNvrOd5w"/>

-</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:RootElement="http:///schemas/RootElement/_YOMpwBjcEeWMjJEqhdMs0g/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_YOMpwBjcEeWMjJEqhdMs0g/0 model.profile.uml#_YON34RjcEeWMjJEqhdMs0g">
+  <uml:Model xmi:id="_ANMzQP4fEeSePJTjmnYBcA" name="RootElement">
+    <packagedElement xmi:type="uml:Component" xmi:id="_uhnMQBXNEeWs_bTNvrOd5w" name="Component1">
+      <ownedAttribute xmi:type="uml:Port" xmi:id="_vp_JkBXNEeWs_bTNvrOd5w" name="Port1" aggregation="composite"/>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_bJmD4BjcEeWMjJEqhdMs0g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bJogIBjcEeWMjJEqhdMs0g" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogIRjcEeWMjJEqhdMs0g" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogIhjcEeWMjJEqhdMs0g" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogIxjcEeWMjJEqhdMs0g" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogJBjcEeWMjJEqhdMs0g" key="Date" value="2015-06-22"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bJogJRjcEeWMjJEqhdMs0g" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bJn5EBjcEeWMjJEqhdMs0g" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_YON34RjcEeWMjJEqhdMs0g"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_PkuSgBjcEeWMjJEqhdMs0g"/>
+    </profileApplication>
+  </uml:Model>
+  <RootElement:StereotypeTest xmi:id="_cKsUgBjcEeWMjJEqhdMs0g" base_Component="_uhnMQBXNEeWs_bTNvrOd5w"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/Activator.java
index b66ddcd0dfd..52e9d4e6f90 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/Activator.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.uml.diagram.common.tests;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.common.tests"; //$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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.common.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/css/Bug431694_UndoDeleteTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/css/Bug431694_UndoDeleteTest.java
index 9c6eea30fdc..5752d074c96 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/css/Bug431694_UndoDeleteTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/css/Bug431694_UndoDeleteTest.java
@@ -1,267 +1,267 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.common.tests.css;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.GradientStyle;

-import org.eclipse.gmf.runtime.notation.Shape;

-import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;

-import org.eclipse.papyrus.junit.utils.DiagramUtils;

-import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Package;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-

-/**

- * Test for bug 431694: [All diagrams] Problem with Surfboard display after Delete -> Undo

- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=431694

- */

-public class Bug431694_UndoDeleteTest extends AbstractEditorTest {

-

-	private static final String PACKAGE1 = "Package1";

-

-	private static final String CLASS_NAMED_STYLE_FONT = "ClassNamedStyleFont";

-

-	private static final String DIAGRAM_MAIN_NAME = "Main";

-

-	private static final String PROJECT_NAME = "431694_UndoDeleteTest";

-

-	public final static String SOURCE_PATH = "resources/431694/";

-

-	protected boolean operationFailed = false;

-

-

-	@Before

-	public void prepareTest() throws Exception {

-		initModel(PROJECT_NAME, "model", getBundle());

-	}

-

-	/**

-	 * Test with a {@link Package} with a css style already applied

-	 */

-	@Test

-	public void testDeleteOnPackageWithStyle() throws Exception {

-		// check css on the package P1

-		// get Package 1 view on the open diagram

-		// get the rootModel

-		Assert.assertNotNull("RootModel is null", getRootUMLModel());

-

-		Diagram mainDiagram = DiagramUtils.getNotationDiagram(getModelSet(), DIAGRAM_MAIN_NAME);

-		getPageManager().openPage(mainDiagram);

-		Assert.assertEquals("current opened diagram is not the expected one", mainDiagram.getName(), DIAGRAM_MAIN_NAME);

-

-		// check css is working

-		Assert.assertTrue("CSS is not supported on the given model", CSSHelper.isCSSSupported(getModelSet()));

-		Shape package1View = DiagramUtils.findShape(mainDiagram, PACKAGE1);

-		if(package1View == null) {

-			return;

-		}

-		checkPackage1CSS(package1View);

-

-		// delete P1

-		// get edit part for this view and send a delete request

-		IGraphicalEditPart packageEditPart = DiagramUtils.findEditPartforView(editor, package1View, IGraphicalEditPart.class);

-		Assert.assertNotNull("Impossible to find package edit part", packageEditPart);

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = packageEditPart.getCommand(deleteViewRequest);

-		assertNotNull("Impossible to create a delete command", command);

-		Assert.assertNotEquals("This should not be an unexecutable command", command, UnexecutableCommand.INSTANCE);

-		assertTrue("command should be executable", command.canExecute());

-		execute(command);

-		Assert.assertNull("There should be no shape for this element: " + PACKAGE1, DiagramUtils.findShape(mainDiagram, PACKAGE1));

-

-		// undo

-		undo();

-

-		// check css on P1

-		Shape newPackage1View = DiagramUtils.findShape(mainDiagram, PACKAGE1);

-		Assert.assertNotNull("There should be a shape for this element: " + PACKAGE1, newPackage1View);

-		checkPackage1CSS(newPackage1View);

-

-	}

-

-	/**

-	 * Test with a {@link Package} with a css style already applied

-	 */

-	@Test

-	public void testDeleteOnClassNamedStyleFont() throws Exception {

-		// check css on the class ClassNamedStyleFont

-		Assert.assertNotNull("RootModel is null", getRootUMLModel());

-

-		Diagram mainDiagram = DiagramUtils.getNotationDiagram(getModelSet(), DIAGRAM_MAIN_NAME);

-		getPageManager().openPage(mainDiagram);

-		Assert.assertEquals("current opened diagram is not the expected one", mainDiagram.getName(), DIAGRAM_MAIN_NAME);

-

-		// check css is working

-		Assert.assertTrue("CSS is not supported on the given model", CSSHelper.isCSSSupported(getModelSet()));

-		Shape ClassNamedStyleFontView = DiagramUtils.findShape(mainDiagram, CLASS_NAMED_STYLE_FONT);

-		if(ClassNamedStyleFontView == null) {

-			return;

-		}

-		checkClassNamedStyleFontCSS(ClassNamedStyleFontView);

-

-		// delete ClassNamedStyleFont

-		// get edit part for this view and send a delete request

-		IGraphicalEditPart ClassNamedStyleFontEditPart = DiagramUtils.findEditPartforView(editor, ClassNamedStyleFontView, IGraphicalEditPart.class);

-		Assert.assertNotNull("Impossible to find the edit part", ClassNamedStyleFontEditPart);

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ClassNamedStyleFontEditPart.getCommand(deleteViewRequest);

-		assertNotNull("Impossible to create a delete command", command);

-		Assert.assertNotEquals("This should not be an unexecutable command", command, UnexecutableCommand.INSTANCE);

-		assertTrue("command should be executable", command.canExecute());

-		execute(command);

-		Assert.assertNull("There should be no shape for this element: " + CLASS_NAMED_STYLE_FONT, DiagramUtils.findShape(mainDiagram, CLASS_NAMED_STYLE_FONT));

-

-		// undo

-		undo();

-

-		// check css on the new view for ClassNamedStyleFont

-		Shape newClassNamedStyleFontView = DiagramUtils.findShape(mainDiagram, CLASS_NAMED_STYLE_FONT);

-		Assert.assertNotNull("There should be a shape for this element: " + CLASS_NAMED_STYLE_FONT, newClassNamedStyleFontView);

-		checkClassNamedStyleFontCSS(newClassNamedStyleFontView);

-

-	}

-

-	private void checkClassNamedStyleFontCSS(Shape classNamedStyleFontView) {

-		// default style: papyrus theme

-		Assert.assertEquals("Invalid Fill color (Default): " + DiagramUtils.integerToRGBString(classNamedStyleFontView.getFillColor()), DiagramUtils.rgb(195, 215, 221), classNamedStyleFontView.getFillColor()); // Papyrus Theme =

-		Assert.assertEquals("Gradient should be default (vertical)", classNamedStyleFontView.getGradient().getGradientStyle(), GradientStyle.VERTICAL); // Papyrus Theme =

-		Assert.assertEquals("Invalid Gradient Color (Default)", DiagramUtils.rgb(255, 255, 255), classNamedStyleFontView.getGradient().getGradientColor1()); // Papyrus Theme =

-

-		// named style: font color is white

-		Assert.assertEquals("Invalid Font Color", DiagramUtils.rgb(255, 255, 255), classNamedStyleFontView.getFontColor()); // White font by the named style

-	}

-

-	protected void checkPackage1CSS(Shape packageShape) {

-		// named style: fill red and horizontal green gradient

-		Assert.assertEquals("Invalid Fill color", DiagramUtils.rgb(255, 0, 0), packageShape.getFillColor()); //Red = #FF0000

-		Assert.assertEquals("Gradient should be horizontal", packageShape.getGradient().getGradientStyle(), GradientStyle.HORIZONTAL);

-		Assert.assertEquals("Invalid Gradient Color", DiagramUtils.rgb(0, 255, 0), packageShape.getGradient().getGradientColor1()); // GREEN

-

-		// unnamed style: font color is blue

-		Assert.assertEquals("Invalid gradient", DiagramUtils.rgb(0, 0, 255), packageShape.getFontColor()); // Blue font by the named style

-	}

-

-

-	@Override

-	protected String getSourcePath() {

-		return SOURCE_PATH;

-	}

-

-	@Override

-	protected Bundle getBundle() {

-		return org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getBundle();

-	}

-

-	/**

-	 * Call {@link AbstractPapyrusTestCase#execute(Command) execute} on the UI

-	 * thread.

-	 */

-	protected void executeOnUIThread(final Command command) {

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				execute(command);

-			}

-		});

-	}

-

-	/** Call {@link AbstractPapyrusTestCase#undo() undo} on the UI thread. */

-	protected void undoOnUIThread() {

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				undo();

-			}

-		});

-	}

-

-	/** Call {@link AbstractPapyrusTestCase#redo() redo} on the UI thread. */

-	protected void redoOnUIThread() {

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				redo();

-			}

-		});

-	}

-

-	protected void assertLastOperationSuccessful() {

-		Assert.assertFalse("The operation failed. Look at the log, or put a breakpoint on ExecutionException or DefaultOperationHistory#notifyNotOK to find the cause.", this.operationFailed);

-	}

-

-	/**

-	 * Reset the "operation failed" state. Call this before executing each

-	 * operation for which you want to test whether if failed with {@link AbstractPapyrusTestCase#assertLastOperationSuccessful()}.

-	 */

-	protected void resetLastOperationFailedState() {

-		this.operationFailed = false;

-	}

-

-	/** Execute the given command in the diagram editor. */

-	protected void execute(final Command command) {

-		resetLastOperationFailedState();

-		getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

-		assertLastOperationSuccessful();

-	}

-

-	/** Undo the last command done in the diagram editor. */

-	protected void undo() {

-		resetLastOperationFailedState();

-		final CommandStack commandStack = getCommandStack();

-		Assert.assertTrue("We should be able to undo", commandStack.canUndo());

-		commandStack.undo();

-		assertLastOperationSuccessful();

-	}

-

-	/** Redo the last command undone in the diagram editor. */

-	protected void redo() {

-		resetLastOperationFailedState();

-		final CommandStack commandStack = getCommandStack();

-		Assert.assertTrue("We should be able to redo", commandStack.canRedo());

-		commandStack.redo();

-		assertLastOperationSuccessful();

-	}

-

-	/** The command stack to use to execute commands on the diagram. */

-	protected CommandStack getCommandStack() {

-		// not "diagramEditor.getDiagramEditDomain().getDiagramCommandStack()"

-		// because it messes up undo contexts

-		try {

-			return getTransactionalEditingDomain().getCommandStack();

-		} catch (ServiceException e) {

-			Assert.fail(e.getMessage());

-		}

-		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:
+ *  CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.tests.css;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.GradientStyle;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
+import org.eclipse.papyrus.junit.utils.DiagramUtils;
+import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.uml2.uml.Package;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * Test for bug 431694: [All diagrams] Problem with Surfboard display after Delete -> Undo
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=431694
+ */
+public class Bug431694_UndoDeleteTest extends AbstractEditorTest {
+
+	private static final String PACKAGE1 = "Package1";
+
+	private static final String CLASS_NAMED_STYLE_FONT = "ClassNamedStyleFont";
+
+	private static final String DIAGRAM_MAIN_NAME = "Main";
+
+	private static final String PROJECT_NAME = "431694_UndoDeleteTest";
+
+	public final static String SOURCE_PATH = "resources/431694/";
+
+	protected boolean operationFailed = false;
+
+
+	@Before
+	public void prepareTest() throws Exception {
+		initModel(PROJECT_NAME, "model", getBundle());
+	}
+
+	/**
+	 * Test with a {@link Package} with a css style already applied
+	 */
+	@Test
+	public void testDeleteOnPackageWithStyle() throws Exception {
+		// check css on the package P1
+		// get Package 1 view on the open diagram
+		// get the rootModel
+		Assert.assertNotNull("RootModel is null", getRootUMLModel());
+
+		Diagram mainDiagram = DiagramUtils.getNotationDiagram(getModelSet(), DIAGRAM_MAIN_NAME);
+		getPageManager().openPage(mainDiagram);
+		Assert.assertEquals("current opened diagram is not the expected one", mainDiagram.getName(), DIAGRAM_MAIN_NAME);
+
+		// check css is working
+		Assert.assertTrue("CSS is not supported on the given model", CSSHelper.isCSSSupported(getModelSet()));
+		Shape package1View = DiagramUtils.findShape(mainDiagram, PACKAGE1);
+		if(package1View == null) {
+			return;
+		}
+		checkPackage1CSS(package1View);
+
+		// delete P1
+		// get edit part for this view and send a delete request
+		IGraphicalEditPart packageEditPart = DiagramUtils.findEditPartforView(editor, package1View, IGraphicalEditPart.class);
+		Assert.assertNotNull("Impossible to find package edit part", packageEditPart);
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = packageEditPart.getCommand(deleteViewRequest);
+		assertNotNull("Impossible to create a delete command", command);
+		Assert.assertNotEquals("This should not be an unexecutable command", command, UnexecutableCommand.INSTANCE);
+		assertTrue("command should be executable", command.canExecute());
+		execute(command);
+		Assert.assertNull("There should be no shape for this element: " + PACKAGE1, DiagramUtils.findShape(mainDiagram, PACKAGE1));
+
+		// undo
+		undo();
+
+		// check css on P1
+		Shape newPackage1View = DiagramUtils.findShape(mainDiagram, PACKAGE1);
+		Assert.assertNotNull("There should be a shape for this element: " + PACKAGE1, newPackage1View);
+		checkPackage1CSS(newPackage1View);
+
+	}
+
+	/**
+	 * Test with a {@link Package} with a css style already applied
+	 */
+	@Test
+	public void testDeleteOnClassNamedStyleFont() throws Exception {
+		// check css on the class ClassNamedStyleFont
+		Assert.assertNotNull("RootModel is null", getRootUMLModel());
+
+		Diagram mainDiagram = DiagramUtils.getNotationDiagram(getModelSet(), DIAGRAM_MAIN_NAME);
+		getPageManager().openPage(mainDiagram);
+		Assert.assertEquals("current opened diagram is not the expected one", mainDiagram.getName(), DIAGRAM_MAIN_NAME);
+
+		// check css is working
+		Assert.assertTrue("CSS is not supported on the given model", CSSHelper.isCSSSupported(getModelSet()));
+		Shape ClassNamedStyleFontView = DiagramUtils.findShape(mainDiagram, CLASS_NAMED_STYLE_FONT);
+		if(ClassNamedStyleFontView == null) {
+			return;
+		}
+		checkClassNamedStyleFontCSS(ClassNamedStyleFontView);
+
+		// delete ClassNamedStyleFont
+		// get edit part for this view and send a delete request
+		IGraphicalEditPart ClassNamedStyleFontEditPart = DiagramUtils.findEditPartforView(editor, ClassNamedStyleFontView, IGraphicalEditPart.class);
+		Assert.assertNotNull("Impossible to find the edit part", ClassNamedStyleFontEditPart);
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = ClassNamedStyleFontEditPart.getCommand(deleteViewRequest);
+		assertNotNull("Impossible to create a delete command", command);
+		Assert.assertNotEquals("This should not be an unexecutable command", command, UnexecutableCommand.INSTANCE);
+		assertTrue("command should be executable", command.canExecute());
+		execute(command);
+		Assert.assertNull("There should be no shape for this element: " + CLASS_NAMED_STYLE_FONT, DiagramUtils.findShape(mainDiagram, CLASS_NAMED_STYLE_FONT));
+
+		// undo
+		undo();
+
+		// check css on the new view for ClassNamedStyleFont
+		Shape newClassNamedStyleFontView = DiagramUtils.findShape(mainDiagram, CLASS_NAMED_STYLE_FONT);
+		Assert.assertNotNull("There should be a shape for this element: " + CLASS_NAMED_STYLE_FONT, newClassNamedStyleFontView);
+		checkClassNamedStyleFontCSS(newClassNamedStyleFontView);
+
+	}
+
+	private void checkClassNamedStyleFontCSS(Shape classNamedStyleFontView) {
+		// default style: papyrus theme
+		Assert.assertEquals("Invalid Fill color (Default): " + DiagramUtils.integerToRGBString(classNamedStyleFontView.getFillColor()), DiagramUtils.rgb(195, 215, 221), classNamedStyleFontView.getFillColor()); // Papyrus Theme =
+		Assert.assertEquals("Gradient should be default (vertical)", classNamedStyleFontView.getGradient().getGradientStyle(), GradientStyle.VERTICAL); // Papyrus Theme =
+		Assert.assertEquals("Invalid Gradient Color (Default)", DiagramUtils.rgb(255, 255, 255), classNamedStyleFontView.getGradient().getGradientColor1()); // Papyrus Theme =
+
+		// named style: font color is white
+		Assert.assertEquals("Invalid Font Color", DiagramUtils.rgb(255, 255, 255), classNamedStyleFontView.getFontColor()); // White font by the named style
+	}
+
+	protected void checkPackage1CSS(Shape packageShape) {
+		// named style: fill red and horizontal green gradient
+		Assert.assertEquals("Invalid Fill color", DiagramUtils.rgb(255, 0, 0), packageShape.getFillColor()); //Red = #FF0000
+		Assert.assertEquals("Gradient should be horizontal", packageShape.getGradient().getGradientStyle(), GradientStyle.HORIZONTAL);
+		Assert.assertEquals("Invalid Gradient Color", DiagramUtils.rgb(0, 255, 0), packageShape.getGradient().getGradientColor1()); // GREEN
+
+		// unnamed style: font color is blue
+		Assert.assertEquals("Invalid gradient", DiagramUtils.rgb(0, 0, 255), packageShape.getFontColor()); // Blue font by the named style
+	}
+
+
+	@Override
+	protected String getSourcePath() {
+		return SOURCE_PATH;
+	}
+
+	@Override
+	protected Bundle getBundle() {
+		return org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getBundle();
+	}
+
+	/**
+	 * Call {@link AbstractPapyrusTestCase#execute(Command) execute} on the UI
+	 * thread.
+	 */
+	protected void executeOnUIThread(final Command command) {
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				execute(command);
+			}
+		});
+	}
+
+	/** Call {@link AbstractPapyrusTestCase#undo() undo} on the UI thread. */
+	protected void undoOnUIThread() {
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				undo();
+			}
+		});
+	}
+
+	/** Call {@link AbstractPapyrusTestCase#redo() redo} on the UI thread. */
+	protected void redoOnUIThread() {
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				redo();
+			}
+		});
+	}
+
+	protected void assertLastOperationSuccessful() {
+		Assert.assertFalse("The operation failed. Look at the log, or put a breakpoint on ExecutionException or DefaultOperationHistory#notifyNotOK to find the cause.", this.operationFailed);
+	}
+
+	/**
+	 * Reset the "operation failed" state. Call this before executing each
+	 * operation for which you want to test whether if failed with {@link AbstractPapyrusTestCase#assertLastOperationSuccessful()}.
+	 */
+	protected void resetLastOperationFailedState() {
+		this.operationFailed = false;
+	}
+
+	/** Execute the given command in the diagram editor. */
+	protected void execute(final Command command) {
+		resetLastOperationFailedState();
+		getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+		assertLastOperationSuccessful();
+	}
+
+	/** Undo the last command done in the diagram editor. */
+	protected void undo() {
+		resetLastOperationFailedState();
+		final CommandStack commandStack = getCommandStack();
+		Assert.assertTrue("We should be able to undo", commandStack.canUndo());
+		commandStack.undo();
+		assertLastOperationSuccessful();
+	}
+
+	/** Redo the last command undone in the diagram editor. */
+	protected void redo() {
+		resetLastOperationFailedState();
+		final CommandStack commandStack = getCommandStack();
+		Assert.assertTrue("We should be able to redo", commandStack.canRedo());
+		commandStack.redo();
+		assertLastOperationSuccessful();
+	}
+
+	/** The command stack to use to execute commands on the diagram. */
+	protected CommandStack getCommandStack() {
+		// not "diagramEditor.getDiagramEditDomain().getDiagramCommandStack()"
+		// because it messes up undo contexts
+		try {
+			return getTransactionalEditingDomain().getCommandStack();
+		} catch (ServiceException e) {
+			Assert.fail(e.getMessage());
+		}
+		return null;
+	}
+
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/HTMLCleanerTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/HTMLCleanerTestCase.java
index 7f8af6b32ac..527c3eefb87 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/HTMLCleanerTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/HTMLCleanerTestCase.java
@@ -1,234 +1,234 @@
-/*****************************************************************************

- * 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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.common.tests.parser;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.fail;

-

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.uml.diagram.common.parser.HTMLCleaner;

-import org.junit.Test;

-

-/**

- * Test Case n°1 for HTML CLeaner class

- */

-public class HTMLCleanerTestCase extends AbstractPapyrusTest {

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags1() {

-		final String test = "This is a simple example (no html).";

-		final String expectedResult = "This is a simple example (no html).";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags2() {

-		final String test = "<strong>P0_a &lt; nnotateC0</strong>";

-		final String expectedResult = "P0_a < nnotateC0";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags3() {

-		final String test = "<h3>This is the title</h3><p>This is a part of the body.</p><p>This is the second part of the body.</p><br /><br />";

-		final String expectedResult = "This is the title\nThis is a part of the body.\nThis is the second part of the body.\n";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags4() {

-		final String test = "<h3>\r\n" + "    Houston\r\n" + "</h3>";

-		final String expectedResult = " Houston\n";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags5() {

-		final String test = "";

-		final String expectedResult = "";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags6() {

-		final String test = "\n";

-		final String expectedResult = "";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags7() {

-		final String test = "&";

-		final String expectedResult = "&";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags8() {

-		final String test = "Houston & Ariane";

-		final String expectedResult = "Houston & Ariane";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags9() {

-		final String test = "&<h3>\r\n" + "    Houston\r\n" + "</h3>";

-		final String expectedResult = "& Houston\n";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags10() {

-		final String test = "<";

-		final String expectedResult = "<";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags11() {

-		final String test = "< toto";

-		final String expectedResult = "< toto";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags12() {

-		final String test = "< toto >";

-		final String expectedResult = "< toto >";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.

-	 */

-	@Test

-	public void testCleanHTMLTags13() {

-		final String test = "<test>some random text</test>";

-		final String expectedResult = "<test>some random text</test>";

-		String result = null;

-		try {

-			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));

-		} catch (Exception e) {

-			fail(e.getMessage());

-		}

-		assertEquals(expectedResult, result);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.tests.parser;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.uml.diagram.common.parser.HTMLCleaner;
+import org.junit.Test;
+
+/**
+ * Test Case n°1 for HTML CLeaner class
+ */
+public class HTMLCleanerTestCase extends AbstractPapyrusTest {
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags1() {
+		final String test = "This is a simple example (no html).";
+		final String expectedResult = "This is a simple example (no html).";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags2() {
+		final String test = "<strong>P0_a &lt; nnotateC0</strong>";
+		final String expectedResult = "P0_a < nnotateC0";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags3() {
+		final String test = "<h3>This is the title</h3><p>This is a part of the body.</p><p>This is the second part of the body.</p><br /><br />";
+		final String expectedResult = "This is the title\nThis is a part of the body.\nThis is the second part of the body.\n";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags4() {
+		final String test = "<h3>\r\n" + "    Houston\r\n" + "</h3>";
+		final String expectedResult = " Houston\n";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags5() {
+		final String test = "";
+		final String expectedResult = "";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags6() {
+		final String test = "\n";
+		final String expectedResult = "";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags7() {
+		final String test = "&";
+		final String expectedResult = "&";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags8() {
+		final String test = "Houston & Ariane";
+		final String expectedResult = "Houston & Ariane";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags9() {
+		final String test = "&<h3>\r\n" + "    Houston\r\n" + "</h3>";
+		final String expectedResult = "& Houston\n";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags10() {
+		final String test = "<";
+		final String expectedResult = "<";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags11() {
+		final String test = "< toto";
+		final String expectedResult = "< toto";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags12() {
+		final String test = "< toto >";
+		final String expectedResult = "< toto >";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.parser.HTMLCleaner#cleanHTMLTags(java.lang.String)}.
+	 */
+	@Test
+	public void testCleanHTMLTags13() {
+		final String test = "<test>some random text</test>";
+		final String expectedResult = "<test>some random text</test>";
+		String result = null;
+		try {
+			result = HTMLCleaner.removeHTMLTags(HTMLCleaner.preClean(test));
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+		assertEquals(expectedResult, result);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java
index 050722bea77..c017e39f6bd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java
@@ -1,269 +1,269 @@
-/*****************************************************************************

- * 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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - skip tests on Mac that use unavailable fonts

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.common.tests.parser;

-

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.draw2d.Figure;

-import org.eclipse.draw2d.text.FlowPage;

-import org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;

-import org.eclipse.papyrus.junit.framework.classification.rules.Condition;

-import org.eclipse.papyrus.junit.framework.classification.rules.Conditional;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.FontData;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-

-

-/**

- * Test Case for the class {@link HTMLCornerBentFigure}

- */

-@RunWith(ClassificationRunner.class)

-public class HTMLCornerBentFigureTestCase extends HTMLCornerBentFigure {

-

-	public final String TEST_CASE_1 = "not a html text";

-

-	public final String TEST_CASE_1_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : not a html text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	public final String TEST_CASE_2 = "text <strong>strong</strong> text";

-

-	public final String TEST_CASE_2_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : strong; Font : name=Arial; size=8; bold=true; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	public final String TEST_CASE_3 = "text <u>underline</u> text";

-

-	public final String TEST_CASE_3_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : underline; Font : name=Arial; size=8; bold=false; italic=false; underline= true}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	public final String TEST_CASE_4 = "text <strong><em><u>bold-underline</u></em></strong> text";

-

-	public final String TEST_CASE_4_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : bold-underline; Font : name=Arial; size=8; bold=true; italic=true; underline= true}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";;

-

-	public final String TEST_CASE_5 = "text <p>new paragraph</p> text";

-

-	public final String TEST_CASE_5_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : new paragraph; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	public final String TEST_CASE_6 = "text <p>1st paragraph</p><p>2nd paragraph</p>";

-

-	public final String TEST_CASE_6_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : 1st paragraph; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : 2nd paragraph; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	public final String TEST_CASE_7 = "text <p class=\"codeSample\">code sample</p> text";

-

-	public final String TEST_CASE_7_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : code sample; Font : name=Lucida Console; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	public final String TEST_CASE_8 = "text <p class=\"quote\">quote</p> text";

-

-	public final String TEST_CASE_8_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : quote; Font : name=Monotype Corsiva; size=10; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	public final String TEST_CASE_9 = "text <font face=\"Times New Roman\">specific font</font> text";

-

-	public final String TEST_CASE_9_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : specific font; Font : name=Times New Roman; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	public final String TEST_CASE_10 = "text <font size=\"6\">specific font size</font> text";

-

-	public final String TEST_CASE_10_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : specific font size; Font : name=Arial; size=16; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	public final String TEST_CASE_11 = "text <font face=\"Lucida Console\" size=\"5\">specific font size/kind</font> text";

-

-	public final String TEST_CASE_11_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : specific font size/kind; Font : name=Lucida Console; size=14; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";

-

-	@Condition

-	public final boolean notMac = !Platform.OS_MACOSX.equals(Platform.getOS());

-	

-	/**

-	 * @throws java.lang.Exception

-	 */

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	public void testGenerateBlockForText1() {

-		testGenerateBlockForText("No html test", TEST_CASE_1, TEST_CASE_1_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	public void testGenerateBlockForText2() {

-		testGenerateBlockForText("test for strong text", TEST_CASE_2, TEST_CASE_2_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	public void testGenerateBlockForText3() {

-		testGenerateBlockForText("test for underlined text", TEST_CASE_3, TEST_CASE_3_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	public void testGenerateBlockForText4() {

-		testGenerateBlockForText("test for emphasised text", TEST_CASE_4, TEST_CASE_4_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	public void testGenerateBlockForText5() {

-		testGenerateBlockForText("test for paragraph", TEST_CASE_5, TEST_CASE_5_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	public void testGenerateBlockForText6() {

-		testGenerateBlockForText("test for double paragraph", TEST_CASE_6, TEST_CASE_6_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	@Conditional(key="notMac")

-	public void testGenerateBlockForText7() {

-		testGenerateBlockForText("test for code Sample paragraph", TEST_CASE_7, TEST_CASE_7_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	@Conditional(key="notMac")

-	public void testGenerateBlockForText8() {

-		testGenerateBlockForText("test for quote paragraph", TEST_CASE_8, TEST_CASE_8_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	public void testGenerateBlockForText9() {

-		testGenerateBlockForText("test for font kind change", TEST_CASE_9, TEST_CASE_9_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	public void testGenerateBlockForText10() {

-		testGenerateBlockForText("test for font height change", TEST_CASE_10, TEST_CASE_10_EXPECTED);

-	}

-

-	/**

-	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.

-	 */

-	@Test

-	@Conditional(key="notMac")

-	public void testGenerateBlockForText11() {

-		testGenerateBlockForText("test for font height and kind", TEST_CASE_11, TEST_CASE_11_EXPECTED);

-	}

-

-	public void testGenerateBlockForText(String testName, String testString, String expectedString) {

-		// launch the method that should parse the element

-		FlowPage resultPage = new FlowPage();

-		this.generateBlockForText(testString, resultPage);

-		String resultPageString = generateTree(resultPage, "");

-

-		// test the differences

-		org.junit.Assert.assertEquals("\"" + testName + "\" did not match!", expectedString, resultPageString);

-

-	}

-

-	/**

-	 * Generates the result string from a Block Flow

-	 *

-	 * @param expectedResult

-	 *        the block flow to display

-	 * @return the result string from a Block Flow

-	 */

-	private String generateTree(Figure flow, String indent) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(indent);

-		buffer.append('[');

-		buffer.append(flow.getClass().getName());

-		if(flow instanceof TextFlowEx) {

-			buffer.append(" {");

-

-			buffer.append("Text : ");

-			buffer.append(((TextFlowEx)flow).getText());

-			buffer.append("; Font : ");

-			buffer.append(prettyPrint(((TextFlowEx)flow).getFont()));

-			buffer.append("; underline= ");

-			buffer.append(((TextFlowEx)flow).isTextUnderlined());

-			buffer.append("}");

-

-		}

-

-		buffer.append(']');

-		buffer.append('\n');

-

-		for(Object child : flow.getChildren()) {

-			// child should always be a figure

-			if(child instanceof Figure) {

-				buffer.append(generateTree((Figure)child, indent + "  "));

-			} else {

-				buffer.append(generateTree(child, indent + "  "));

-			}

-		}

-		return buffer.toString();

-	}

-

-	/**

-	 * @param font

-	 * @return

-	 */

-	private String prettyPrint(Font font) {

-		FontData data = font.getFontData()[0];

-		StringBuffer buffer = new StringBuffer();

-		buffer.append("name=");

-		buffer.append(data.getName());

-		buffer.append("; size=");

-		buffer.append(data.getHeight());

-		int style = data.getStyle();

-		buffer.append("; bold=");

-		buffer.append((style & SWT.BOLD) > 0);

-		buffer.append("; italic=");

-		buffer.append((style & SWT.ITALIC) > 0);

-		return buffer.toString();

-	}

-

-	/**

-	 * Generates the result string from a Block Flow

-	 *

-	 * @param expectedResult

-	 *        the block flow to display

-	 * @return the result string from a Block Flow

-	 */

-	private String generateTree(Object flow, String indent) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(indent);

-		buffer.append('[');

-		buffer.append(flow.toString());

-		buffer.append(']');

-		buffer.append('\n');

-		return buffer.toString();

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - skip tests on Mac that use unavailable fonts
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.tests.parser;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.draw2d.Figure;
+import org.eclipse.draw2d.text.FlowPage;
+import org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
+import org.eclipse.papyrus.junit.framework.classification.rules.Condition;
+import org.eclipse.papyrus.junit.framework.classification.rules.Conditional;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Test Case for the class {@link HTMLCornerBentFigure}
+ */
+@RunWith(ClassificationRunner.class)
+public class HTMLCornerBentFigureTestCase extends HTMLCornerBentFigure {
+
+	public final String TEST_CASE_1 = "not a html text";
+
+	public final String TEST_CASE_1_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : not a html text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	public final String TEST_CASE_2 = "text <strong>strong</strong> text";
+
+	public final String TEST_CASE_2_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : strong; Font : name=Arial; size=8; bold=true; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	public final String TEST_CASE_3 = "text <u>underline</u> text";
+
+	public final String TEST_CASE_3_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : underline; Font : name=Arial; size=8; bold=false; italic=false; underline= true}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	public final String TEST_CASE_4 = "text <strong><em><u>bold-underline</u></em></strong> text";
+
+	public final String TEST_CASE_4_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : bold-underline; Font : name=Arial; size=8; bold=true; italic=true; underline= true}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";;
+
+	public final String TEST_CASE_5 = "text <p>new paragraph</p> text";
+
+	public final String TEST_CASE_5_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : new paragraph; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	public final String TEST_CASE_6 = "text <p>1st paragraph</p><p>2nd paragraph</p>";
+
+	public final String TEST_CASE_6_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : 1st paragraph; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : 2nd paragraph; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	public final String TEST_CASE_7 = "text <p class=\"codeSample\">code sample</p> text";
+
+	public final String TEST_CASE_7_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : code sample; Font : name=Lucida Console; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	public final String TEST_CASE_8 = "text <p class=\"quote\">quote</p> text";
+
+	public final String TEST_CASE_8_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.draw2d.text.BlockFlow]\n" + "      [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : quote; Font : name=Monotype Corsiva; size=10; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	public final String TEST_CASE_9 = "text <font face=\"Times New Roman\">specific font</font> text";
+
+	public final String TEST_CASE_9_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : specific font; Font : name=Times New Roman; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	public final String TEST_CASE_10 = "text <font size=\"6\">specific font size</font> text";
+
+	public final String TEST_CASE_10_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : specific font size; Font : name=Arial; size=16; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	public final String TEST_CASE_11 = "text <font face=\"Lucida Console\" size=\"5\">specific font size/kind</font> text";
+
+	public final String TEST_CASE_11_EXPECTED = "[org.eclipse.draw2d.text.FlowPage]\n" + "  [org.eclipse.draw2d.text.BlockFlow]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : text ; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text : specific font size/kind; Font : name=Lucida Console; size=14; bold=false; italic=false; underline= false}]\n" + "    [org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx {Text :  text; Font : name=Arial; size=8; bold=false; italic=false; underline= false}]\n";
+
+	@Condition
+	public final boolean notMac = !Platform.OS_MACOSX.equals(Platform.getOS());
+	
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@Before
+	public void setUp() throws Exception {
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	public void testGenerateBlockForText1() {
+		testGenerateBlockForText("No html test", TEST_CASE_1, TEST_CASE_1_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	public void testGenerateBlockForText2() {
+		testGenerateBlockForText("test for strong text", TEST_CASE_2, TEST_CASE_2_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	public void testGenerateBlockForText3() {
+		testGenerateBlockForText("test for underlined text", TEST_CASE_3, TEST_CASE_3_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	public void testGenerateBlockForText4() {
+		testGenerateBlockForText("test for emphasised text", TEST_CASE_4, TEST_CASE_4_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	public void testGenerateBlockForText5() {
+		testGenerateBlockForText("test for paragraph", TEST_CASE_5, TEST_CASE_5_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	public void testGenerateBlockForText6() {
+		testGenerateBlockForText("test for double paragraph", TEST_CASE_6, TEST_CASE_6_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	@Conditional(key="notMac")
+	public void testGenerateBlockForText7() {
+		testGenerateBlockForText("test for code Sample paragraph", TEST_CASE_7, TEST_CASE_7_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	@Conditional(key="notMac")
+	public void testGenerateBlockForText8() {
+		testGenerateBlockForText("test for quote paragraph", TEST_CASE_8, TEST_CASE_8_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	public void testGenerateBlockForText9() {
+		testGenerateBlockForText("test for font kind change", TEST_CASE_9, TEST_CASE_9_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	public void testGenerateBlockForText10() {
+		testGenerateBlockForText("test for font height change", TEST_CASE_10, TEST_CASE_10_EXPECTED);
+	}
+
+	/**
+	 * Test method for {@link org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure#generateBlockForText(java.lang.String)}.
+	 */
+	@Test
+	@Conditional(key="notMac")
+	public void testGenerateBlockForText11() {
+		testGenerateBlockForText("test for font height and kind", TEST_CASE_11, TEST_CASE_11_EXPECTED);
+	}
+
+	public void testGenerateBlockForText(String testName, String testString, String expectedString) {
+		// launch the method that should parse the element
+		FlowPage resultPage = new FlowPage();
+		this.generateBlockForText(testString, resultPage);
+		String resultPageString = generateTree(resultPage, "");
+
+		// test the differences
+		org.junit.Assert.assertEquals("\"" + testName + "\" did not match!", expectedString, resultPageString);
+
+	}
+
+	/**
+	 * Generates the result string from a Block Flow
+	 *
+	 * @param expectedResult
+	 *        the block flow to display
+	 * @return the result string from a Block Flow
+	 */
+	private String generateTree(Figure flow, String indent) {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(indent);
+		buffer.append('[');
+		buffer.append(flow.getClass().getName());
+		if(flow instanceof TextFlowEx) {
+			buffer.append(" {");
+
+			buffer.append("Text : ");
+			buffer.append(((TextFlowEx)flow).getText());
+			buffer.append("; Font : ");
+			buffer.append(prettyPrint(((TextFlowEx)flow).getFont()));
+			buffer.append("; underline= ");
+			buffer.append(((TextFlowEx)flow).isTextUnderlined());
+			buffer.append("}");
+
+		}
+
+		buffer.append(']');
+		buffer.append('\n');
+
+		for(Object child : flow.getChildren()) {
+			// child should always be a figure
+			if(child instanceof Figure) {
+				buffer.append(generateTree((Figure)child, indent + "  "));
+			} else {
+				buffer.append(generateTree(child, indent + "  "));
+			}
+		}
+		return buffer.toString();
+	}
+
+	/**
+	 * @param font
+	 * @return
+	 */
+	private String prettyPrint(Font font) {
+		FontData data = font.getFontData()[0];
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("name=");
+		buffer.append(data.getName());
+		buffer.append("; size=");
+		buffer.append(data.getHeight());
+		int style = data.getStyle();
+		buffer.append("; bold=");
+		buffer.append((style & SWT.BOLD) > 0);
+		buffer.append("; italic=");
+		buffer.append((style & SWT.ITALIC) > 0);
+		return buffer.toString();
+	}
+
+	/**
+	 * Generates the result string from a Block Flow
+	 *
+	 * @param expectedResult
+	 *        the block flow to display
+	 * @return the result string from a Block Flow
+	 */
+	private String generateTree(Object flow, String indent) {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(indent);
+		buffer.append('[');
+		buffer.append(flow.toString());
+		buffer.append(']');
+		buffer.append('\n');
+		return buffer.toString();
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/MultiplicityStringFormatterTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/MultiplicityStringFormatterTestCase.java
index c1ed2c8acab..2d1f7092e1c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/MultiplicityStringFormatterTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/MultiplicityStringFormatterTestCase.java
@@ -1,236 +1,236 @@
-package org.eclipse.papyrus.uml.diagram.common.tests.parser;

-

-import static org.junit.Assert.assertEquals;

-

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;

-import org.eclipse.uml2.uml.LiteralInteger;

-import org.eclipse.uml2.uml.LiteralString;

-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

-import org.eclipse.uml2.uml.MultiplicityElement;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.ValueSpecification;

-import org.junit.Assert;

-import org.junit.Test;

-

-public class MultiplicityStringFormatterTestCase extends AbstractPapyrusTest {

-

-	private UMLFactory factory;

-

-	@Test

-	public void testMultiplicityLiteralLowerUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralUnlimitedNatural(5));

-		Assert.assertEquals("1..5", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityIntValues() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), 1, 5);

-		assertEquals("1..5", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityInfinityIntRange() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), 1, -1);

-		assertEquals("1..*", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityInfinityLiteralRange() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralUnlimitedNatural(-1));

-		assertEquals("1..*", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityInfinityLiteral() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(0), createLiteralUnlimitedNatural(-1));

-		assertEquals("*", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityInfinity() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), 0, -1);

-		assertEquals("*", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityEqualsLiteralLowerUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralUnlimitedNatural(1));

-		assertEquals("1", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityLiteralLowerEqualsUpperWithBrackets() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(2), createLiteralUnlimitedNatural(2));

-		assertEquals("[2]", getMultiplicityWithBrackets(element).trim());

-	}

-

-	@Test

-	public void testMultiplicityLowerEqualsUpperWithBrackets() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), 2, 2);

-		assertEquals("[2]", getMultiplicityWithBrackets(element).trim());

-	}

-

-	@Test

-	public void testMultiplicityStringLiteralEqualsWithBrackets() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("EXACT"), createLiteralString("EXACT"));

-		assertEquals("[EXACT]", getMultiplicityWithBrackets(element).trim());

-	}

-

-	@Test

-	public void testMultiplicityLiteralLowerIsNull() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), null, createLiteralString("UPPER"));

-		assertEquals("1..UPPER", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityLiteralUpperIsNull() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), null);

-		assertEquals("LOWER..1", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityLiteralLowerIntUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), 20);

-		assertEquals("LOWER..20", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityStringLiteralLowerIntLiteralUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), createLiteralUnlimitedNatural(20));

-		assertEquals("LOWER..20", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityIntLiteralLowerStringLiteralUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(10), createLiteralString("UPPER"));

-		assertEquals("10..UPPER", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityIntLowerStringLiteralUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), 10, createLiteralString("UPPER"));

-		assertEquals("10..UPPER", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityStringLiteralLowerLiteralInfinity() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), createLiteralUnlimitedNatural(-1));

-		assertEquals("LOWER..*", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityStringLiteralLowerInfinity() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), -1);

-		assertEquals("LOWER..*", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityIntLowerStringUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralString("1"));

-		assertEquals("1", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityInfinityIntLowerStringUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(-1), createLiteralString("1"));

-		assertEquals("-1..1", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityInfinityLowerUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), -1, -1);

-		assertEquals("-1", getMultiplicityWithoutBrackets(element));

-	}

-	

-	@Test

-	public void testMultiplicityIntLowerIntUpperInfinity() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), -2, -1);

-		assertEquals("-2..*", getMultiplicityWithoutBrackets(element));

-	}

-	

-	@Test

-	public void testMultiplicityInfinityIntLowerIntUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), -1, 1);

-		assertEquals("-1..1", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityDefault() {

-		assertEquals("1", getMultiplicityWithoutBrackets(createProperty()));

-	}

-

-	@Test

-	public void testMultiplicityStringLowerUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), createLiteralString("UPPER"));

-		assertEquals("LOWER..UPPER", getMultiplicityWithoutBrackets(element));

-	}

-

-	@Test

-	public void testMultiplicityStringInfinityLowerUpper() {

-		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("*"), createLiteralString("UPPER"));

-		assertEquals("", getMultiplicityWithoutBrackets(element));

-	}

-

-	private Property createProperty() {

-		return getFactory().createProperty();

-	}

-

-	private UMLFactory getFactory() {

-		if (factory == null) {

-			factory = UMLFactory.eINSTANCE;

-		}

-		return factory;

-	}

-

-	private String getMultiplicityWithoutBrackets(MultiplicityElement element) {

-		return MultiplicityElementUtil.formatMultiplicityNoBrackets(element);

-	}

-

-	private String getMultiplicityWithBrackets(MultiplicityElement element) {

-		return MultiplicityElementUtil.getMultiplicityAsString(element);

-	}

-

-	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, ValueSpecification lower, ValueSpecification upper) {

-		element.setLowerValue(lower);

-		element.setUpperValue(upper);

-		return element;

-	}

-

-	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, int lower, int upper) {

-		element.setLower(lower);

-		element.setUpper(upper);

-		return element;

-	}

-

-	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, ValueSpecification lower, int upper) {

-		element.setLowerValue(lower);

-		element.setUpper(upper);

-		return element;

-	}

-

-	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, int lower, ValueSpecification upper) {

-		element.setLower(lower);

-		element.setUpperValue(upper);

-		return element;

-	}

-

-	private LiteralInteger createLiteralInteger(int value) {

-		LiteralInteger result = getFactory().createLiteralInteger();

-		result.setValue(value);

-		return result;

-	}

-

-	private LiteralUnlimitedNatural createLiteralUnlimitedNatural(int value) {

-		LiteralUnlimitedNatural result = getFactory().createLiteralUnlimitedNatural();

-		result.setValue(value);

-		return result;

-	}

-

-	private LiteralString createLiteralString(String value) {

-		LiteralString result = getFactory().createLiteralString();

-		result.setValue(value);

-		return result;

-	}

-}

+package org.eclipse.papyrus.uml.diagram.common.tests.parser;
+
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;
+import org.eclipse.uml2.uml.LiteralInteger;
+import org.eclipse.uml2.uml.LiteralString;
+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;
+import org.eclipse.uml2.uml.MultiplicityElement;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.ValueSpecification;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class MultiplicityStringFormatterTestCase extends AbstractPapyrusTest {
+
+	private UMLFactory factory;
+
+	@Test
+	public void testMultiplicityLiteralLowerUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralUnlimitedNatural(5));
+		Assert.assertEquals("1..5", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityIntValues() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 1, 5);
+		assertEquals("1..5", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityInfinityIntRange() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 1, -1);
+		assertEquals("1..*", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityInfinityLiteralRange() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralUnlimitedNatural(-1));
+		assertEquals("1..*", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityInfinityLiteral() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(0), createLiteralUnlimitedNatural(-1));
+		assertEquals("*", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityInfinity() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 0, -1);
+		assertEquals("*", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityEqualsLiteralLowerUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralUnlimitedNatural(1));
+		assertEquals("1", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityLiteralLowerEqualsUpperWithBrackets() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(2), createLiteralUnlimitedNatural(2));
+		assertEquals("[2]", getMultiplicityWithBrackets(element).trim());
+	}
+
+	@Test
+	public void testMultiplicityLowerEqualsUpperWithBrackets() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 2, 2);
+		assertEquals("[2]", getMultiplicityWithBrackets(element).trim());
+	}
+
+	@Test
+	public void testMultiplicityStringLiteralEqualsWithBrackets() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("EXACT"), createLiteralString("EXACT"));
+		assertEquals("[EXACT]", getMultiplicityWithBrackets(element).trim());
+	}
+
+	@Test
+	public void testMultiplicityLiteralLowerIsNull() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), null, createLiteralString("UPPER"));
+		assertEquals("1..UPPER", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityLiteralUpperIsNull() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), null);
+		assertEquals("LOWER..1", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityLiteralLowerIntUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), 20);
+		assertEquals("LOWER..20", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityStringLiteralLowerIntLiteralUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), createLiteralUnlimitedNatural(20));
+		assertEquals("LOWER..20", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityIntLiteralLowerStringLiteralUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(10), createLiteralString("UPPER"));
+		assertEquals("10..UPPER", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityIntLowerStringLiteralUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), 10, createLiteralString("UPPER"));
+		assertEquals("10..UPPER", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityStringLiteralLowerLiteralInfinity() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), createLiteralUnlimitedNatural(-1));
+		assertEquals("LOWER..*", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityStringLiteralLowerInfinity() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), -1);
+		assertEquals("LOWER..*", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityIntLowerStringUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(1), createLiteralString("1"));
+		assertEquals("1", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityInfinityIntLowerStringUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralInteger(-1), createLiteralString("1"));
+		assertEquals("-1..1", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityInfinityLowerUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), -1, -1);
+		assertEquals("-1", getMultiplicityWithoutBrackets(element));
+	}
+	
+	@Test
+	public void testMultiplicityIntLowerIntUpperInfinity() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), -2, -1);
+		assertEquals("-2..*", getMultiplicityWithoutBrackets(element));
+	}
+	
+	@Test
+	public void testMultiplicityInfinityIntLowerIntUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), -1, 1);
+		assertEquals("-1..1", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityDefault() {
+		assertEquals("1", getMultiplicityWithoutBrackets(createProperty()));
+	}
+
+	@Test
+	public void testMultiplicityStringLowerUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("LOWER"), createLiteralString("UPPER"));
+		assertEquals("LOWER..UPPER", getMultiplicityWithoutBrackets(element));
+	}
+
+	@Test
+	public void testMultiplicityStringInfinityLowerUpper() {
+		MultiplicityElement element = setupMultiplicityElement(createProperty(), createLiteralString("*"), createLiteralString("UPPER"));
+		assertEquals("", getMultiplicityWithoutBrackets(element));
+	}
+
+	private Property createProperty() {
+		return getFactory().createProperty();
+	}
+
+	private UMLFactory getFactory() {
+		if (factory == null) {
+			factory = UMLFactory.eINSTANCE;
+		}
+		return factory;
+	}
+
+	private String getMultiplicityWithoutBrackets(MultiplicityElement element) {
+		return MultiplicityElementUtil.formatMultiplicityNoBrackets(element);
+	}
+
+	private String getMultiplicityWithBrackets(MultiplicityElement element) {
+		return MultiplicityElementUtil.getMultiplicityAsString(element);
+	}
+
+	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, ValueSpecification lower, ValueSpecification upper) {
+		element.setLowerValue(lower);
+		element.setUpperValue(upper);
+		return element;
+	}
+
+	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, int lower, int upper) {
+		element.setLower(lower);
+		element.setUpper(upper);
+		return element;
+	}
+
+	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, ValueSpecification lower, int upper) {
+		element.setLowerValue(lower);
+		element.setUpper(upper);
+		return element;
+	}
+
+	private MultiplicityElement setupMultiplicityElement(MultiplicityElement element, int lower, ValueSpecification upper) {
+		element.setLower(lower);
+		element.setUpperValue(upper);
+		return element;
+	}
+
+	private LiteralInteger createLiteralInteger(int value) {
+		LiteralInteger result = getFactory().createLiteralInteger();
+		result.setValue(value);
+		return result;
+	}
+
+	private LiteralUnlimitedNatural createLiteralUnlimitedNatural(int value) {
+		LiteralUnlimitedNatural result = getFactory().createLiteralUnlimitedNatural();
+		result.setValue(value);
+		return result;
+	}
+
+	private LiteralString createLiteralString(String value) {
+		LiteralString result = getFactory().createLiteralString();
+		result.setValue(value);
+		return result;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/ValueSpecificationUtilTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/ValueSpecificationUtilTestCase.java
index 779c786e31c..8aceb8f6432 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/ValueSpecificationUtilTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/parser/ValueSpecificationUtilTestCase.java
@@ -1,106 +1,106 @@
-package org.eclipse.papyrus.uml.diagram.common.tests.parser;

-

-import static org.junit.Assert.assertEquals;

-

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;

-import org.eclipse.uml2.uml.LiteralBoolean;

-import org.eclipse.uml2.uml.LiteralInteger;

-import org.eclipse.uml2.uml.LiteralNull;

-import org.eclipse.uml2.uml.LiteralReal;

-import org.eclipse.uml2.uml.LiteralString;

-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.junit.Assert;

-import org.junit.Test;

-

-public class ValueSpecificationUtilTestCase extends AbstractPapyrusTest {

-

-	private UMLFactory factory;

-

-	@Test

-	public void testLiteralInteger() {

-		Assert.assertEquals("1", ValueSpecificationUtil.getSpecificationValue(createLiteralInteger(1)));

-	}

-

-	@Test

-	public void testLiteralIntegerNegative() {

-		Assert.assertEquals("-1", ValueSpecificationUtil.getSpecificationValue(createLiteralInteger(-1)));

-	}

-

-	@Test

-	public void testLiteralUnlimitedNaturalInfinitive() {

-		assertEquals("*", ValueSpecificationUtil.getSpecificationValue(createLiteralUnlimitedNatural(-1)));

-	}

-

-	@Test

-	public void testLiteralUnlimitedNatural() {

-		assertEquals("100", ValueSpecificationUtil.getSpecificationValue(createLiteralUnlimitedNatural(100)));

-	}

-

-	@Test

-	public void testLiteralString() {

-		assertEquals("EXACT", ValueSpecificationUtil.getSpecificationValue(createLiteralString("EXACT")));

-	}

-

-	@Test

-	public void testLiteralBoolean() {

-		Assert.assertEquals("true", ValueSpecificationUtil.getSpecificationValue(createLiteralBoolean(true)));

-	}

-

-	@Test

-	public void testLiteralBooleanFalse() {

-		Assert.assertEquals("false", ValueSpecificationUtil.getSpecificationValue(createLiteralBoolean(false)));

-	}

-

-	@Test

-	public void testLiteralNull() {

-		assertEquals("", ValueSpecificationUtil.getSpecificationValue(createLiteralNull()));

-	}

-

-	@Test

-	public void testLiteralReal() {

-		assertEquals("0.5", ValueSpecificationUtil.getSpecificationValue(createLiteralReal(0.5)));

-	}

-

-	private UMLFactory getFactory() {

-		if (factory == null) {

-			factory = UMLFactory.eINSTANCE;

-		}

-		return factory;

-	}

-

-	private LiteralInteger createLiteralInteger(int value) {

-		LiteralInteger result = getFactory().createLiteralInteger();

-		result.setValue(value);

-		return result;

-	}

-

-	private LiteralUnlimitedNatural createLiteralUnlimitedNatural(int value) {

-		LiteralUnlimitedNatural result = getFactory().createLiteralUnlimitedNatural();

-		result.setValue(value);

-		return result;

-	}

-

-	private LiteralString createLiteralString(String value) {

-		LiteralString result = getFactory().createLiteralString();

-		result.setValue(value);

-		return result;

-	}

-

-	private LiteralBoolean createLiteralBoolean(boolean value) {

-		LiteralBoolean result = getFactory().createLiteralBoolean();

-		result.setValue(value);

-		return result;

-	}

-

-	private LiteralNull createLiteralNull() {

-		return getFactory().createLiteralNull();

-	}

-

-	private LiteralReal createLiteralReal(double value) {

-		LiteralReal result = getFactory().createLiteralReal();

-		result.setValue(value);

-		return result;

-	}

-}

+package org.eclipse.papyrus.uml.diagram.common.tests.parser;
+
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
+import org.eclipse.uml2.uml.LiteralBoolean;
+import org.eclipse.uml2.uml.LiteralInteger;
+import org.eclipse.uml2.uml.LiteralNull;
+import org.eclipse.uml2.uml.LiteralReal;
+import org.eclipse.uml2.uml.LiteralString;
+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ValueSpecificationUtilTestCase extends AbstractPapyrusTest {
+
+	private UMLFactory factory;
+
+	@Test
+	public void testLiteralInteger() {
+		Assert.assertEquals("1", ValueSpecificationUtil.getSpecificationValue(createLiteralInteger(1)));
+	}
+
+	@Test
+	public void testLiteralIntegerNegative() {
+		Assert.assertEquals("-1", ValueSpecificationUtil.getSpecificationValue(createLiteralInteger(-1)));
+	}
+
+	@Test
+	public void testLiteralUnlimitedNaturalInfinitive() {
+		assertEquals("*", ValueSpecificationUtil.getSpecificationValue(createLiteralUnlimitedNatural(-1)));
+	}
+
+	@Test
+	public void testLiteralUnlimitedNatural() {
+		assertEquals("100", ValueSpecificationUtil.getSpecificationValue(createLiteralUnlimitedNatural(100)));
+	}
+
+	@Test
+	public void testLiteralString() {
+		assertEquals("EXACT", ValueSpecificationUtil.getSpecificationValue(createLiteralString("EXACT")));
+	}
+
+	@Test
+	public void testLiteralBoolean() {
+		Assert.assertEquals("true", ValueSpecificationUtil.getSpecificationValue(createLiteralBoolean(true)));
+	}
+
+	@Test
+	public void testLiteralBooleanFalse() {
+		Assert.assertEquals("false", ValueSpecificationUtil.getSpecificationValue(createLiteralBoolean(false)));
+	}
+
+	@Test
+	public void testLiteralNull() {
+		assertEquals("", ValueSpecificationUtil.getSpecificationValue(createLiteralNull()));
+	}
+
+	@Test
+	public void testLiteralReal() {
+		assertEquals("0.5", ValueSpecificationUtil.getSpecificationValue(createLiteralReal(0.5)));
+	}
+
+	private UMLFactory getFactory() {
+		if (factory == null) {
+			factory = UMLFactory.eINSTANCE;
+		}
+		return factory;
+	}
+
+	private LiteralInteger createLiteralInteger(int value) {
+		LiteralInteger result = getFactory().createLiteralInteger();
+		result.setValue(value);
+		return result;
+	}
+
+	private LiteralUnlimitedNatural createLiteralUnlimitedNatural(int value) {
+		LiteralUnlimitedNatural result = getFactory().createLiteralUnlimitedNatural();
+		result.setValue(value);
+		return result;
+	}
+
+	private LiteralString createLiteralString(String value) {
+		LiteralString result = getFactory().createLiteralString();
+		result.setValue(value);
+		return result;
+	}
+
+	private LiteralBoolean createLiteralBoolean(boolean value) {
+		LiteralBoolean result = getFactory().createLiteralBoolean();
+		result.setValue(value);
+		return result;
+	}
+
+	private LiteralNull createLiteralNull() {
+		return getFactory().createLiteralNull();
+	}
+
+	private LiteralReal createLiteralReal(double value) {
+		LiteralReal result = getFactory().createLiteralReal();
+		result.setValue(value);
+		return result;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/stereotype/display/AppliedStereotypeDisplayStructureTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/stereotype/display/AppliedStereotypeDisplayStructureTest.java
index 2b942570df0..ffdf80dfc4f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/stereotype/display/AppliedStereotypeDisplayStructureTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/stereotype/display/AppliedStereotypeDisplayStructureTest.java
@@ -1,411 +1,411 @@
-/*****************************************************************************

- * 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:

- *   Celine JANSSENS (ALL4TEC) celine.janssens@all4tec.net - Initial API

- *   Celine JANSSENS (ALL4TEC) celine.janssens@all4tec.net - Bug 471337 : Stereotype Display Unit Tests

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.common.tests.stereotype.display;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.DecorationNode;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.DiagramUtils;

-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayUtil;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * This Class tests the Structure of a Nominal Case for the Stereotype Display

- * 

- * @author Céline JANSSENS

- *

- */

-@PluginResource("/resources/StereotypeDisplay/StereotypeDisplayModel.di")

-public class AppliedStereotypeDisplayStructureTest extends AbstractPapyrusTest {

-

-	/**

-	 * Stereotype Name

-	 */

-	private static final String STEREO_A = "stereoA";//$NON-NLS-1$

-

-	/**

-	 * First Property Name

-	 */

-	private static final String PROPERTY1 = "propertyA1";//$NON-NLS-1$

-

-	/**

-	 * Second Property Name

-	 */

-	private static final String PROPERTY2 = "propertyA2";//$NON-NLS-1$

-

-	/**

-	 * Diagram Name

-	 */

-	private static final String CLASS_DIAGRAM_NAME = "Class Diagram"; //$NON-NLS-1$

-

-	/**

-	 * Profile Name

-	 */

-	private static final String PROFILE_NAME = "NominalTestProfile";//$NON-NLS-1$

-

-	/**

-	 * Class name

-	 */

-	private static final String CLASS_NAME = "Class1";//$NON-NLS-1$

-

-

-	/** Model set rule to have an editing domain. */

-	@Rule

-	public final PapyrusEditorFixture editorFixture = new PapyrusEditorFixture();

-

-	/**

-	 * UML Element of the Class

-	 */

-	private Element element = null;

-

-	/**

-	 * One of the applied Stereotype

-	 */

-	private Stereotype stereotype = null;

-

-	/**

-	 * Notation view of the class editPart

-	 */

-	private View classView = null;

-

-	/**

-	 * Profile that has been applied

-	 */

-	private Profile profile = null;

-

-	/**

-	 * Transactional Domain

-	 */

-	private TransactionalEditingDomain domain = null;

-

-	/**

-	 * UML Property of the stereotype "stereoA"

-	 */

-	private Property prop1 = null;

-	private Property prop2 = null;

-

-	/**

-	 * Helper for Stereotype Display

-	 */

-	private StereotypeDisplayUtil helper = StereotypeDisplayUtil.getInstance();

-	/**

-	 * Helper for the Unit Test about Stereotype Display

-	 */

-	private AppliedStereotypeDisplayTestUtils testHelper = AppliedStereotypeDisplayTestUtils.getInstance();

-

-

-	/**

-	 * Initialization of members and diagram

-	 */

-	@Before

-	public void initialisation() {

-		// Verify if profile is correctly imported

-		Package model = editorFixture.getModel();

-		Assert.assertNotNull("The model cannot be null", model);

-		Assert.assertFalse(model.getProfileApplications().isEmpty());

-

-		// Initialize data for test case

-		element = model.getMember(CLASS_NAME);

-		Assert.assertTrue("The element is a UML Named Element", element instanceof NamedElement);

-		Assert.assertEquals("Element is not the one expected", CLASS_NAME, ((NamedElement) element).getName());

-

-		profile = model.getAppliedProfile(PROFILE_NAME);

-		Assert.assertEquals("Profile is not the one Expected", PROFILE_NAME, profile.getName());

-

-		domain = editorFixture.getEditingDomain();

-		Assert.assertNotNull("Domain should not be null", domain);

-

-		stereotype = profile.getOwnedStereotype(STEREO_A);

-		Assert.assertEquals("Stereotype is not the one expected", STEREO_A, stereotype.getName());

-

-		// Open the diagram

-		final Diagram mainDiagram = DiagramUtils.getNotationDiagram(editorFixture.getModelSet(), CLASS_DIAGRAM_NAME);

-		Assert.assertEquals("Current opened diagram is not the expected one", CLASS_DIAGRAM_NAME, mainDiagram.getName());

-		editorFixture.getPageManager().openPage(mainDiagram);

-		editorFixture.getPageManager().selectPage(mainDiagram);

-		editorFixture.flushDisplayEvents();

-

-		// Get the class view

-		classView = DiagramUtils.findShape(mainDiagram, CLASS_NAME);

-		Assert.assertNotNull("Class view not present", classView);

-

-		// Check that the stereotype is applied on the element.

-		Stereotype appliedStereotype = element.getAppliedStereotype(stereotype.getQualifiedName());

-		Assert.assertEquals("stereoA is applied on the element", stereotype, appliedStereotype);

-

-

-		// Check that the stereotype Contains the Expected Properties.

-		List<Property> properties = stereotype.getAllAttributes();

-

-		prop1 = stereotype.getAttribute(PROPERTY1, null);

-		prop2 = stereotype.getAttribute(PROPERTY2, null);

-

-		Assert.assertTrue("The Properties contains PropertyA1", properties.contains(prop1));

-		Assert.assertTrue("The Properties contains PropertyA2", properties.contains(prop2));

-

-	}

-

-	/**

-	 * Test the profile application of the Diagram

-	 */

-	@Test

-	public void testProfileApplication() {

-

-		// Check if the profile name is the one expected

-		Assert.assertEquals("The profile is not the one expected ", PROFILE_NAME, profile.getName());

-

-		// Check if the applied Profile is the good one

-		Assert.assertTrue("The Container has to be a Package", element.eContainer() instanceof org.eclipse.uml2.uml.Package);

-		Profile appliedProfile = ((org.eclipse.uml2.uml.Package) element.eContainer()).getAppliedProfile(PROFILE_NAME);

-		Assert.assertNotNull("The appliedProfile should not be null", appliedProfile);

-		Assert.assertEquals("The profile is not the one expected", profile, appliedProfile);

-	}

-

-	/**

-	 * Test the label structure into the notation model and the depth of this label

-	 */

-	@Test

-	public void testStereotypeLabelStructure() {

-

-		// Check that at least one label has been found for the specific Stereotype

-		View label = helper.getStereotypeLabel(classView, stereotype);

-		Assert.assertNotNull("Label should not be null", label);

-		Assert.assertTrue("The Label must be visible", label.isVisible());

-

-		// Check that there is as many label as appliedStereotypes.

-		List<View> list = testHelper.getAllLabel(classView);

-		Assert.assertEquals("There should have as many Labels as applied Stereotypes", element.getAppliedStereotypes().size(), list.size());

-

-		// Test the depth of the Label

-		testStereotypeLabelDepth(label);

-	}

-

-	/**

-	 * Test the name of the Label depending on the depth

-	 * 

-	 * @param label

-	 *            The Label View of the related Stereotype "stereoA"

-	 */

-	private void testStereotypeLabelDepth(View label) {

-

-		// test the method getDepth

-		Assert.assertTrue("Label is a decoration Node", label instanceof DecorationNode);

-		String depth = helper.getDepth((DecorationNode) label);

-		Assert.assertEquals("The Depth is not the one expected", "none", depth);

-

-		// test the method getMinimumDepth

-		String minDepth = helper.getMinimumDepthName(stereotype.getQualifiedName());

-		Assert.assertEquals("The minimum depth is not the one expected ", "stereoA", minDepth);

-

-		// test the method getStereotypeNameWithDepth with different value

-		String fullName = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "full");

-		Assert.assertEquals("Label with depth full is not the one expected", PROFILE_NAME + "::" + STEREO_A, fullName);

-		String noneDepthName = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "none");

-		Assert.assertEquals("Label with depth none is not the one expected", "stereoA", noneDepthName);

-		String minusName = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "-1");

-		Assert.assertEquals("Label with depth -1 is not the one expected", STEREO_A, minusName);

-		String outOfBoundsDepth = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "25");

-		Assert.assertEquals("Label with depth 25 is not the one expected", PROFILE_NAME + "::" + STEREO_A, outOfBoundsDepth);

-		String outOfBoundsDepth2 = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "-17");

-		Assert.assertEquals("Label with depth -17 is not the one expected", STEREO_A, outOfBoundsDepth2);

-

-	}

-

-	/**

-	 * Test the structure of the Brace View

-	 */

-	@Test

-	public void testStereotypeBraceStructure() {

-

-		// Check that there is a Brace view for the Stereotype A

-		View brace = helper.getStereotypeBraceCompartment(classView, stereotype);

-		Assert.assertNotNull("Brace should not be null", brace);

-		Assert.assertFalse("The Brace properties must not be visible", brace.isVisible());

-

-		// Check that there is as many Brace compartment as appliedStereotypes.

-		List<View> list = testHelper.getAllBraceCompartment(classView);

-		Assert.assertEquals("There should have as many Labels as applied Stereotypes", element.getAppliedStereotypes().size(), list.size());

-		Assert.assertEquals("The Type of the Brace  View is not the one expected", "StereotypeBrace", brace.getType());

-

-

-	}

-

-	/**

-	 * Test the Brace properties Structure

-	 */

-	@Test

-	public void testStereotypeBracePropertyStructure() {

-		// Check that there is a Brace view for the Stereotype A

-		View brace = helper.getStereotypeBraceCompartment(classView, stereotype);

-		Assert.assertNotNull("Brace should not be null", brace);

-

-		// Check that there is a Property View related to the Prop1 property

-		View propertyViewInBrace = helper.getStereotypePropertyInBrace(classView, stereotype, prop1);

-		Assert.assertNotNull("Property View In Brace should not be null", propertyViewInBrace);

-		Assert.assertTrue("PropertyView must be visible by default", propertyViewInBrace.isVisible());

-		Assert.assertEquals("The Type of the Brace Property View is not the one expected", "StereotypePropertyBrace", propertyViewInBrace.getType());

-

-

-		// Check that the property is a Brace child.

-		Object parent = propertyViewInBrace.eContainer();

-		Assert.assertEquals("The Property should be contained into the Brace View", brace, parent);

-		Assert.assertFalse("The Property should be Transcient by default ", brace.getPersistedChildren().contains(propertyViewInBrace));

-		Assert.assertTrue("The Property should be Transcient by default ", brace.getTransientChildren().contains(propertyViewInBrace));

-

-	}

-

-

-	/**

-	 * Test The structure of the Compartment

-	 */

-	@Test

-	public void testStereotypeCompartmentStructure() {

-

-		// Check that there is a Compartment view for the Stereotype A

-		View compartment = helper.getStereotypeCompartment(classView, stereotype);

-		Assert.assertNotNull("Compartment should not be null", compartment);

-		Assert.assertFalse("The Brace properties must not be visible", compartment.isVisible());

-

-		// Check that there is as many compartment as appliedStereotypes.

-		List<View> list = testHelper.getAllCompartment(classView);

-		Assert.assertEquals("There should have as many Labels as applied Stereotypes", element.getAppliedStereotypes().size(), list.size());

-		Assert.assertEquals("The Type of the Compartment  View is not the one expected", "StereotypeCompartment", compartment.getType());

-

-	}

-

-

-	/**

-	 * Test that the Structure of the Property into the Compartment is correct

-	 */

-	@Test

-	public void testStereotypePropertyStructure() {

-		// Check that there is a compartment view for the Stereotype A

-		View compartment = helper.getStereotypeCompartment(classView, stereotype);

-		Assert.assertNotNull("Compartment should not be null", compartment);

-

-		// Check that there is a Property View related to the Prop1 property

-		View propertyView = helper.getStereotypePropertyInCompartment(classView, stereotype, prop1);

-		Assert.assertNotNull("Property View should not be null", propertyView);

-		Assert.assertTrue("Property View must be visible by default", propertyView.isVisible());

-		Assert.assertEquals("The Type of the Property  View is not the one expected", "StereotypeProperty", propertyView.getType());

-

-		// Check that the property is a compartment child.

-		Object parent = propertyView.eContainer();

-		Assert.assertEquals("The Property should be contained into the Compartment View", compartment, parent);

-		Assert.assertFalse("The Property should be Transcient by default ", compartment.getPersistedChildren().contains(propertyView));

-		Assert.assertTrue("The Property should be Transcient by default ", compartment.getTransientChildren().contains(propertyView));

-

-	}

-

-

-	/**

-	 * Test the structure of the Comment

-	 */

-	@Test

-	public void testStereotypeCommentStructure() {

-

-		// Check that there is a Comment view for the Stereotype A

-		View comment = helper.getStereotypeComment(classView);

-		Assert.assertNotNull("Comment should not be null", comment);

-		Assert.assertFalse("The Brace properties must not be visible", comment.isVisible());

-

-		// Check that there is only one comment by element

-		List<View> list = testHelper.getAllComment(classView);

-		Assert.assertEquals("There should have as many Labels as applied Stereotypes", 1, list.size());

-		Assert.assertEquals("The Type of the comment  View is not the one expected", "StereotypeComment", comment.getType());

-

-		// Check that there is only 1 comment for the diagram.

-		List<View> listOfAllComment = testHelper.getAllComment(classView.getDiagram());

-		Assert.assertNotNull(listOfAllComment);

-		Assert.assertEquals(1, listOfAllComment.size());

-

-

-		// Check that the element on which the comment is based exists.

-		for (View view : listOfAllComment) {

-

-			EObject baseElement = NotationUtils.getEObjectValue(view, StereotypeDisplayConstant.STEREOTYPE_COMMENT_RELATION_NAME, null);

-			Assert.assertNotNull(baseElement);

-			Assert.assertEquals(0, view.getSourceEdges().size());

-			Assert.assertEquals(1, view.getTargetEdges().size());

-		}

-

-	}

-

-	/**

-	 * Test that the Structure of the Property into the Compartment is correct

-	 */

-	@Test

-	public void testStereotypeCompartmentInCommentStructure() {

-		// Check that there is a Comment view for the Stereotype A

-		View comment = helper.getStereotypeComment(classView);

-		Assert.assertNotNull("Comment should not be null", comment);

-		Assert.assertFalse("The Brace properties must not be visible", comment.isVisible());

-

-		// Check that there is a Compartment view for the Stereotype A

-		View compartment = helper.getStereotypeCompartment(comment, stereotype);

-		Assert.assertNotNull("Compartment should not be null", compartment);

-		Assert.assertFalse("The Brace properties must not be visible", compartment.isVisible());

-

-		// Check that there is as many compartment as appliedStereotypes.

-		List<View> list = testHelper.getAllCompartment(classView);

-		Assert.assertEquals("There should have as many Labels as applied Stereotypes", element.getAppliedStereotypes().size(), list.size());

-		Assert.assertEquals("The Type of the Compartment  View is not the one expected", "StereotypeCompartment", compartment.getType());

-

-	}

-

-	/**

-	 * Test that the Structure of the Property into the Compartment is correct

-	 */

-	@Test

-	public void testStereotypePropertyInCommentStructure() {

-		// Check that there is a compartment view for the Stereotype A

-		View comment = helper.getStereotypeComment(classView);

-		View compartment = helper.getStereotypeCompartment(comment, stereotype);

-		Assert.assertNotNull("Compartment should not be null", compartment);

-

-		// Check that there is a Property View related to the Prop1 property

-		View propertyView = helper.getStereotypePropertyInComment(classView, stereotype, prop1);

-		Assert.assertNotNull("Property View should not be null", propertyView);

-		Assert.assertTrue("Property View must be visible by default", propertyView.isVisible());

-		Assert.assertEquals("The Type of the Property  View is not the one expected", "StereotypeProperty", propertyView.getType());

-

-		// Check that the property is a compartment child.

-		Object parent = propertyView.eContainer();

-		Assert.assertEquals("The Property should be contained into the Compartment View", compartment, parent);

-		Assert.assertFalse("The Property should be Transcient by default ", compartment.getPersistedChildren().contains(propertyView));

-		Assert.assertTrue("The Property should be Transcient by default ", compartment.getTransientChildren().contains(propertyView));

-

-	}

-

-

-}

+/*****************************************************************************
+ * 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:
+ *   Celine JANSSENS (ALL4TEC) celine.janssens@all4tec.net - Initial API
+ *   Celine JANSSENS (ALL4TEC) celine.janssens@all4tec.net - Bug 471337 : Stereotype Display Unit Tests
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.common.tests.stereotype.display;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.DiagramUtils;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayUtil;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * This Class tests the Structure of a Nominal Case for the Stereotype Display
+ * 
+ * @author Céline JANSSENS
+ *
+ */
+@PluginResource("/resources/StereotypeDisplay/StereotypeDisplayModel.di")
+public class AppliedStereotypeDisplayStructureTest extends AbstractPapyrusTest {
+
+	/**
+	 * Stereotype Name
+	 */
+	private static final String STEREO_A = "stereoA";//$NON-NLS-1$
+
+	/**
+	 * First Property Name
+	 */
+	private static final String PROPERTY1 = "propertyA1";//$NON-NLS-1$
+
+	/**
+	 * Second Property Name
+	 */
+	private static final String PROPERTY2 = "propertyA2";//$NON-NLS-1$
+
+	/**
+	 * Diagram Name
+	 */
+	private static final String CLASS_DIAGRAM_NAME = "Class Diagram"; //$NON-NLS-1$
+
+	/**
+	 * Profile Name
+	 */
+	private static final String PROFILE_NAME = "NominalTestProfile";//$NON-NLS-1$
+
+	/**
+	 * Class name
+	 */
+	private static final String CLASS_NAME = "Class1";//$NON-NLS-1$
+
+
+	/** Model set rule to have an editing domain. */
+	@Rule
+	public final PapyrusEditorFixture editorFixture = new PapyrusEditorFixture();
+
+	/**
+	 * UML Element of the Class
+	 */
+	private Element element = null;
+
+	/**
+	 * One of the applied Stereotype
+	 */
+	private Stereotype stereotype = null;
+
+	/**
+	 * Notation view of the class editPart
+	 */
+	private View classView = null;
+
+	/**
+	 * Profile that has been applied
+	 */
+	private Profile profile = null;
+
+	/**
+	 * Transactional Domain
+	 */
+	private TransactionalEditingDomain domain = null;
+
+	/**
+	 * UML Property of the stereotype "stereoA"
+	 */
+	private Property prop1 = null;
+	private Property prop2 = null;
+
+	/**
+	 * Helper for Stereotype Display
+	 */
+	private StereotypeDisplayUtil helper = StereotypeDisplayUtil.getInstance();
+	/**
+	 * Helper for the Unit Test about Stereotype Display
+	 */
+	private AppliedStereotypeDisplayTestUtils testHelper = AppliedStereotypeDisplayTestUtils.getInstance();
+
+
+	/**
+	 * Initialization of members and diagram
+	 */
+	@Before
+	public void initialisation() {
+		// Verify if profile is correctly imported
+		Package model = editorFixture.getModel();
+		Assert.assertNotNull("The model cannot be null", model);
+		Assert.assertFalse(model.getProfileApplications().isEmpty());
+
+		// Initialize data for test case
+		element = model.getMember(CLASS_NAME);
+		Assert.assertTrue("The element is a UML Named Element", element instanceof NamedElement);
+		Assert.assertEquals("Element is not the one expected", CLASS_NAME, ((NamedElement) element).getName());
+
+		profile = model.getAppliedProfile(PROFILE_NAME);
+		Assert.assertEquals("Profile is not the one Expected", PROFILE_NAME, profile.getName());
+
+		domain = editorFixture.getEditingDomain();
+		Assert.assertNotNull("Domain should not be null", domain);
+
+		stereotype = profile.getOwnedStereotype(STEREO_A);
+		Assert.assertEquals("Stereotype is not the one expected", STEREO_A, stereotype.getName());
+
+		// Open the diagram
+		final Diagram mainDiagram = DiagramUtils.getNotationDiagram(editorFixture.getModelSet(), CLASS_DIAGRAM_NAME);
+		Assert.assertEquals("Current opened diagram is not the expected one", CLASS_DIAGRAM_NAME, mainDiagram.getName());
+		editorFixture.getPageManager().openPage(mainDiagram);
+		editorFixture.getPageManager().selectPage(mainDiagram);
+		editorFixture.flushDisplayEvents();
+
+		// Get the class view
+		classView = DiagramUtils.findShape(mainDiagram, CLASS_NAME);
+		Assert.assertNotNull("Class view not present", classView);
+
+		// Check that the stereotype is applied on the element.
+		Stereotype appliedStereotype = element.getAppliedStereotype(stereotype.getQualifiedName());
+		Assert.assertEquals("stereoA is applied on the element", stereotype, appliedStereotype);
+
+
+		// Check that the stereotype Contains the Expected Properties.
+		List<Property> properties = stereotype.getAllAttributes();
+
+		prop1 = stereotype.getAttribute(PROPERTY1, null);
+		prop2 = stereotype.getAttribute(PROPERTY2, null);
+
+		Assert.assertTrue("The Properties contains PropertyA1", properties.contains(prop1));
+		Assert.assertTrue("The Properties contains PropertyA2", properties.contains(prop2));
+
+	}
+
+	/**
+	 * Test the profile application of the Diagram
+	 */
+	@Test
+	public void testProfileApplication() {
+
+		// Check if the profile name is the one expected
+		Assert.assertEquals("The profile is not the one expected ", PROFILE_NAME, profile.getName());
+
+		// Check if the applied Profile is the good one
+		Assert.assertTrue("The Container has to be a Package", element.eContainer() instanceof org.eclipse.uml2.uml.Package);
+		Profile appliedProfile = ((org.eclipse.uml2.uml.Package) element.eContainer()).getAppliedProfile(PROFILE_NAME);
+		Assert.assertNotNull("The appliedProfile should not be null", appliedProfile);
+		Assert.assertEquals("The profile is not the one expected", profile, appliedProfile);
+	}
+
+	/**
+	 * Test the label structure into the notation model and the depth of this label
+	 */
+	@Test
+	public void testStereotypeLabelStructure() {
+
+		// Check that at least one label has been found for the specific Stereotype
+		View label = helper.getStereotypeLabel(classView, stereotype);
+		Assert.assertNotNull("Label should not be null", label);
+		Assert.assertTrue("The Label must be visible", label.isVisible());
+
+		// Check that there is as many label as appliedStereotypes.
+		List<View> list = testHelper.getAllLabel(classView);
+		Assert.assertEquals("There should have as many Labels as applied Stereotypes", element.getAppliedStereotypes().size(), list.size());
+
+		// Test the depth of the Label
+		testStereotypeLabelDepth(label);
+	}
+
+	/**
+	 * Test the name of the Label depending on the depth
+	 * 
+	 * @param label
+	 *            The Label View of the related Stereotype "stereoA"
+	 */
+	private void testStereotypeLabelDepth(View label) {
+
+		// test the method getDepth
+		Assert.assertTrue("Label is a decoration Node", label instanceof DecorationNode);
+		String depth = helper.getDepth((DecorationNode) label);
+		Assert.assertEquals("The Depth is not the one expected", "none", depth);
+
+		// test the method getMinimumDepth
+		String minDepth = helper.getMinimumDepthName(stereotype.getQualifiedName());
+		Assert.assertEquals("The minimum depth is not the one expected ", "stereoA", minDepth);
+
+		// test the method getStereotypeNameWithDepth with different value
+		String fullName = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "full");
+		Assert.assertEquals("Label with depth full is not the one expected", PROFILE_NAME + "::" + STEREO_A, fullName);
+		String noneDepthName = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "none");
+		Assert.assertEquals("Label with depth none is not the one expected", "stereoA", noneDepthName);
+		String minusName = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "-1");
+		Assert.assertEquals("Label with depth -1 is not the one expected", STEREO_A, minusName);
+		String outOfBoundsDepth = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "25");
+		Assert.assertEquals("Label with depth 25 is not the one expected", PROFILE_NAME + "::" + STEREO_A, outOfBoundsDepth);
+		String outOfBoundsDepth2 = helper.getStereotypeNameWithDepth(stereotype.getQualifiedName(), "-17");
+		Assert.assertEquals("Label with depth -17 is not the one expected", STEREO_A, outOfBoundsDepth2);
+
+	}
+
+	/**
+	 * Test the structure of the Brace View
+	 */
+	@Test
+	public void testStereotypeBraceStructure() {
+
+		// Check that there is a Brace view for the Stereotype A
+		View brace = helper.getStereotypeBraceCompartment(classView, stereotype);
+		Assert.assertNotNull("Brace should not be null", brace);
+		Assert.assertFalse("The Brace properties must not be visible", brace.isVisible());
+
+		// Check that there is as many Brace compartment as appliedStereotypes.
+		List<View> list = testHelper.getAllBraceCompartment(classView);
+		Assert.assertEquals("There should have as many Labels as applied Stereotypes", element.getAppliedStereotypes().size(), list.size());
+		Assert.assertEquals("The Type of the Brace  View is not the one expected", "StereotypeBrace", brace.getType());
+
+
+	}
+
+	/**
+	 * Test the Brace properties Structure
+	 */
+	@Test
+	public void testStereotypeBracePropertyStructure() {
+		// Check that there is a Brace view for the Stereotype A
+		View brace = helper.getStereotypeBraceCompartment(classView, stereotype);
+		Assert.assertNotNull("Brace should not be null", brace);
+
+		// Check that there is a Property View related to the Prop1 property
+		View propertyViewInBrace = helper.getStereotypePropertyInBrace(classView, stereotype, prop1);
+		Assert.assertNotNull("Property View In Brace should not be null", propertyViewInBrace);
+		Assert.assertTrue("PropertyView must be visible by default", propertyViewInBrace.isVisible());
+		Assert.assertEquals("The Type of the Brace Property View is not the one expected", "StereotypePropertyBrace", propertyViewInBrace.getType());
+
+
+		// Check that the property is a Brace child.
+		Object parent = propertyViewInBrace.eContainer();
+		Assert.assertEquals("The Property should be contained into the Brace View", brace, parent);
+		Assert.assertFalse("The Property should be Transcient by default ", brace.getPersistedChildren().contains(propertyViewInBrace));
+		Assert.assertTrue("The Property should be Transcient by default ", brace.getTransientChildren().contains(propertyViewInBrace));
+
+	}
+
+
+	/**
+	 * Test The structure of the Compartment
+	 */
+	@Test
+	public void testStereotypeCompartmentStructure() {
+
+		// Check that there is a Compartment view for the Stereotype A
+		View compartment = helper.getStereotypeCompartment(classView, stereotype);
+		Assert.assertNotNull("Compartment should not be null", compartment);
+		Assert.assertFalse("The Brace properties must not be visible", compartment.isVisible());
+
+		// Check that there is as many compartment as appliedStereotypes.
+		List<View> list = testHelper.getAllCompartment(classView);
+		Assert.assertEquals("There should have as many Labels as applied Stereotypes", element.getAppliedStereotypes().size(), list.size());
+		Assert.assertEquals("The Type of the Compartment  View is not the one expected", "StereotypeCompartment", compartment.getType());
+
+	}
+
+
+	/**
+	 * Test that the Structure of the Property into the Compartment is correct
+	 */
+	@Test
+	public void testStereotypePropertyStructure() {
+		// Check that there is a compartment view for the Stereotype A
+		View compartment = helper.getStereotypeCompartment(classView, stereotype);
+		Assert.assertNotNull("Compartment should not be null", compartment);
+
+		// Check that there is a Property View related to the Prop1 property
+		View propertyView = helper.getStereotypePropertyInCompartment(classView, stereotype, prop1);
+		Assert.assertNotNull("Property View should not be null", propertyView);
+		Assert.assertTrue("Property View must be visible by default", propertyView.isVisible());
+		Assert.assertEquals("The Type of the Property  View is not the one expected", "StereotypeProperty", propertyView.getType());
+
+		// Check that the property is a compartment child.
+		Object parent = propertyView.eContainer();
+		Assert.assertEquals("The Property should be contained into the Compartment View", compartment, parent);
+		Assert.assertFalse("The Property should be Transcient by default ", compartment.getPersistedChildren().contains(propertyView));
+		Assert.assertTrue("The Property should be Transcient by default ", compartment.getTransientChildren().contains(propertyView));
+
+	}
+
+
+	/**
+	 * Test the structure of the Comment
+	 */
+	@Test
+	public void testStereotypeCommentStructure() {
+
+		// Check that there is a Comment view for the Stereotype A
+		View comment = helper.getStereotypeComment(classView);
+		Assert.assertNotNull("Comment should not be null", comment);
+		Assert.assertFalse("The Brace properties must not be visible", comment.isVisible());
+
+		// Check that there is only one comment by element
+		List<View> list = testHelper.getAllComment(classView);
+		Assert.assertEquals("There should have as many Labels as applied Stereotypes", 1, list.size());
+		Assert.assertEquals("The Type of the comment  View is not the one expected", "StereotypeComment", comment.getType());
+
+		// Check that there is only 1 comment for the diagram.
+		List<View> listOfAllComment = testHelper.getAllComment(classView.getDiagram());
+		Assert.assertNotNull(listOfAllComment);
+		Assert.assertEquals(1, listOfAllComment.size());
+
+
+		// Check that the element on which the comment is based exists.
+		for (View view : listOfAllComment) {
+
+			EObject baseElement = NotationUtils.getEObjectValue(view, StereotypeDisplayConstant.STEREOTYPE_COMMENT_RELATION_NAME, null);
+			Assert.assertNotNull(baseElement);
+			Assert.assertEquals(0, view.getSourceEdges().size());
+			Assert.assertEquals(1, view.getTargetEdges().size());
+		}
+
+	}
+
+	/**
+	 * Test that the Structure of the Property into the Compartment is correct
+	 */
+	@Test
+	public void testStereotypeCompartmentInCommentStructure() {
+		// Check that there is a Comment view for the Stereotype A
+		View comment = helper.getStereotypeComment(classView);
+		Assert.assertNotNull("Comment should not be null", comment);
+		Assert.assertFalse("The Brace properties must not be visible", comment.isVisible());
+
+		// Check that there is a Compartment view for the Stereotype A
+		View compartment = helper.getStereotypeCompartment(comment, stereotype);
+		Assert.assertNotNull("Compartment should not be null", compartment);
+		Assert.assertFalse("The Brace properties must not be visible", compartment.isVisible());
+
+		// Check that there is as many compartment as appliedStereotypes.
+		List<View> list = testHelper.getAllCompartment(classView);
+		Assert.assertEquals("There should have as many Labels as applied Stereotypes", element.getAppliedStereotypes().size(), list.size());
+		Assert.assertEquals("The Type of the Compartment  View is not the one expected", "StereotypeCompartment", compartment.getType());
+
+	}
+
+	/**
+	 * Test that the Structure of the Property into the Compartment is correct
+	 */
+	@Test
+	public void testStereotypePropertyInCommentStructure() {
+		// Check that there is a compartment view for the Stereotype A
+		View comment = helper.getStereotypeComment(classView);
+		View compartment = helper.getStereotypeCompartment(comment, stereotype);
+		Assert.assertNotNull("Compartment should not be null", compartment);
+
+		// Check that there is a Property View related to the Prop1 property
+		View propertyView = helper.getStereotypePropertyInComment(classView, stereotype, prop1);
+		Assert.assertNotNull("Property View should not be null", propertyView);
+		Assert.assertTrue("Property View must be visible by default", propertyView.isVisible());
+		Assert.assertEquals("The Type of the Property  View is not the one expected", "StereotypeProperty", propertyView.getType());
+
+		// Check that the property is a compartment child.
+		Object parent = propertyView.eContainer();
+		Assert.assertEquals("The Property should be contained into the Compartment View", compartment, parent);
+		Assert.assertFalse("The Property should be Transcient by default ", compartment.getPersistedChildren().contains(propertyView));
+		Assert.assertTrue("The Property should be Transcient by default ", compartment.getTransientChildren().contains(propertyView));
+
+	}
+
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/stereotype/display/AppliedStereotypeDisplayTestUtils.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/stereotype/display/AppliedStereotypeDisplayTestUtils.java
index 6ae71171045..e44eabe0a44 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/stereotype/display/AppliedStereotypeDisplayTestUtils.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/stereotype/display/AppliedStereotypeDisplayTestUtils.java
@@ -1,179 +1,179 @@
-/*****************************************************************************

- * 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.uml.diagram.common.tests.stereotype.display;

-

-import java.util.ArrayList;

-import java.util.List;

-

-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.gmfdiag.common.model.NotationUtils;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-import org.eclipse.uml2.uml.Element;

-import org.junit.Assert;

-

-/**

- * @author Céline JANSSENS

- *

- */

-public class AppliedStereotypeDisplayTestUtils {

-

-

-	/**

-	 * singleton instance

-	 */

-	private static AppliedStereotypeDisplayTestUtils labelHelper;

-

-	/** Singleton contructor */

-	private AppliedStereotypeDisplayTestUtils() {

-	}

-

-	/**

-	 * Returns the singleton instance of this class

-	 *

-	 * @return the singleton instance.

-	 */

-	public static AppliedStereotypeDisplayTestUtils getInstance() {

-		if (labelHelper == null) {

-			labelHelper = new AppliedStereotypeDisplayTestUtils();

-		}

-		return labelHelper;

-	}

-

-	/**

-	 * Retrieve the list of all Label into a mainView.

-	 * 

-	 * @param mainView

-	 *            The view on which the stereotype is applied.

-	 * @return the list of all children of type StereotypeLabel

-	 */

-	public List<View> getAllLabel(View mainView) {

-		List<View> labelList = new ArrayList<View>();

-

-		for (Object object : mainView.getChildren()) {

-			if (object instanceof View) {

-				if (((View) object).getType().equals("StereotypeLabel")) {

-					labelList.add((View) object);

-				}

-			}

-		}

-

-		return labelList;

-

-	}

-

-

-	/**

-	 * Retrieve the list of all Brace Compartment into a mainView.

-	 * 

-	 * @param mainView

-	 *            The view on which the stereotype is applied.

-	 * @return the list of all children of type StereotypeBrace

-	 */

-	public List<View> getAllBraceCompartment(View mainView) {

-		List<View> braceList = new ArrayList<View>();

-

-		for (Object object : mainView.getChildren()) {

-			if (object instanceof View) {

-				if (((View) object).getType().equals("StereotypeBrace")) {

-					braceList.add((View) object);

-				}

-			}

-		}

-

-		return braceList;

-

-	}

-

-	/**

-	 * Retrieve the list of all Compartment into a mainView.

-	 * 

-	 * @param mainView

-	 *            The view on which the stereotype is applied.

-	 * @return the list of all children of type StereotypeCompartment"

-	 */

-	public List<View> getAllCompartment(View mainView) {

-		List<View> compartmentList = new ArrayList<View>();

-

-		for (Object object : mainView.getChildren()) {

-			if (object instanceof View) {

-				if (((View) object).getType().equals("StereotypeCompartment")) {

-					compartmentList.add((View) object);

-				}

-			}

-		}

-

-		return compartmentList;

-

-	}

-

-	/**

-	 * Retrieve all the Comment of a diagram.

-	 * 

-	 * @param diagram

-	 *            The diagram

-	 * @return list of all StereotypeComment View

-	 * 

-	 * 

-	 */

-	public List<View> getAllComment(Diagram diagram) {

-		List<View> commentList = new ArrayList<View>();

-

-		for (Object object : diagram.getChildren()) {

-			if (object instanceof View) {

-				if (((View) object).getType().equals("StereotypeComment")) {

-					commentList.add((View) object);

-				}

-			}

-		}

-

-

-		return commentList;

-	}

-

-	/**

-	 * Retrieve the list of all Comment related to a mainView.

-	 * 

-	 * @param mainView

-	 *            The view on which the stereotype is applied.

-	 * @return the list of all children of type StereotypeBrace

-	 */

-	public List<View> getAllComment(View mainView) {

-		List<View> commentList = new ArrayList<View>();

-

-		EObject element = mainView.getElement();

-		Assert.assertTrue(element instanceof Element);

-

-		Assert.assertTrue("Main view Container must be a View", mainView.eContainer() instanceof View);

-		View container = (View) mainView.eContainer();

-

-		for (Object object : container.getChildren()) {

-			if (object instanceof View) {

-				if (((View) object).getType().equals("StereotypeComment")) {

-					EObject baseElement = NotationUtils.getEObjectValue((View) object, StereotypeDisplayConstant.STEREOTYPE_COMMENT_RELATION_NAME, null);

-					if (baseElement instanceof Element && baseElement.equals(element)) {

-

-						commentList.add((View) object);

-					}

-

-				}

-			}

-		}

-

-

-		return commentList;

-

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.common.tests.stereotype.display;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
+import org.eclipse.uml2.uml.Element;
+import org.junit.Assert;
+
+/**
+ * @author Céline JANSSENS
+ *
+ */
+public class AppliedStereotypeDisplayTestUtils {
+
+
+	/**
+	 * singleton instance
+	 */
+	private static AppliedStereotypeDisplayTestUtils labelHelper;
+
+	/** Singleton contructor */
+	private AppliedStereotypeDisplayTestUtils() {
+	}
+
+	/**
+	 * Returns the singleton instance of this class
+	 *
+	 * @return the singleton instance.
+	 */
+	public static AppliedStereotypeDisplayTestUtils getInstance() {
+		if (labelHelper == null) {
+			labelHelper = new AppliedStereotypeDisplayTestUtils();
+		}
+		return labelHelper;
+	}
+
+	/**
+	 * Retrieve the list of all Label into a mainView.
+	 * 
+	 * @param mainView
+	 *            The view on which the stereotype is applied.
+	 * @return the list of all children of type StereotypeLabel
+	 */
+	public List<View> getAllLabel(View mainView) {
+		List<View> labelList = new ArrayList<View>();
+
+		for (Object object : mainView.getChildren()) {
+			if (object instanceof View) {
+				if (((View) object).getType().equals("StereotypeLabel")) {
+					labelList.add((View) object);
+				}
+			}
+		}
+
+		return labelList;
+
+	}
+
+
+	/**
+	 * Retrieve the list of all Brace Compartment into a mainView.
+	 * 
+	 * @param mainView
+	 *            The view on which the stereotype is applied.
+	 * @return the list of all children of type StereotypeBrace
+	 */
+	public List<View> getAllBraceCompartment(View mainView) {
+		List<View> braceList = new ArrayList<View>();
+
+		for (Object object : mainView.getChildren()) {
+			if (object instanceof View) {
+				if (((View) object).getType().equals("StereotypeBrace")) {
+					braceList.add((View) object);
+				}
+			}
+		}
+
+		return braceList;
+
+	}
+
+	/**
+	 * Retrieve the list of all Compartment into a mainView.
+	 * 
+	 * @param mainView
+	 *            The view on which the stereotype is applied.
+	 * @return the list of all children of type StereotypeCompartment"
+	 */
+	public List<View> getAllCompartment(View mainView) {
+		List<View> compartmentList = new ArrayList<View>();
+
+		for (Object object : mainView.getChildren()) {
+			if (object instanceof View) {
+				if (((View) object).getType().equals("StereotypeCompartment")) {
+					compartmentList.add((View) object);
+				}
+			}
+		}
+
+		return compartmentList;
+
+	}
+
+	/**
+	 * Retrieve all the Comment of a diagram.
+	 * 
+	 * @param diagram
+	 *            The diagram
+	 * @return list of all StereotypeComment View
+	 * 
+	 * 
+	 */
+	public List<View> getAllComment(Diagram diagram) {
+		List<View> commentList = new ArrayList<View>();
+
+		for (Object object : diagram.getChildren()) {
+			if (object instanceof View) {
+				if (((View) object).getType().equals("StereotypeComment")) {
+					commentList.add((View) object);
+				}
+			}
+		}
+
+
+		return commentList;
+	}
+
+	/**
+	 * Retrieve the list of all Comment related to a mainView.
+	 * 
+	 * @param mainView
+	 *            The view on which the stereotype is applied.
+	 * @return the list of all children of type StereotypeBrace
+	 */
+	public List<View> getAllComment(View mainView) {
+		List<View> commentList = new ArrayList<View>();
+
+		EObject element = mainView.getElement();
+		Assert.assertTrue(element instanceof Element);
+
+		Assert.assertTrue("Main view Container must be a View", mainView.eContainer() instanceof View);
+		View container = (View) mainView.eContainer();
+
+		for (Object object : container.getChildren()) {
+			if (object instanceof View) {
+				if (((View) object).getType().equals("StereotypeComment")) {
+					EObject baseElement = NotationUtils.getEObjectValue((View) object, StereotypeDisplayConstant.STEREOTYPE_COMMENT_RELATION_NAME, null);
+					if (baseElement instanceof Element && baseElement.equals(element)) {
+
+						commentList.add((View) object);
+					}
+
+				}
+			}
+		}
+
+
+		return commentList;
+
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug477133MovePropertyWithAssociation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug477133MovePropertyWithAssociation.java
index 5e5a0dba0a6..d0ed0078bfb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug477133MovePropertyWithAssociation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug477133MovePropertyWithAssociation.java
@@ -1,389 +1,389 @@
-/*****************************************************************************

- * 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:

- *  Patrick Tessier(CEA LIST) Patrick.Tessier@cea.fr - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.common.tests.tests;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.requests.ReconnectRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.DiagramUtils;

-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * The test class to verify that there is no regression in relation to Bug 477133.

- * bug 477133: when we move a property linked to an association the type is badly updated https://bugs.eclipse.org/bugs/show_bug.cgi?id=477133

- * For this test we do not load a model!

- * during the construction the member-end can be the inverse of end-types

- * 

- * @author Patrick Tessier

- */

-public class Bug477133MovePropertyWithAssociation extends AbstractPapyrusTest {

-

-	/** The model set fixture. */

-	@Rule

-	public final PapyrusEditorFixture modelSetFixture = new PapyrusEditorFixture();

-

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public Bug477133MovePropertyWithAssociation() {

-		super();

-	}

-

-	/**

-	 * Case of an association between A and B, end a is owned by Class B and end b is owned by the association. End a is navigable but not End b. Test changes A to C.

-	 */

-	@Test

-	@PluginResource("/resources/477133/model.di")

-	public void testUMLCase1() {

-

-		// Get data test

-		Association association = (Association) modelSetFixture.getModel().getMember("Association");

-		NamedElement target = modelSetFixture.getModel().getMember("C");

-		NamedElement source = modelSetFixture.getModel().getMember("A");

-		StructuredClassifier sourceAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("B");

-

-		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");

-		EditPart targetEP = getEditPart(target, diagram);

-

-		// Build a request and execute it

-		ReconnectRequest reconnectReq = new ReconnectRequest(RequestConstants.REQ_RECONNECT_TARGET);

-		reconnectReq.setConnectionEditPart((ConnectionEditPart) getEditPart(association, diagram));

-		reconnectReq.setTargetEditPart(targetEP);

-		Command command = targetEP.getCommand(reconnectReq);

-		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));

-

-		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), (Type) target));

-		assertNotNull(sourceAssiociation.getOwnedAttribute(source.getName().toLowerCase(), (Type) target));

-		assertNotNull(association.getOwnedEnd(sourceAssiociation.getName().toLowerCase(), sourceAssiociation));

-

-

-	}

-

-	/**

-	 * Case of an association between A and B, end a is owned by Class B and end b is owned by the association. End a is navigable but not End b. Test changes B to D.

-	 */

-	@Test

-	@PluginResource("/resources/477133/model.di")

-	public void testUMLCase2() {

-

-		// Get data test

-		Association association = (Association) modelSetFixture.getModel().getMember("Association");

-		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");

-		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");

-		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");

-

-		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");

-		EditPart targetEP = getEditPart(target, diagram);

-

-		// Build a request and execute it

-		ReconnectRequest reconnectReq = new ReconnectRequest(RequestConstants.REQ_RECONNECT_SOURCE);

-		reconnectReq.setConnectionEditPart((ConnectionEditPart) getEditPart(association, diagram));

-		reconnectReq.setTargetEditPart(targetEP);

-		Command command = targetEP.getCommand(reconnectReq);

-		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));

-

-		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));

-		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));

-		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));

-

-

-	}

-

-	/**

-	 * Case of an association between A and B, end a is owned by Class B and end b is owned by Class A. Both ends are navigable. Test changes B to D.

-	 */

-	@Test

-	@PluginResource("/resources/477133/model.di")

-	public void testUMLCase3() {

-

-		// Get data test

-		Association association = (Association) modelSetFixture.getModel().getMember("Association");

-		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");

-		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");

-		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");

-

-		// Set End a to Class B

-		SetValueCommand setCommand = new SetValueCommand(new SetRequest(targetAssiociation, UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute(), association.getMemberEnd(source.getName().toLowerCase(), source)));

-		modelSetFixture.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));

-

-		assertTrue(association.getOwnedEnds().isEmpty());

-

-		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");

-		EditPart targetEP = getEditPart(target, diagram);

-

-		// Build a request and execute it

-		ReconnectRequest reconnectReq = new ReconnectRequest(RequestConstants.REQ_RECONNECT_SOURCE);

-		reconnectReq.setConnectionEditPart((ConnectionEditPart) getEditPart(association, diagram));

-		reconnectReq.setTargetEditPart(targetEP);

-		Command command = targetEP.getCommand(reconnectReq);

-		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));

-

-		assertTrue(association.getOwnedEnds().isEmpty());

-		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));

-		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));

-		assertNull(source.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));

-

-

-	}

-

-	/**

-	 * Case of an association between A and B, Both ends are not navigable and contained by the association. Test changes B to D.

-	 */

-	@Test

-	@PluginResource("/resources/477133/model.di")

-	public void testUMLCase4() {

-

-		// Get data test

-		Association association = (Association) modelSetFixture.getModel().getMember("Association");

-		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");

-		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");

-		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");

-

-		// Set End a to association

-		SetValueCommand setCommand = new SetValueCommand(new SetRequest(association, UMLPackage.eINSTANCE.getAssociation_OwnedEnd(), association.getMemberEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation)));

-		modelSetFixture.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));

-

-		assertEquals(2, association.getOwnedEnds().size());

-

-		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");

-		EditPart targetEP = getEditPart(target, diagram);

-

-		// Build a request and execute it

-		ReconnectRequest reconnectReq = new ReconnectRequest(RequestConstants.REQ_RECONNECT_SOURCE);

-		reconnectReq.setConnectionEditPart((ConnectionEditPart) getEditPart(association, diagram));

-		reconnectReq.setTargetEditPart(targetEP);

-		Command command = targetEP.getCommand(reconnectReq);

-		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));

-

-		assertEquals(2, association.getOwnedEnds().size());

-		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));

-		assertNotNull(association.getOwnedEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation));

-		assertFalse(target.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));

-		assertFalse(targetAssiociation.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));

-

-	}

-

-	/**

-	 * Case of an association between A and B, end a is owned by Block B and end b is owned by the association. End a is navigable but not End b. Test changes A to C.

-	 * 

-	 */

-	@Test

-	@PluginResource("/resources/477133/model.di")

-	public void testSysMLCase1() {

-

-		// Get data test

-		Association association = (Association) modelSetFixture.getModel().getMember("Association");

-		NamedElement target = modelSetFixture.getModel().getMember("C");

-		NamedElement source = modelSetFixture.getModel().getMember("A");

-		StructuredClassifier sourceAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("B");

-

-		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");

-		EditPart targetEP = getEditPart(target, diagram);

-

-		// Build a request and execute it

-		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_TARGET);

-		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));

-		modelSetFixture.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

-

-		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), (Type) target));

-		assertNotNull(sourceAssiociation.getOwnedAttribute(source.getName().toLowerCase(), (Type) target));

-		assertNotNull(association.getOwnedEnd(sourceAssiociation.getName().toLowerCase(), sourceAssiociation));

-

-

-	}

-

-	/**

-	 * Case of an association between A and B, end a is owned by Block B and end b is owned by the association. End a is navigable but not End b. Test changes B to D.

-	 */

-	@Test

-	@PluginResource("/resources/477133/model.di")

-	public void testSysMLCase2() {

-

-		// Get data test

-		Association association = (Association) modelSetFixture.getModel().getMember("Association");

-		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");

-		NamedElement source = modelSetFixture.getModel().getMember("B");

-		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");

-

-		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");

-		EditPart targetEP = getEditPart(target, diagram);

-

-		// Build a request and execute it

-		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_SOURCE);

-		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));

-		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));

-

-		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));

-		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));

-		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));

-

-

-	}

-

-	/**

-	 * Case of an association between A and B, end a is owned by Block B and end b is owned by Block A. Both ends are navigable. Test changes B to D.

-	 */

-	@Test

-	@PluginResource("/resources/477133/model.di")

-	public void testSysMLCase3() {

-

-		// Get data test

-		Association association = (Association) modelSetFixture.getModel().getMember("Association");

-		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");

-		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");

-		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");

-

-		// Set End a to Class B

-		SetValueCommand setCommand = new SetValueCommand(new SetRequest(targetAssiociation, UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute(), association.getMemberEnd(source.getName().toLowerCase(), source)));

-		modelSetFixture.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));

-

-		assertTrue(association.getOwnedEnds().isEmpty());

-

-		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");

-		EditPart targetEP = getEditPart(target, diagram);

-

-		// Build a request and execute it

-		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_SOURCE);

-		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));

-		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));

-

-		assertTrue(association.getOwnedEnds().isEmpty());

-		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));

-		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));

-		assertNull(source.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));

-

-

-	}

-

-	/**

-	 * Case of an association between A and B, Both ends are not navigable and contained by the association. Test changes B to D.

-	 */

-	@Test

-	@PluginResource("/resources/477133/model.di")

-	public void testSysMLCase4() {

-

-		// Get data test

-		Association association = (Association) modelSetFixture.getModel().getMember("Association");

-		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");

-		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");

-		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");

-

-		// Set End a to association

-		SetValueCommand setCommand = new SetValueCommand(new SetRequest(association, UMLPackage.eINSTANCE.getAssociation_OwnedEnd(), association.getMemberEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation)));

-		modelSetFixture.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));

-

-		assertEquals(2, association.getOwnedEnds().size());

-

-		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");

-		EditPart targetEP = getEditPart(target, diagram);

-

-		// Build a request and execute it

-		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_SOURCE);

-		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));

-		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));

-

-		assertEquals(2, association.getOwnedEnds().size());

-		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));

-		assertNotNull(association.getOwnedEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation));

-		assertFalse(target.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));

-		assertFalse(targetAssiociation.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));

-

-	}

-

-	/**

-	 * Case of an Directed Composition association between B1 and B2, end B2 is owned by Block B1 and end B2 is owned by Association. Test changes B2 to B3.

-	 */

-	@Test

-	@PluginResource("/resources/477133/model.di")

-	public void testSysMLCase5() {

-

-		// Get data test

-		Association association = (Association) modelSetFixture.getModel().getMember("Directed Composition");

-		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("B3");

-		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B2");

-		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("B1");

-

-		assertEquals(1, association.getOwnedEnds().size());

-

-		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "BDD 446668");

-		EditPart targetEP = getEditPart(target, diagram);

-

-		// Build a request and execute it

-		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_TARGET);

-		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));

-		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));

-

-		assertEquals(1, association.getOwnedEnds().size());

-		assertNotNull(association.getOwnedEnd("b1_1", targetAssiociation));

-		assertNotNull(targetAssiociation.getOwnedAttribute("b2_1", target));

-

-

-	}

-

-

-	/**

-	 * Gets the edits the part.

-	 *

-	 * @param semanticElement

-	 *            the semantic element

-	 * @param diagram

-	 *            the diagram

-	 * @return the edits the part

-	 */

-	private EditPart getEditPart(NamedElement semanticElement, Diagram diagram) {

-

-		modelSetFixture.getPageManager().openPage(diagram);

-

-		View diagramView = DiagramUtils.findShape(diagram, semanticElement.getName());

-		if (diagramView == null) {

-			diagramView = DiagramUtils.findEdge(diagram, semanticElement.getName());

-		}

-		assertNotNull(diagramView);

-

-		IGraphicalEditPart semanticEP = DiagramUtils.findEditPartforView(modelSetFixture.getEditor(), diagramView, IGraphicalEditPart.class);

-		assertNotNull(semanticEP);

-

-		return semanticEP;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Patrick Tessier(CEA LIST) Patrick.Tessier@cea.fr - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.common.tests.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.DiagramUtils;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.uml2.uml.Association;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.StructuredClassifier;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * The test class to verify that there is no regression in relation to Bug 477133.
+ * bug 477133: when we move a property linked to an association the type is badly updated https://bugs.eclipse.org/bugs/show_bug.cgi?id=477133
+ * For this test we do not load a model!
+ * during the construction the member-end can be the inverse of end-types
+ * 
+ * @author Patrick Tessier
+ */
+public class Bug477133MovePropertyWithAssociation extends AbstractPapyrusTest {
+
+	/** The model set fixture. */
+	@Rule
+	public final PapyrusEditorFixture modelSetFixture = new PapyrusEditorFixture();
+
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public Bug477133MovePropertyWithAssociation() {
+		super();
+	}
+
+	/**
+	 * Case of an association between A and B, end a is owned by Class B and end b is owned by the association. End a is navigable but not End b. Test changes A to C.
+	 */
+	@Test
+	@PluginResource("/resources/477133/model.di")
+	public void testUMLCase1() {
+
+		// Get data test
+		Association association = (Association) modelSetFixture.getModel().getMember("Association");
+		NamedElement target = modelSetFixture.getModel().getMember("C");
+		NamedElement source = modelSetFixture.getModel().getMember("A");
+		StructuredClassifier sourceAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
+
+		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");
+		EditPart targetEP = getEditPart(target, diagram);
+
+		// Build a request and execute it
+		ReconnectRequest reconnectReq = new ReconnectRequest(RequestConstants.REQ_RECONNECT_TARGET);
+		reconnectReq.setConnectionEditPart((ConnectionEditPart) getEditPart(association, diagram));
+		reconnectReq.setTargetEditPart(targetEP);
+		Command command = targetEP.getCommand(reconnectReq);
+		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
+
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), (Type) target));
+		assertNotNull(sourceAssiociation.getOwnedAttribute(source.getName().toLowerCase(), (Type) target));
+		assertNotNull(association.getOwnedEnd(sourceAssiociation.getName().toLowerCase(), sourceAssiociation));
+
+
+	}
+
+	/**
+	 * Case of an association between A and B, end a is owned by Class B and end b is owned by the association. End a is navigable but not End b. Test changes B to D.
+	 */
+	@Test
+	@PluginResource("/resources/477133/model.di")
+	public void testUMLCase2() {
+
+		// Get data test
+		Association association = (Association) modelSetFixture.getModel().getMember("Association");
+		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");
+		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
+		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");
+
+		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");
+		EditPart targetEP = getEditPart(target, diagram);
+
+		// Build a request and execute it
+		ReconnectRequest reconnectReq = new ReconnectRequest(RequestConstants.REQ_RECONNECT_SOURCE);
+		reconnectReq.setConnectionEditPart((ConnectionEditPart) getEditPart(association, diagram));
+		reconnectReq.setTargetEditPart(targetEP);
+		Command command = targetEP.getCommand(reconnectReq);
+		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
+
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));
+		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
+		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));
+
+
+	}
+
+	/**
+	 * Case of an association between A and B, end a is owned by Class B and end b is owned by Class A. Both ends are navigable. Test changes B to D.
+	 */
+	@Test
+	@PluginResource("/resources/477133/model.di")
+	public void testUMLCase3() {
+
+		// Get data test
+		Association association = (Association) modelSetFixture.getModel().getMember("Association");
+		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");
+		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
+		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");
+
+		// Set End a to Class B
+		SetValueCommand setCommand = new SetValueCommand(new SetRequest(targetAssiociation, UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute(), association.getMemberEnd(source.getName().toLowerCase(), source)));
+		modelSetFixture.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));
+
+		assertTrue(association.getOwnedEnds().isEmpty());
+
+		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");
+		EditPart targetEP = getEditPart(target, diagram);
+
+		// Build a request and execute it
+		ReconnectRequest reconnectReq = new ReconnectRequest(RequestConstants.REQ_RECONNECT_SOURCE);
+		reconnectReq.setConnectionEditPart((ConnectionEditPart) getEditPart(association, diagram));
+		reconnectReq.setTargetEditPart(targetEP);
+		Command command = targetEP.getCommand(reconnectReq);
+		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
+
+		assertTrue(association.getOwnedEnds().isEmpty());
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));
+		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
+		assertNull(source.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
+
+
+	}
+
+	/**
+	 * Case of an association between A and B, Both ends are not navigable and contained by the association. Test changes B to D.
+	 */
+	@Test
+	@PluginResource("/resources/477133/model.di")
+	public void testUMLCase4() {
+
+		// Get data test
+		Association association = (Association) modelSetFixture.getModel().getMember("Association");
+		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");
+		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
+		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");
+
+		// Set End a to association
+		SetValueCommand setCommand = new SetValueCommand(new SetRequest(association, UMLPackage.eINSTANCE.getAssociation_OwnedEnd(), association.getMemberEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation)));
+		modelSetFixture.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));
+
+		assertEquals(2, association.getOwnedEnds().size());
+
+		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");
+		EditPart targetEP = getEditPart(target, diagram);
+
+		// Build a request and execute it
+		ReconnectRequest reconnectReq = new ReconnectRequest(RequestConstants.REQ_RECONNECT_SOURCE);
+		reconnectReq.setConnectionEditPart((ConnectionEditPart) getEditPart(association, diagram));
+		reconnectReq.setTargetEditPart(targetEP);
+		Command command = targetEP.getCommand(reconnectReq);
+		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
+
+		assertEquals(2, association.getOwnedEnds().size());
+		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));
+		assertNotNull(association.getOwnedEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation));
+		assertFalse(target.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));
+		assertFalse(targetAssiociation.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));
+
+	}
+
+	/**
+	 * Case of an association between A and B, end a is owned by Block B and end b is owned by the association. End a is navigable but not End b. Test changes A to C.
+	 * 
+	 */
+	@Test
+	@PluginResource("/resources/477133/model.di")
+	public void testSysMLCase1() {
+
+		// Get data test
+		Association association = (Association) modelSetFixture.getModel().getMember("Association");
+		NamedElement target = modelSetFixture.getModel().getMember("C");
+		NamedElement source = modelSetFixture.getModel().getMember("A");
+		StructuredClassifier sourceAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
+
+		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");
+		EditPart targetEP = getEditPart(target, diagram);
+
+		// Build a request and execute it
+		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_TARGET);
+		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));
+		modelSetFixture.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), (Type) target));
+		assertNotNull(sourceAssiociation.getOwnedAttribute(source.getName().toLowerCase(), (Type) target));
+		assertNotNull(association.getOwnedEnd(sourceAssiociation.getName().toLowerCase(), sourceAssiociation));
+
+
+	}
+
+	/**
+	 * Case of an association between A and B, end a is owned by Block B and end b is owned by the association. End a is navigable but not End b. Test changes B to D.
+	 */
+	@Test
+	@PluginResource("/resources/477133/model.di")
+	public void testSysMLCase2() {
+
+		// Get data test
+		Association association = (Association) modelSetFixture.getModel().getMember("Association");
+		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");
+		NamedElement source = modelSetFixture.getModel().getMember("B");
+		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");
+
+		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");
+		EditPart targetEP = getEditPart(target, diagram);
+
+		// Build a request and execute it
+		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_SOURCE);
+		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));
+		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
+
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));
+		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
+		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));
+
+
+	}
+
+	/**
+	 * Case of an association between A and B, end a is owned by Block B and end b is owned by Block A. Both ends are navigable. Test changes B to D.
+	 */
+	@Test
+	@PluginResource("/resources/477133/model.di")
+	public void testSysMLCase3() {
+
+		// Get data test
+		Association association = (Association) modelSetFixture.getModel().getMember("Association");
+		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");
+		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
+		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");
+
+		// Set End a to Class B
+		SetValueCommand setCommand = new SetValueCommand(new SetRequest(targetAssiociation, UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute(), association.getMemberEnd(source.getName().toLowerCase(), source)));
+		modelSetFixture.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));
+
+		assertTrue(association.getOwnedEnds().isEmpty());
+
+		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");
+		EditPart targetEP = getEditPart(target, diagram);
+
+		// Build a request and execute it
+		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_SOURCE);
+		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));
+		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
+
+		assertTrue(association.getOwnedEnds().isEmpty());
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));
+		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
+		assertNull(source.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
+
+
+	}
+
+	/**
+	 * Case of an association between A and B, Both ends are not navigable and contained by the association. Test changes B to D.
+	 */
+	@Test
+	@PluginResource("/resources/477133/model.di")
+	public void testSysMLCase4() {
+
+		// Get data test
+		Association association = (Association) modelSetFixture.getModel().getMember("Association");
+		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");
+		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
+		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");
+
+		// Set End a to association
+		SetValueCommand setCommand = new SetValueCommand(new SetRequest(association, UMLPackage.eINSTANCE.getAssociation_OwnedEnd(), association.getMemberEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation)));
+		modelSetFixture.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));
+
+		assertEquals(2, association.getOwnedEnds().size());
+
+		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "477133");
+		EditPart targetEP = getEditPart(target, diagram);
+
+		// Build a request and execute it
+		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_SOURCE);
+		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));
+		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
+
+		assertEquals(2, association.getOwnedEnds().size());
+		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));
+		assertNotNull(association.getOwnedEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation));
+		assertFalse(target.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));
+		assertFalse(targetAssiociation.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));
+
+	}
+
+	/**
+	 * Case of an Directed Composition association between B1 and B2, end B2 is owned by Block B1 and end B2 is owned by Association. Test changes B2 to B3.
+	 */
+	@Test
+	@PluginResource("/resources/477133/model.di")
+	public void testSysMLCase5() {
+
+		// Get data test
+		Association association = (Association) modelSetFixture.getModel().getMember("Directed Composition");
+		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("B3");
+		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B2");
+		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("B1");
+
+		assertEquals(1, association.getOwnedEnds().size());
+
+		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "BDD 446668");
+		EditPart targetEP = getEditPart(target, diagram);
+
+		// Build a request and execute it
+		ReorientRelationshipRequest request = new ReorientRelationshipRequest(association, target, source, ReorientRequest.REORIENT_TARGET);
+		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));
+		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
+
+		assertEquals(1, association.getOwnedEnds().size());
+		assertNotNull(association.getOwnedEnd("b1_1", targetAssiociation));
+		assertNotNull(targetAssiociation.getOwnedAttribute("b2_1", target));
+
+
+	}
+
+
+	/**
+	 * Gets the edits the part.
+	 *
+	 * @param semanticElement
+	 *            the semantic element
+	 * @param diagram
+	 *            the diagram
+	 * @return the edits the part
+	 */
+	private EditPart getEditPart(NamedElement semanticElement, Diagram diagram) {
+
+		modelSetFixture.getPageManager().openPage(diagram);
+
+		View diagramView = DiagramUtils.findShape(diagram, semanticElement.getName());
+		if (diagramView == null) {
+			diagramView = DiagramUtils.findEdge(diagram, semanticElement.getName());
+		}
+		assertNotNull(diagramView);
+
+		IGraphicalEditPart semanticEP = DiagramUtils.findEditPartforView(modelSetFixture.getEditor(), diagramView, IGraphicalEditPart.class);
+		assertNotNull(semanticEP);
+
+		return semanticEP;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/CommonBendpointsTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/CommonBendpointsTest.java
index ddd3a439591..a218aa68dbd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/CommonBendpointsTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/CommonBendpointsTest.java
@@ -1,333 +1,333 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.common.tests.tests;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.notation.Diagram;

-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.common.figure.edge.PapyrusEdgeFigure;

-import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;

-import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;

-import org.eclipse.papyrus.uml.diagram.common.tests.Activator;

-import org.eclipse.ui.ISelectionService;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.NamedElement;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-

-/**

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class CommonBendpointsTest extends AbstractEditorTest {

-

-	protected Resource di;

-

-	protected Resource notation;

-

-	protected Resource uml;

-

-	protected Diagram diag;

-

-	protected Model root;

-

-	/**

-	 * 

-	 * Constructor.

-	 * This plugin test the ModelExplorerView

-	 */

-	public CommonBendpointsTest() {

-		super();

-	}

-

-

-	@Before

-	public void initTests() throws CoreException, IOException {

-		try {

-			initModel("testBendpoints", "model", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-

-		ResourceSet set = null;

-		try {

-			set = getModelSet();

-		} catch (ServiceException e) {

-			e.printStackTrace();

-		}

-		//		IEditorInput input = this.editor.getEditorInput();

-		List<Resource> resources = set.getResources();

-		for(Resource current : resources) {

-			//			current.load(null);

-			if(current.getURI().lastSegment().equals("model.uml")) { //$NON-NLS-1$

-				this.uml = current;

-			} else if(current.getURI().lastSegment().equals("model.notation")) { //$NON-NLS-1$

-				this.notation = current;

-			} else if(current.getURI().lastSegment().equals("model.di")) { //$NON-NLS-1$

-				this.di = current;

-			}

-

-

-		}

-		this.diag = (Diagram)this.notation.getAllContents().next();

-		this.root = (Model)this.uml.getContents().get(0);

-	}

-

-	protected void verifyCommonBendpoints(final List<Point> wantedPoints, final Collection<Point> pointsFound1) {

-		List<Point> pointsFound = new ArrayList<Point>(pointsFound1);

-		Assert.assertEquals(wantedPoints.size(), pointsFound.size());

-		for(Point current : pointsFound) {

-			Assert.assertTrue(wantedPoints.contains(current));

-		}

-

-	}

-

-	/**

-	 * 

-	 * @param name

-	 *        the name of a uml element

-	 * @return

-	 *         the link figure for the element

-	 */

-	protected PapyrusEdgeFigure getLinkFigureFor(final String name) {

-		final NamedElement element = this.root.getMember(name);

-		Assert.assertTrue(this.editor.getActiveEditor() instanceof IRevealSemanticElement);

-		((IRevealSemanticElement)this.editor.getActiveEditor()).revealSemanticElement(Collections.singletonList(element));

-		final ISelection selection = getSelectionService().getSelection();

-		Assert.assertTrue(selection instanceof IStructuredSelection);

-		Object current = ((IStructuredSelection)selection).getFirstElement();

-		Assert.assertTrue(current instanceof IGraphicalEditPart);

-		final IFigure fig = ((IGraphicalEditPart)current).getFigure();

-		Assert.assertTrue(fig instanceof PapyrusEdgeFigure);

-		return (PapyrusEdgeFigure)fig;

-	}

-

-	@Test

-	public void commonBendpoints_Test1() {

-		List<Point> wantedResult = new ArrayList<Point>();

-		wantedResult.add(new Point(300, 140));

-

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association1"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association2"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-	}

-

-	//no common bendpoints when the link do not share their source or their target

-	@Test

-	public void commonBendpoints_Test2() {

-		List<Point> wantedResult = new ArrayList<Point>();

-

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association3"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association4"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	@Test

-	public void commonBendpoints_Test3() {

-		List<Point> wantedResult = new ArrayList<Point>();

-		wantedResult.add(new Point(280, 840));

-		wantedResult.add(new Point(280, 920));

-

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association6"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association7"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	//no common bendpoints between 2 kind of uml link 

-	@Test

-	public void testCommonbendpoints_Test4() {

-		List<Point> wantedResult = new ArrayList<Point>();

-

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association5"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Dependency1"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	@Test

-	public void commonBendpoints_Test5() {

-		List<Point> wantedResult = new ArrayList<Point>();

-		wantedResult.add(new Point(1000, 940));

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association8"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association9"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	@Test

-	public void commonBendpoints_Test6() {

-		List<Point> wantedResult = new ArrayList<Point>();

-		wantedResult.add(new Point(260, 1200));

-		wantedResult.add(new Point(360, 1280));

-		wantedResult.add(new Point(380, 1220));

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association10"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association1&"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	@Test

-	public void testCommonbendpoints_Test7() {

-		List<Point> wantedResult = new ArrayList<Point>();

-

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association12"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association13"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	@Test

-	public void testCommonbendpoints_Test8() {

-		List<Point> wantedResult = new ArrayList<Point>();

-

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association14"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association15"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	@Test

-	public void testCommonbendpoints_Test9() {

-		List<Point> wantedResult = new ArrayList<Point>();

-

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association22"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association23"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	@Test

-	public void testCommonbendpoints_Test10() {

-		List<Point> wantedResult = new ArrayList<Point>();

-		wantedResult.add(new Point(280, 1900));

-		wantedResult.add(new Point(280, 1940));

-		wantedResult.add(new Point(280, 2000));

-		wantedResult.add(new Point(280, 2040));

-

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association16"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association17"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	@Test

-	public void testCommonbendpoints_Test11() {

-

-		PapyrusEdgeFigure fig = getLinkFigureFor("Association19"); //$NON-NLS-1$

-		Collection<Point> res = fig.getCommonBendpointsToDraw();

-		List<Point> wantedResult = new ArrayList<Point>();

-		wantedResult.add(new Point(740, 1980));

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association20"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		wantedResult = new ArrayList<Point>();

-		wantedResult.add(new Point(740, 1980));

-		wantedResult.add(new Point(780, 2020));

-		wantedResult.add(new Point(780, 2060));

-		verifyCommonBendpoints(wantedResult, res);

-

-

-		fig = getLinkFigureFor("Association21"); //$NON-NLS-1$

-		res = fig.getCommonBendpointsToDraw();

-		wantedResult = new ArrayList<Point>();

-		wantedResult.add(new Point(780, 2020));

-		wantedResult.add(new Point(780, 2060));

-		verifyCommonBendpoints(wantedResult, res);

-	}

-

-	protected ISelectionService getSelectionService() {

-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-	}

-

-	protected IStructuredSelection getCurrentSelection() {

-		ISelectionService serv = getSelectionService();

-		ISelection selection = serv.getSelection();

-		return (IStructuredSelection)selection;

-	}

-

-

-	@Override

-	protected Bundle getBundle() {

-		return Activator.getDefault().getBundle();

-	}

-

-	@Override

-	protected String getSourcePath() {

-		return "resources/"; //$NON-NLS-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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.tests.tests;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.Diagram;
+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.common.figure.edge.PapyrusEdgeFigure;
+import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;
+import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.diagram.common.tests.Activator;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.NamedElement;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * 
+ * @author Vincent Lorenzo
+ * 
+ */
+public class CommonBendpointsTest extends AbstractEditorTest {
+
+	protected Resource di;
+
+	protected Resource notation;
+
+	protected Resource uml;
+
+	protected Diagram diag;
+
+	protected Model root;
+
+	/**
+	 * 
+	 * Constructor.
+	 * This plugin test the ModelExplorerView
+	 */
+	public CommonBendpointsTest() {
+		super();
+	}
+
+
+	@Before
+	public void initTests() throws CoreException, IOException {
+		try {
+			initModel("testBendpoints", "model", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		ResourceSet set = null;
+		try {
+			set = getModelSet();
+		} catch (ServiceException e) {
+			e.printStackTrace();
+		}
+		//		IEditorInput input = this.editor.getEditorInput();
+		List<Resource> resources = set.getResources();
+		for(Resource current : resources) {
+			//			current.load(null);
+			if(current.getURI().lastSegment().equals("model.uml")) { //$NON-NLS-1$
+				this.uml = current;
+			} else if(current.getURI().lastSegment().equals("model.notation")) { //$NON-NLS-1$
+				this.notation = current;
+			} else if(current.getURI().lastSegment().equals("model.di")) { //$NON-NLS-1$
+				this.di = current;
+			}
+
+
+		}
+		this.diag = (Diagram)this.notation.getAllContents().next();
+		this.root = (Model)this.uml.getContents().get(0);
+	}
+
+	protected void verifyCommonBendpoints(final List<Point> wantedPoints, final Collection<Point> pointsFound1) {
+		List<Point> pointsFound = new ArrayList<Point>(pointsFound1);
+		Assert.assertEquals(wantedPoints.size(), pointsFound.size());
+		for(Point current : pointsFound) {
+			Assert.assertTrue(wantedPoints.contains(current));
+		}
+
+	}
+
+	/**
+	 * 
+	 * @param name
+	 *        the name of a uml element
+	 * @return
+	 *         the link figure for the element
+	 */
+	protected PapyrusEdgeFigure getLinkFigureFor(final String name) {
+		final NamedElement element = this.root.getMember(name);
+		Assert.assertTrue(this.editor.getActiveEditor() instanceof IRevealSemanticElement);
+		((IRevealSemanticElement)this.editor.getActiveEditor()).revealSemanticElement(Collections.singletonList(element));
+		final ISelection selection = getSelectionService().getSelection();
+		Assert.assertTrue(selection instanceof IStructuredSelection);
+		Object current = ((IStructuredSelection)selection).getFirstElement();
+		Assert.assertTrue(current instanceof IGraphicalEditPart);
+		final IFigure fig = ((IGraphicalEditPart)current).getFigure();
+		Assert.assertTrue(fig instanceof PapyrusEdgeFigure);
+		return (PapyrusEdgeFigure)fig;
+	}
+
+	@Test
+	public void commonBendpoints_Test1() {
+		List<Point> wantedResult = new ArrayList<Point>();
+		wantedResult.add(new Point(300, 140));
+
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association1"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association2"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+	}
+
+	//no common bendpoints when the link do not share their source or their target
+	@Test
+	public void commonBendpoints_Test2() {
+		List<Point> wantedResult = new ArrayList<Point>();
+
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association3"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association4"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	@Test
+	public void commonBendpoints_Test3() {
+		List<Point> wantedResult = new ArrayList<Point>();
+		wantedResult.add(new Point(280, 840));
+		wantedResult.add(new Point(280, 920));
+
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association6"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association7"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	//no common bendpoints between 2 kind of uml link 
+	@Test
+	public void testCommonbendpoints_Test4() {
+		List<Point> wantedResult = new ArrayList<Point>();
+
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association5"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Dependency1"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	@Test
+	public void commonBendpoints_Test5() {
+		List<Point> wantedResult = new ArrayList<Point>();
+		wantedResult.add(new Point(1000, 940));
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association8"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association9"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	@Test
+	public void commonBendpoints_Test6() {
+		List<Point> wantedResult = new ArrayList<Point>();
+		wantedResult.add(new Point(260, 1200));
+		wantedResult.add(new Point(360, 1280));
+		wantedResult.add(new Point(380, 1220));
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association10"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association1&"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	@Test
+	public void testCommonbendpoints_Test7() {
+		List<Point> wantedResult = new ArrayList<Point>();
+
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association12"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association13"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	@Test
+	public void testCommonbendpoints_Test8() {
+		List<Point> wantedResult = new ArrayList<Point>();
+
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association14"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association15"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	@Test
+	public void testCommonbendpoints_Test9() {
+		List<Point> wantedResult = new ArrayList<Point>();
+
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association22"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association23"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	@Test
+	public void testCommonbendpoints_Test10() {
+		List<Point> wantedResult = new ArrayList<Point>();
+		wantedResult.add(new Point(280, 1900));
+		wantedResult.add(new Point(280, 1940));
+		wantedResult.add(new Point(280, 2000));
+		wantedResult.add(new Point(280, 2040));
+
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association16"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association17"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	@Test
+	public void testCommonbendpoints_Test11() {
+
+		PapyrusEdgeFigure fig = getLinkFigureFor("Association19"); //$NON-NLS-1$
+		Collection<Point> res = fig.getCommonBendpointsToDraw();
+		List<Point> wantedResult = new ArrayList<Point>();
+		wantedResult.add(new Point(740, 1980));
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association20"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		wantedResult = new ArrayList<Point>();
+		wantedResult.add(new Point(740, 1980));
+		wantedResult.add(new Point(780, 2020));
+		wantedResult.add(new Point(780, 2060));
+		verifyCommonBendpoints(wantedResult, res);
+
+
+		fig = getLinkFigureFor("Association21"); //$NON-NLS-1$
+		res = fig.getCommonBendpointsToDraw();
+		wantedResult = new ArrayList<Point>();
+		wantedResult.add(new Point(780, 2020));
+		wantedResult.add(new Point(780, 2060));
+		verifyCommonBendpoints(wantedResult, res);
+	}
+
+	protected ISelectionService getSelectionService() {
+		return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+	}
+
+	protected IStructuredSelection getCurrentSelection() {
+		ISelectionService serv = getSelectionService();
+		ISelection selection = serv.getSelection();
+		return (IStructuredSelection)selection;
+	}
+
+
+	@Override
+	protected Bundle getBundle() {
+		return Activator.getDefault().getBundle();
+	}
+
+	@Override
+	protected String getSourcePath() {
+		return "resources/"; //$NON-NLS-1$
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/EdgeCustomizationTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/EdgeCustomizationTest.java
index d1f04b8a6e9..14a69c5f2ce 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/EdgeCustomizationTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/EdgeCustomizationTest.java
@@ -1,235 +1,235 @@
-/*****************************************************************************

- * 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.uml.diagram.common.tests.tests;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.Iterator;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.RotatableDecoration;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.notation.Diagram;

-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.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStyleValueCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.decoration.ConnectionDecorationRegistry;

-import org.eclipse.papyrus.infra.gmfdiag.common.decoration.OpenArrowConnectionDecoration;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.figure.edge.PapyrusEdgeFigure;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.DiagramUtils;

-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * <pre>

- * Tests for the edge source and target decoration customization.

- * </pre>

- * 

- * @author Mickaël ADAM

- */

-@SuppressWarnings("nls")

-@PluginResource("/resources/edgeCustomisation/edgeCustomisation.di")

-public class EdgeCustomizationTest extends AbstractPapyrusTest {

-

-	/** The model set fixture. */

-	@Rule

-	public final PapyrusEditorFixture modelSetFixture = new PapyrusEditorFixture();

-

-	/** The diagram. */

-	private Diagram diagram = null;

-

-	/** The connector edit part with default style. */

-	private EditPart defaultConnectorEditPart = null;

-

-	/** The connector edit part with CSS style. */

-	private EditPart cssConnectorEditPart = null;

-

-	/** The connector edit part with style set with properties view. */

-	private EditPart propertiesConnectorEditPart = null;

-

-	/**

-	 * Initialize tests.

-	 */

-	@Before

-	public void init() {

-		diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "Composite Structure Diagram");

-		assertNotNull(diagram);

-

-		defaultConnectorEditPart = getEditPart("DefaultConnector");

-		Assert.assertTrue("The Edit Part must be a ConnectionEditPart", defaultConnectorEditPart instanceof ConnectionEditPart);

-

-		cssConnectorEditPart = getEditPart("CSSConnector");

-		Assert.assertTrue("The Edit Part must be a ConnectionEditPart", cssConnectorEditPart instanceof ConnectionEditPart);

-

-		propertiesConnectorEditPart = getEditPart("PropertiesSetConnector");

-		Assert.assertTrue("The Edit Part must be a ConnectionEditPart", propertiesConnectorEditPart instanceof ConnectionEditPart);

-	}

-

-

-	/**

-	 * Test the edge decoration customization.

-	 */

-	@Test

-	public void testEdgeDecoration() {

-		testDefaultEdgeDecoration();

-		testPropertiesEdgeDecoration();

-		testCSSEdgeDecoration();

-	}

-

-	/**

-	 * Test the {@link ConnectionDecorationRegistry}.

-	 */

-	@Test

-	public void testConnectionDecorationRegistry() {

-		Class<? extends RotatableDecoration> decorationClass = ConnectionDecorationRegistry.getInstance().getDecorationClass("open_arrow");

-		assertNotNull("open_arrow decoration must exist", decorationClass);

-		if (null != decorationClass) {

-			// load the class

-			RotatableDecoration decoration = ClassLoaderHelper.newInstance(decorationClass);

-			assertTrue("Instanciate decoration must be instance of OpenArrowConnectionDecoration", decoration instanceof OpenArrowConnectionDecoration);

-		}

-	}

-

-	/**

-	 * Test the connector with default edge decoration.

-	 */

-	private void testDefaultEdgeDecoration() {

-		IFigure primaryShape = ((IPapyrusEditPart) defaultConnectorEditPart).getPrimaryShape();

-		Assert.assertTrue("The Figure must implement PapyrusEdgeFigure", primaryShape instanceof PapyrusEdgeFigure);

-

-		// Default value test:

-		String sourceDecoration = extract((StringValueStyle) ((View) defaultConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));

-		assertNull("Default source decoration must be null", sourceDecoration);

-

-		// Set Value Style

-		getCommandStack().execute(

-				new CustomStyleValueCommand((View) defaultConnectorEditPart.getModel(), "open_arrow", NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), ConnectionEditPart.SOURCE_DECORATION));

-

-		// test of set command

-		sourceDecoration = extract((StringValueStyle) ((View) defaultConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));

-		assertEquals("SourceDecoration value style must be open_arrow", "open_arrow", sourceDecoration);

-	}

-

-	/**

-	 * Test the connector with edge decoration set with properties view.

-	 */

-	private void testPropertiesEdgeDecoration() {

-		IFigure primaryShape = ((IPapyrusEditPart) propertiesConnectorEditPart).getPrimaryShape();

-		Assert.assertTrue("The Figure must implement PapyrusEdgeFigure", primaryShape instanceof PapyrusEdgeFigure);

-

-		// Default value test:

-		String sourceDecoration = extract((StringValueStyle) ((View) propertiesConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));

-		assertEquals("SourceDecoration value style must be solid_diamond_filled", "solid_diamond_filled", sourceDecoration);

-

-		// Set Value Style

-		getCommandStack().execute(

-				new CustomStyleValueCommand((View) propertiesConnectorEditPart.getModel(), "open_arrow", NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), ConnectionEditPart.SOURCE_DECORATION));

-

-		// test of set command

-		sourceDecoration = extract((StringValueStyle) ((View) propertiesConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));

-		assertEquals("SourceDecoration value style must be open_arrow", "open_arrow", sourceDecoration);

-	}

-

-	/**

-	 * Test the connector with edge decoration set with CSS.

-	 */

-	private void testCSSEdgeDecoration() {

-		IFigure primaryShape = ((IPapyrusEditPart) cssConnectorEditPart).getPrimaryShape();

-		Assert.assertTrue("The Figure must implement PapyrusEdgeFigure", primaryShape instanceof PapyrusEdgeFigure);

-

-		// Default value test:

-		String sourceDecoration = extract((StringValueStyle) ((View) cssConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));

-		assertEquals("SourceDecoration value style must be open_arrow", "open_arrow", sourceDecoration);

-

-		// Set Value Style

-		getCommandStack().execute(

-				new CustomStyleValueCommand((View) cssConnectorEditPart.getModel(), "solid_diamond_filled", NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), ConnectionEditPart.SOURCE_DECORATION));

-

-		// test of set command

-		sourceDecoration = extract((StringValueStyle) ((View) cssConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));

-		assertEquals("SourceDecoration value style must be solid_diamond_filled", "solid_diamond_filled", sourceDecoration);

-	}

-

-

-	/**

-	 * Gets the command stack.

-	 *

-	 * @return the command stack

-	 */

-	private CommandStack getCommandStack() {

-		return modelSetFixture.getEditingDomain().getCommandStack();

-	}

-

-	/**

-	 * Gets the edit part.

-	 *

-	 * @param semanticElement

-	 *            the semantic element name

-	 * @return the edit part

-	 */

-	private EditPart getEditPart(final String semanticElement) {

-		modelSetFixture.getPageManager().openPage(diagram);

-

-		View diagramView = DiagramUtils.findShape(diagram, semanticElement);

-		if (null == diagramView) {

-			diagramView = DiagramUtils.findEdge(diagram, semanticElement);

-		}

-		if (null == diagramView) {

-			Iterator<?> iterator = diagram.eAllContents();

-			while (null == diagramView && iterator.hasNext()) {

-				Object object = iterator.next();

-				if (object instanceof View) {

-					diagramView = DiagramUtils.findShape((View) object, semanticElement);

-					if (null == diagramView) {

-						diagramView = DiagramUtils.findEdge((View) object, semanticElement);

-					}

-				}

-			}

-		}

-		assertNotNull(diagramView);

-		IGraphicalEditPart semanticEP = DiagramUtils.findEditPartforView(modelSetFixture.getEditor(), diagramView, IGraphicalEditPart.class);

-		assertNotNull(semanticEP);

-

-		return semanticEP;

-	}

-

-	/**

-	 * Extracts the string value from the given style

-	 *

-	 * @param style

-	 *            The style

-	 * @return The primitive value

-	 */

-	private String extract(final StringValueStyle style) {

-		if (null == style || null == style.getStringValue() || style.getStringValue().isEmpty()) {

-			return null;

-		}

-		return style.getStringValue();

-	}

-

-}

+/*****************************************************************************
+ * 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.uml.diagram.common.tests.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Iterator;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.RotatableDecoration;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.Diagram;
+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.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStyleValueCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.decoration.ConnectionDecorationRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.common.decoration.OpenArrowConnectionDecoration;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.edge.PapyrusEdgeFigure;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.DiagramUtils;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * <pre>
+ * Tests for the edge source and target decoration customization.
+ * </pre>
+ * 
+ * @author Mickaël ADAM
+ */
+@SuppressWarnings("nls")
+@PluginResource("/resources/edgeCustomisation/edgeCustomisation.di")
+public class EdgeCustomizationTest extends AbstractPapyrusTest {
+
+	/** The model set fixture. */
+	@Rule
+	public final PapyrusEditorFixture modelSetFixture = new PapyrusEditorFixture();
+
+	/** The diagram. */
+	private Diagram diagram = null;
+
+	/** The connector edit part with default style. */
+	private EditPart defaultConnectorEditPart = null;
+
+	/** The connector edit part with CSS style. */
+	private EditPart cssConnectorEditPart = null;
+
+	/** The connector edit part with style set with properties view. */
+	private EditPart propertiesConnectorEditPart = null;
+
+	/**
+	 * Initialize tests.
+	 */
+	@Before
+	public void init() {
+		diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "Composite Structure Diagram");
+		assertNotNull(diagram);
+
+		defaultConnectorEditPart = getEditPart("DefaultConnector");
+		Assert.assertTrue("The Edit Part must be a ConnectionEditPart", defaultConnectorEditPart instanceof ConnectionEditPart);
+
+		cssConnectorEditPart = getEditPart("CSSConnector");
+		Assert.assertTrue("The Edit Part must be a ConnectionEditPart", cssConnectorEditPart instanceof ConnectionEditPart);
+
+		propertiesConnectorEditPart = getEditPart("PropertiesSetConnector");
+		Assert.assertTrue("The Edit Part must be a ConnectionEditPart", propertiesConnectorEditPart instanceof ConnectionEditPart);
+	}
+
+
+	/**
+	 * Test the edge decoration customization.
+	 */
+	@Test
+	public void testEdgeDecoration() {
+		testDefaultEdgeDecoration();
+		testPropertiesEdgeDecoration();
+		testCSSEdgeDecoration();
+	}
+
+	/**
+	 * Test the {@link ConnectionDecorationRegistry}.
+	 */
+	@Test
+	public void testConnectionDecorationRegistry() {
+		Class<? extends RotatableDecoration> decorationClass = ConnectionDecorationRegistry.getInstance().getDecorationClass("open_arrow");
+		assertNotNull("open_arrow decoration must exist", decorationClass);
+		if (null != decorationClass) {
+			// load the class
+			RotatableDecoration decoration = ClassLoaderHelper.newInstance(decorationClass);
+			assertTrue("Instanciate decoration must be instance of OpenArrowConnectionDecoration", decoration instanceof OpenArrowConnectionDecoration);
+		}
+	}
+
+	/**
+	 * Test the connector with default edge decoration.
+	 */
+	private void testDefaultEdgeDecoration() {
+		IFigure primaryShape = ((IPapyrusEditPart) defaultConnectorEditPart).getPrimaryShape();
+		Assert.assertTrue("The Figure must implement PapyrusEdgeFigure", primaryShape instanceof PapyrusEdgeFigure);
+
+		// Default value test:
+		String sourceDecoration = extract((StringValueStyle) ((View) defaultConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));
+		assertNull("Default source decoration must be null", sourceDecoration);
+
+		// Set Value Style
+		getCommandStack().execute(
+				new CustomStyleValueCommand((View) defaultConnectorEditPart.getModel(), "open_arrow", NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), ConnectionEditPart.SOURCE_DECORATION));
+
+		// test of set command
+		sourceDecoration = extract((StringValueStyle) ((View) defaultConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));
+		assertEquals("SourceDecoration value style must be open_arrow", "open_arrow", sourceDecoration);
+	}
+
+	/**
+	 * Test the connector with edge decoration set with properties view.
+	 */
+	private void testPropertiesEdgeDecoration() {
+		IFigure primaryShape = ((IPapyrusEditPart) propertiesConnectorEditPart).getPrimaryShape();
+		Assert.assertTrue("The Figure must implement PapyrusEdgeFigure", primaryShape instanceof PapyrusEdgeFigure);
+
+		// Default value test:
+		String sourceDecoration = extract((StringValueStyle) ((View) propertiesConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));
+		assertEquals("SourceDecoration value style must be solid_diamond_filled", "solid_diamond_filled", sourceDecoration);
+
+		// Set Value Style
+		getCommandStack().execute(
+				new CustomStyleValueCommand((View) propertiesConnectorEditPart.getModel(), "open_arrow", NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), ConnectionEditPart.SOURCE_DECORATION));
+
+		// test of set command
+		sourceDecoration = extract((StringValueStyle) ((View) propertiesConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));
+		assertEquals("SourceDecoration value style must be open_arrow", "open_arrow", sourceDecoration);
+	}
+
+	/**
+	 * Test the connector with edge decoration set with CSS.
+	 */
+	private void testCSSEdgeDecoration() {
+		IFigure primaryShape = ((IPapyrusEditPart) cssConnectorEditPart).getPrimaryShape();
+		Assert.assertTrue("The Figure must implement PapyrusEdgeFigure", primaryShape instanceof PapyrusEdgeFigure);
+
+		// Default value test:
+		String sourceDecoration = extract((StringValueStyle) ((View) cssConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));
+		assertEquals("SourceDecoration value style must be open_arrow", "open_arrow", sourceDecoration);
+
+		// Set Value Style
+		getCommandStack().execute(
+				new CustomStyleValueCommand((View) cssConnectorEditPart.getModel(), "solid_diamond_filled", NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), ConnectionEditPart.SOURCE_DECORATION));
+
+		// test of set command
+		sourceDecoration = extract((StringValueStyle) ((View) cssConnectorEditPart.getModel()).getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), ConnectionEditPart.SOURCE_DECORATION));
+		assertEquals("SourceDecoration value style must be solid_diamond_filled", "solid_diamond_filled", sourceDecoration);
+	}
+
+
+	/**
+	 * Gets the command stack.
+	 *
+	 * @return the command stack
+	 */
+	private CommandStack getCommandStack() {
+		return modelSetFixture.getEditingDomain().getCommandStack();
+	}
+
+	/**
+	 * Gets the edit part.
+	 *
+	 * @param semanticElement
+	 *            the semantic element name
+	 * @return the edit part
+	 */
+	private EditPart getEditPart(final String semanticElement) {
+		modelSetFixture.getPageManager().openPage(diagram);
+
+		View diagramView = DiagramUtils.findShape(diagram, semanticElement);
+		if (null == diagramView) {
+			diagramView = DiagramUtils.findEdge(diagram, semanticElement);
+		}
+		if (null == diagramView) {
+			Iterator<?> iterator = diagram.eAllContents();
+			while (null == diagramView && iterator.hasNext()) {
+				Object object = iterator.next();
+				if (object instanceof View) {
+					diagramView = DiagramUtils.findShape((View) object, semanticElement);
+					if (null == diagramView) {
+						diagramView = DiagramUtils.findEdge((View) object, semanticElement);
+					}
+				}
+			}
+		}
+		assertNotNull(diagramView);
+		IGraphicalEditPart semanticEP = DiagramUtils.findEditPartforView(modelSetFixture.getEditor(), diagramView, IGraphicalEditPart.class);
+		assertNotNull(semanticEP);
+
+		return semanticEP;
+	}
+
+	/**
+	 * Extracts the string value from the given style
+	 *
+	 * @param style
+	 *            The style
+	 * @return The primitive value
+	 */
+	private String extract(final StringValueStyle style) {
+		if (null == style || null == style.getStringValue() || style.getStringValue().isEmpty()) {
+			return null;
+		}
+		return style.getStringValue();
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.project b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.project
index 2f65bf1a1a2..06c5b9f1ec8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.project
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.project
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.communication.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.papyrus.dev.tests.framework.builder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-		<nature>org.eclipse.papyrus.dev.tests.framework.nature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.communication.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.papyrus.dev.tests.framework.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.papyrus.dev.tests.framework.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF
index 35cd25d612d..48b3eda5575 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.xtext.xbase.lib;bundle-version="2.8.1"

-Export-Package: org.eclipse.papyrus.uml.diagram.communication.tests,

- org.eclipse.papyrus.uml.diagram.communication.tests.canonical,

- org.eclipse.papyrus.uml.diagram.communication.tests.generation

-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.uml.diagram.communication.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.1"
+Export-Package: org.eclipse.papyrus.uml.diagram.communication.tests,
+ org.eclipse.papyrus.uml.diagram.communication.tests.canonical,
+ org.eclipse.papyrus.uml.diagram.communication.tests.generation
+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.uml.diagram.communication.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/build.properties
index 5cd18cb5b55..9d94fd2ec9e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/,\

-           xtend-gen/,\

-           test-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties

-src.includes = about.html

+source.. = src/,\
+           xtend-gen/,\
+           test-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/Activator.java
index 3e46f293313..f7d0f301fbc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/Activator.java
@@ -1,50 +1,50 @@
-package org.eclipse.papyrus.uml.diagram.communication.tests;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.communication.tests"; //$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.uml.diagram.communication.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.communication.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/AllTests.java
index 48a7598d496..670b168e00c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/AllTests.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2009, 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 464647

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.communication.tests;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;

-import org.eclipse.papyrus.uml.diagram.communication.tests.canonical.AllCanonicalTests;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		// canonical

-		AllCanonicalTests.class,

-		RoundedCompartmentTest.class,

-

-})

-@DynamicClasses("org.eclipse.papyrus.uml.diagram.communication.test.AllGenTests")

-public class AllTests {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 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 464647
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.communication.tests;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;
+import org.eclipse.papyrus.uml.diagram.communication.tests.canonical.AllCanonicalTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All tests together.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		// canonical
+		AllCanonicalTests.class,
+		RoundedCompartmentTest.class,
+
+})
+@DynamicClasses("org.eclipse.papyrus.uml.diagram.communication.test.AllGenTests")
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/ICommunicationDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/ICommunicationDiagramTestsConstants.java
index ba0c1a11661..ae0168f18f6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/ICommunicationDiagramTestsConstants.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/ICommunicationDiagramTestsConstants.java
@@ -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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.communication.tests;

-

-public interface ICommunicationDiagramTestsConstants {

-

-	/** name of the test project */

-	public final String PROJECT_NAME = "CommunicationDiagramTestProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "CommunicationDiagramTest.di";

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.communication.tests;
+
+public interface ICommunicationDiagramTestsConstants {
+
+	/** name of the test project */
+	public final String PROJECT_NAME = "CommunicationDiagramTestProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "CommunicationDiagramTest.di";
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/RoundedCompartmentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/RoundedCompartmentTest.java
index 6136fbffa1f..912ebb7b270 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/RoundedCompartmentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/RoundedCompartmentTest.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * 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

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.communication.tests;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.DurationObservationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.LifelineEditPartCN;

-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.TimeObservationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;

-

-/**

- * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.

- */

-public class RoundedCompartmentTest extends AbstractGenericShapeTest {

-

-	/**

-	 * Gets the rounded compartment edit parts.

-	 *

-	 * @return the rounded compartment edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()

-	 */

-	public List<Class<?>> getRoundedCompartmentEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-

-		classes.add(InteractionEditPart.class);

-		classes.add(DurationObservationEditPartCN.class);

-		classes.add(LifelineEditPartCN.class);

-		classes.add(TimeObservationEditPartCN.class);

-

-		return classes;

-	}

-

-	/**

-	 * Gets the rounded border named element edit parts.

-	 *

-	 * @return the rounded border named element edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()

-	 */

-	public List<Class<?>> getRoundedBorderNamedElementEditParts() {

-		return new ArrayList<Class<?>>();

-	}

-}

+/*****************************************************************************
+ * 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
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.communication.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.DurationObservationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.InteractionEditPart;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.LifelineEditPartCN;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.TimeObservationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;
+
+/**
+ * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.
+ */
+public class RoundedCompartmentTest extends AbstractGenericShapeTest {
+
+	/**
+	 * Gets the rounded compartment edit parts.
+	 *
+	 * @return the rounded compartment edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()
+	 */
+	public List<Class<?>> getRoundedCompartmentEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+
+		classes.add(InteractionEditPart.class);
+		classes.add(DurationObservationEditPartCN.class);
+		classes.add(LifelineEditPartCN.class);
+		classes.add(TimeObservationEditPartCN.class);
+
+		return classes;
+	}
+
+	/**
+	 * Gets the rounded border named element edit parts.
+	 *
+	 * @return the rounded border named element edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()
+	 */
+	public List<Class<?>> getRoundedBorderNamedElementEditParts() {
+		return new ArrayList<Class<?>>();
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/AllCanonicalTests.java
index 582ae9a4b3b..7f632a27fd8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/AllCanonicalTests.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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.communication.tests.canonical;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-

-

-/**

- * All test in canonical package

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-// testTopNodes

-	TestCommunicationDiagramChildNode.class,

-	TestCommunicationDiagramLink.class

-})

-public class AllCanonicalTests {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.uml.diagram.communication.tests.canonical;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+
+/**
+ * All test in canonical package
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+// testTopNodes
+	TestCommunicationDiagramChildNode.class,
+	TestCommunicationDiagramLink.class
+})
+public class AllCanonicalTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramChildNode.java
index c1a9dcdef5f..30718d60082 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramChildNode.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 - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.communication.tests.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.communication.tests.ICommunicationDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Test;

-

-/**

- * The Class TestClassDiagramChildNode.

- */

-public class TestCommunicationDiagramChildNode extends TestChildNode {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected CreateViewRequest createViewRequestShapeContainer() {

-		return null;

-	}

-

-	@Override

-	public boolean isTestAffixedNode() {

-		return false;

-	}

-	@Override

-	protected String getProjectName() {

-		return ICommunicationDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return ICommunicationDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected boolean isSemanticTest() {

-		return false;

-	}

-	/**

-	* Test to manage Lifeline.

-	*/

-	@Test

-	public void testToLifeline() {

-		testToManageNode(UMLElementTypes.Lifeline_Shape, UMLPackage.eINSTANCE.getLifeline(), UMLElementTypes.Interaction_Shape, false);

-	}

-	/**

-	* Test to manage Constraint.

-	*/

-	@Test

-	public void testToConstraint() {

-		testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Interaction_Shape, false);

-	}

-	/**

-	* Test to manage Comment.

-	*/

-	@Test

-	public void testToComment() {

-		testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Interaction_Shape, false);

-	}

-	/**

-	* Test to manage TimeObservation.

-	*/

-	@Test

-	@FailingTest

-	public void testToTimeObservation() {

-		testToManageNode(UMLElementTypes.TimeObservation_Shape, UMLPackage.eINSTANCE.getTimeObservation(), UMLElementTypes.Interaction_Shape, false);

-	}

-	/**

-	* Test to manage DurationObservation.

-	*/

-	@Test

-	@FailingTest

-	public void testToDurationObservation() {

-		testToManageNode(UMLElementTypes.DurationObservation_Shape, UMLPackage.eINSTANCE.getDurationObservation(), UMLElementTypes.Interaction_Shape, false);

-	}

-	

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateCommunicationDiagramCommand();

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.communication.tests.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.communication.tests.ICommunicationDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Test;
+
+/**
+ * The Class TestClassDiagramChildNode.
+ */
+public class TestCommunicationDiagramChildNode extends TestChildNode {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected CreateViewRequest createViewRequestShapeContainer() {
+		return null;
+	}
+
+	@Override
+	public boolean isTestAffixedNode() {
+		return false;
+	}
+	@Override
+	protected String getProjectName() {
+		return ICommunicationDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return ICommunicationDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean isSemanticTest() {
+		return false;
+	}
+	/**
+	* Test to manage Lifeline.
+	*/
+	@Test
+	public void testToLifeline() {
+		testToManageNode(UMLElementTypes.Lifeline_Shape, UMLPackage.eINSTANCE.getLifeline(), UMLElementTypes.Interaction_Shape, false);
+	}
+	/**
+	* Test to manage Constraint.
+	*/
+	@Test
+	public void testToConstraint() {
+		testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Interaction_Shape, false);
+	}
+	/**
+	* Test to manage Comment.
+	*/
+	@Test
+	public void testToComment() {
+		testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Interaction_Shape, false);
+	}
+	/**
+	* Test to manage TimeObservation.
+	*/
+	@Test
+	@FailingTest
+	public void testToTimeObservation() {
+		testToManageNode(UMLElementTypes.TimeObservation_Shape, UMLPackage.eINSTANCE.getTimeObservation(), UMLElementTypes.Interaction_Shape, false);
+	}
+	/**
+	* Test to manage DurationObservation.
+	*/
+	@Test
+	@FailingTest
+	public void testToDurationObservation() {
+		testToManageNode(UMLElementTypes.DurationObservation_Shape, UMLPackage.eINSTANCE.getDurationObservation(), UMLElementTypes.Interaction_Shape, false);
+	}
+	
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateCommunicationDiagramCommand();
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramLink.java
index 15baa4b0cb9..c28fdb02d6e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramLink.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.communication.tests.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.junit.framework.classification.InvalidTest;

-import org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.communication.tests.ICommunicationDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;

-import org.junit.Test;

-

-/**

- * The Class TestCommunicationDiagramLink use to test link that are contained by the owner of the target and the source

- */

-public class TestCommunicationDiagramLink extends TestLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateCommunicationDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return ICommunicationDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return ICommunicationDiagramTestsConstants.FILE_NAME;

-	}

-	

-	/**

-	* Test to manage component.

-	*/

-	@Test

-	@InvalidTest

-	public void testToMessage() {

-	testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Path_Edge, UMLElementTypes.Interaction_Shape, 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.communication.tests.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.InvalidTest;
+import org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.communication.tests.ICommunicationDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;
+import org.junit.Test;
+
+/**
+ * The Class TestCommunicationDiagramLink use to test link that are contained by the owner of the target and the source
+ */
+public class TestCommunicationDiagramLink extends TestLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateCommunicationDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return ICommunicationDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return ICommunicationDiagramTestsConstants.FILE_NAME;
+	}
+	
+	/**
+	* Test to manage component.
+	*/
+	@Test
+	@InvalidTest
+	public void testToMessage() {
+	testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Path_Edge, UMLElementTypes.Interaction_Shape, false);
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF
index 2fc480ae26d..471e663082b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.xtend.lib;bundle-version="2.8.1"

-Export-Package: org.eclipse.papyrus.uml.diagram.component.test,

- org.eclipse.papyrus.uml.diagram.component.test.canonical,

- org.eclipse.papyrus.uml.diagram.component.test.generation,

- org.eclipse.papyrus.uml.diagram.component.test.load

-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.uml.diagram.component.test.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtend.lib;bundle-version="2.8.1"
+Export-Package: org.eclipse.papyrus.uml.diagram.component.test,
+ org.eclipse.papyrus.uml.diagram.component.test.canonical,
+ org.eclipse.papyrus.uml.diagram.component.test.generation,
+ org.eclipse.papyrus.uml.diagram.component.test.load
+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.uml.diagram.component.test.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/build.properties
index 622c90ba521..a2fe8ad9c17 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/build.properties
@@ -1,8 +1,8 @@
-source.. = src/,\

-           test-gen/,\

-           xtend-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties

+source.. = src/,\
+           test-gen/,\
+           xtend-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/plugin.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/plugin.properties
index fc4a2a67d98..91edaf8cf58 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/plugin.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/plugin.properties
@@ -1,52 +1,52 @@
-pluginName=Papyrus Component Diagram

-providerName=Eclipse Modeling Project

-editorName=PapyrusUMLComponentDiagram Diagram Editing

-context.description=Papyrus UML Component Diagram Editing

-context.name=In Papyrus UML Component Diagram Editor

-newWizardName=PapyrusUMLComponentDiagram Diagram

-newWizardDesc=Creates PapyrusUMLComponentDiagram diagram.

-
initDiagramActionLabel=Initialize PapyrusUMLComponent_diagram diagram file

-
navigatorContentName=*.PapyrusUMLComponent_diagram diagram contents

-update.diagram.name=Update PapyrusUMLComponentDiagram diagram

-update.diagram.description=Perform PapyrusUMLComponentDiagram diagram update

-
tab.appearance=Appearance

-tab.diagram=Rulers & Grid

-tab.domain=Core

-
prefpage.org.eclipse.uml2.uml.diagram.general=UML Diagram

-prefpage.org.eclipse.uml2.uml.diagram.appearance=Appearance

-prefpage.org.eclipse.uml2.uml.diagram.connections=Connections

-prefpage.org.eclipse.uml2.uml.diagram.printing=Printing

-prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid=Rulers And Grid

-
metatype.name.Model_1000=ComponentDiagram

-metatype.name.Component_PackagedElementShape=Component

-metatype.name.Interface_2003=Interface

-metatype.name.Package_Shape=Package

-metatype.name.Comment_Shape=Comment

-metatype.name.Constraint_Shape=Constraint

-metatype.name.Port_Shape=Port

-metatype.name.Component_PackagedElementShape_CCN=Component

-metatype.name.Component_3071=Component

-metatype.name.Interface_3072=Interface

-metatype.name.Comment_3074=Comment

-metatype.name.Constraint_3075=Constraint

-metatype.name.Usage_4001=Usage

-metatype.name.InterfaceRealization_4006=InterfaceRealization

-metatype.name.Generalization_4003=Generalization

-metatype.name.Substitution_4012=Substitution

-metatype.name.Manifestation_4014=Manifestation

-metatype.name.ComponentRealization_4007=ComponentRealization

-metatype.name.Abstraction_4013=Abstraction

-metatype.name.Link_4016=Undefined

-metatype.name.Comment_AnnotatedElementEdge=CommentAnnotatedElement

-metatype.name.Constraint_ConstrainedElementEdge=ConstraintConstrainedElement

-metatype.name.Dependency_4010=Dependency

-
cmdcategory.name=PapyrusUMLComponentDiagram Editor Commands

-cmdcategory.desc=PapyrusUMLComponentDiagram Editor Commands

-


-metatype.name.Package_1000=ComponentDiagram

-metatype.name.Dependency_3203=DependencyNode

-metatype.name.Model_3202=Model

-metatype.name.NamedElement_3204=DefaultNamedElement

-metatype.name.Model_3077=Model

-metatype.name.Package_3076=Package

+pluginName=Papyrus Component Diagram
+providerName=Eclipse Modeling Project
+editorName=PapyrusUMLComponentDiagram Diagram Editing
+context.description=Papyrus UML Component Diagram Editing
+context.name=In Papyrus UML Component Diagram Editor
+newWizardName=PapyrusUMLComponentDiagram Diagram
+newWizardDesc=Creates PapyrusUMLComponentDiagram diagram.
+
initDiagramActionLabel=Initialize PapyrusUMLComponent_diagram diagram file
+
navigatorContentName=*.PapyrusUMLComponent_diagram diagram contents
+update.diagram.name=Update PapyrusUMLComponentDiagram diagram
+update.diagram.description=Perform PapyrusUMLComponentDiagram diagram update
+
tab.appearance=Appearance
+tab.diagram=Rulers & Grid
+tab.domain=Core
+
prefpage.org.eclipse.uml2.uml.diagram.general=UML Diagram
+prefpage.org.eclipse.uml2.uml.diagram.appearance=Appearance
+prefpage.org.eclipse.uml2.uml.diagram.connections=Connections
+prefpage.org.eclipse.uml2.uml.diagram.printing=Printing
+prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid=Rulers And Grid
+
metatype.name.Model_1000=ComponentDiagram
+metatype.name.Component_PackagedElementShape=Component
+metatype.name.Interface_2003=Interface
+metatype.name.Package_Shape=Package
+metatype.name.Comment_Shape=Comment
+metatype.name.Constraint_Shape=Constraint
+metatype.name.Port_Shape=Port
+metatype.name.Component_PackagedElementShape_CCN=Component
+metatype.name.Component_3071=Component
+metatype.name.Interface_3072=Interface
+metatype.name.Comment_3074=Comment
+metatype.name.Constraint_3075=Constraint
+metatype.name.Usage_4001=Usage
+metatype.name.InterfaceRealization_4006=InterfaceRealization
+metatype.name.Generalization_4003=Generalization
+metatype.name.Substitution_4012=Substitution
+metatype.name.Manifestation_4014=Manifestation
+metatype.name.ComponentRealization_4007=ComponentRealization
+metatype.name.Abstraction_4013=Abstraction
+metatype.name.Link_4016=Undefined
+metatype.name.Comment_AnnotatedElementEdge=CommentAnnotatedElement
+metatype.name.Constraint_ConstrainedElementEdge=ConstraintConstrainedElement
+metatype.name.Dependency_4010=Dependency
+
cmdcategory.name=PapyrusUMLComponentDiagram Editor Commands
+cmdcategory.desc=PapyrusUMLComponentDiagram Editor Commands
+
+metatype.name.Package_1000=ComponentDiagram
+metatype.name.Dependency_3203=DependencyNode
+metatype.name.Model_3202=Model
+metatype.name.NamedElement_3204=DefaultNamedElement
+metatype.name.Model_3077=Model
+metatype.name.Package_3076=Package
 metatype.name.Dependency_4017=Dependency
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/Activator.java
index 4f652965e79..c4a40b9558c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/Activator.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.component.tests"; //$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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.component.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/AllTests.java
index 7c9a3a365c8..dc503863b1c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/AllTests.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * 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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- *  Christian W. Damus - bug 464647

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;

-import org.eclipse.papyrus.uml.diagram.component.test.canonical.AllCanonicalTests;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		// canonical

-		AllCanonicalTests.class,

-		RoundedCompartmentTest.class

-

-		// load

-		// LoadTests.class,

-})

-@DynamicClasses("org.eclipse.papyrus.uml.diagram.component.test.AllGenTests")

-public class AllTests {

-

-}

+/*****************************************************************************
+ * 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus - bug 464647
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;
+import org.eclipse.papyrus.uml.diagram.component.test.canonical.AllCanonicalTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All tests together.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		// canonical
+		AllCanonicalTests.class,
+		RoundedCompartmentTest.class
+
+		// load
+		// LoadTests.class,
+})
+@DynamicClasses("org.eclipse.papyrus.uml.diagram.component.test.AllGenTests")
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/IComponentDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/IComponentDiagramTestsConstants.java
index eae256af3b3..2bdc888a264 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/IComponentDiagramTestsConstants.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/IComponentDiagramTestsConstants.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test;

-

-public interface IComponentDiagramTestsConstants {

-

-	/** name of the test project */

-	public final String PROJECT_NAME = "ComponentDiagramTestProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "ComponentDiagramTest.di";

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test;
+
+public interface IComponentDiagramTestsConstants {
+
+	/** name of the test project */
+	public final String PROJECT_NAME = "ComponentDiagramTestProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "ComponentDiagramTest.di";
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/RoundedCompartmentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/RoundedCompartmentTest.java
index e3a44d47cec..a9db0533b69 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/RoundedCompartmentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/RoundedCompartmentTest.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

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;

-

-/**

- * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.

- */

-public class RoundedCompartmentTest extends AbstractGenericShapeTest {

-

-	/**

-	 * Gets the rounded compartment edit parts.

-	 *

-	 * @return the rounded compartment edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()

-	 */

-	public List<Class<?>> getRoundedCompartmentEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-

-		classes.add(ComponentEditPart.class);

-		classes.add(ComponentEditPartCN.class);

-		classes.add(ComponentEditPartPCN.class);

-		classes.add(InterfaceEditPart.class);

-		classes.add(InterfaceEditPartPCN.class);

-		classes.add(ModelEditPart.class);

-		classes.add(ModelEditPartCN.class);

-		classes.add(PackageEditPart.class);

-		classes.add(PackageEditPartCN.class);

-		classes.add(RectangleInterfaceEditPart.class);

-		classes.add(ComponentEditPartPCN.class);

-		classes.add(RectangleInterfaceEditPartCN.class);

-

-		return classes;

-	}

-

-	/**

-	 * Gets the rounded border named element edit parts.

-	 *

-	 * @return the rounded border named element edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()

-	 */

-	public List<Class<?>> getRoundedBorderNamedElementEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-		classes.add(PortEditPart.class);

-		return classes;

-	}

-}

+/*****************************************************************************
+ * 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
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;
+
+/**
+ * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.
+ */
+public class RoundedCompartmentTest extends AbstractGenericShapeTest {
+
+	/**
+	 * Gets the rounded compartment edit parts.
+	 *
+	 * @return the rounded compartment edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()
+	 */
+	public List<Class<?>> getRoundedCompartmentEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+
+		classes.add(ComponentEditPart.class);
+		classes.add(ComponentEditPartCN.class);
+		classes.add(ComponentEditPartPCN.class);
+		classes.add(InterfaceEditPart.class);
+		classes.add(InterfaceEditPartPCN.class);
+		classes.add(ModelEditPart.class);
+		classes.add(ModelEditPartCN.class);
+		classes.add(PackageEditPart.class);
+		classes.add(PackageEditPartCN.class);
+		classes.add(RectangleInterfaceEditPart.class);
+		classes.add(ComponentEditPartPCN.class);
+		classes.add(RectangleInterfaceEditPartCN.class);
+
+		return classes;
+	}
+
+	/**
+	 * Gets the rounded border named element edit parts.
+	 *
+	 * @return the rounded border named element edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()
+	 */
+	public List<Class<?>> getRoundedBorderNamedElementEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+		classes.add(PortEditPart.class);
+		return classes;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AbstractPapyrusTestCase.java
index 9be1a0f5b65..1d52b47be9d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AbstractPapyrusTestCase.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-

-/**

- * The Class AbstractPapyrusTestCase.

- */

-public abstract class AbstractPapyrusTestCase extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateComponentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+
+/**
+ * The Class AbstractPapyrusTestCase.
+ */
+public abstract class AbstractPapyrusTestCase extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateComponentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AllCanonicalTests.java
index 703839b3323..e526930ed27 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AllCanonicalTests.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All test in canonical package

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		// Top Node

-		TestComponentDiagramTopNode.class,

-		// Child Node

-		TestComponentDiagramPackageChildNode.class,

-		// child nodes in components

-		TestComponentDiagramComponentChildNode.class,

-		// child nodes in interface

-		TestComponentDiagramChildLabel.class,

-		// Link

-		TestComponentDiagramLink.class,

-		// Link owned by source

-		TestComponentDiagramLinkOwnedBySource.class,

-		// CommentLink

-		TestComponentDiagramCommentLink.class,

-		// Constraint Link

-		TestComponentDiagramConstraintLink.class,

-		// List compartment duplicates

-		TestListCompartmentNodeChildDuplicates.class,

-		// List Compartment Illegal Elements

-		TestListCompartmentIllegalElements.class,

-		TestListCompartmentPropertiesOperationsDrop.class,

-		TestComponentDiagramConnector.class,

-		TestComponentDiagramPortLink.class,

-		TestPortLocation.class

-		// End

-})

-public class AllCanonicalTests {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All test in canonical package
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		// Top Node
+		TestComponentDiagramTopNode.class,
+		// Child Node
+		TestComponentDiagramPackageChildNode.class,
+		// child nodes in components
+		TestComponentDiagramComponentChildNode.class,
+		// child nodes in interface
+		TestComponentDiagramChildLabel.class,
+		// Link
+		TestComponentDiagramLink.class,
+		// Link owned by source
+		TestComponentDiagramLinkOwnedBySource.class,
+		// CommentLink
+		TestComponentDiagramCommentLink.class,
+		// Constraint Link
+		TestComponentDiagramConstraintLink.class,
+		// List compartment duplicates
+		TestListCompartmentNodeChildDuplicates.class,
+		// List Compartment Illegal Elements
+		TestListCompartmentIllegalElements.class,
+		TestListCompartmentPropertiesOperationsDrop.class,
+		TestComponentDiagramConnector.class,
+		TestComponentDiagramPortLink.class,
+		TestPortLocation.class
+		// End
+})
+public class AllCanonicalTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/ComponentDiagramListCompartmentTestHelper.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/ComponentDiagramListCompartmentTestHelper.java
index a19c0803996..94f9c208a85 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/ComponentDiagramListCompartmentTestHelper.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/ComponentDiagramListCompartmentTestHelper.java
@@ -1,55 +1,55 @@
-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;

-

-public class ComponentDiagramListCompartmentTestHelper extends TestListCompartmentHelper {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param diagramEditPart

-	 * @param diagramEditor

-	 */

-	public ComponentDiagramListCompartmentTestHelper(DiagramEditPart diagramEditPart, UmlGmfDiagramEditor diagramEditor) {

-		super(diagramEditPart, diagramEditor);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getDefaultNamedElementVisualId()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getDefaultNamedElementVisualId() {

-		return DefaultNamedElementEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getElementType(int)

-	 *

-	 * @param childVID

-	 * @return

-	 */

-	@Override

-	protected IElementType getElementType(String childVID) {

-		return UMLElementTypes.getElementType(childVID);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getVisualID(org.eclipse.gmf.runtime.notation.View)

-	 *

-	 * @param view

-	 * @return

-	 */

-	@Override

-	protected String getVisualID(View view) {

-		return UMLVisualIDRegistry.getVisualID(view);

-	}

+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;
+
+public class ComponentDiagramListCompartmentTestHelper extends TestListCompartmentHelper {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param diagramEditPart
+	 * @param diagramEditor
+	 */
+	public ComponentDiagramListCompartmentTestHelper(DiagramEditPart diagramEditPart, UmlGmfDiagramEditor diagramEditor) {
+		super(diagramEditPart, diagramEditor);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getDefaultNamedElementVisualId()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getDefaultNamedElementVisualId() {
+		return DefaultNamedElementEditPart.VISUAL_ID;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getElementType(int)
+	 *
+	 * @param childVID
+	 * @return
+	 */
+	@Override
+	protected IElementType getElementType(String childVID) {
+		return UMLElementTypes.getElementType(childVID);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.ListCompartmentTestHelper#getVisualID(org.eclipse.gmf.runtime.notation.View)
+	 *
+	 * @param view
+	 * @return
+	 */
+	@Override
+	protected String getVisualID(View view) {
+		return UMLVisualIDRegistry.getVisualID(view);
+	}
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramChildLabel.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramChildLabel.java
index 6cf192085b7..75d9953050a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramChildLabel.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramChildLabel.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * 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.uml.diagram.component.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildLabel;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramChildNode.

- */

-

-public class TestComponentDiagramChildLabel extends TestChildLabel {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateComponentDiagramCommand();

-	}

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage i package.

-	 */

-	@Test

-	public void testToManageProperty() {

-		testToManageTopNode(UMLElementTypes.Interface_ClassifierShape,UMLElementTypes.Property_InterfaceAttributeLabel,   InterfaceAttributeCompartmentEditPart.VISUAL_ID, "Attribute");

-	}

-	

-	/**

-	 * Test to manage i package.

-	 */

-	@Test

-	public void testToManageOperation() {

-		testToManageTopNode(UMLElementTypes.Interface_ClassifierShape,UMLElementTypes.Operation_InterfaceOperationLabel,   InterfaceOperationCompartmentEditPart.VISUAL_ID);

-	}

-	

-	/**

-	 * Test to manage i package.

-	 */

-	@Test

-	public void testToManageReception() {

-		testToManageTopNode(UMLElementTypes.Interface_ClassifierShape,UMLElementTypes.Reception_InterfaceReceptionLabel,  InterfaceOperationCompartmentEditPart.VISUAL_ID);

-	}

-

-	

-}

+/*****************************************************************************
+ * 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.uml.diagram.component.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildLabel;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramChildNode.
+ */
+
+public class TestComponentDiagramChildLabel extends TestChildLabel {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateComponentDiagramCommand();
+	}
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage i package.
+	 */
+	@Test
+	public void testToManageProperty() {
+		testToManageTopNode(UMLElementTypes.Interface_ClassifierShape,UMLElementTypes.Property_InterfaceAttributeLabel,   InterfaceAttributeCompartmentEditPart.VISUAL_ID, "Attribute");
+	}
+	
+	/**
+	 * Test to manage i package.
+	 */
+	@Test
+	public void testToManageOperation() {
+		testToManageTopNode(UMLElementTypes.Interface_ClassifierShape,UMLElementTypes.Operation_InterfaceOperationLabel,   InterfaceOperationCompartmentEditPart.VISUAL_ID);
+	}
+	
+	/**
+	 * Test to manage i package.
+	 */
+	@Test
+	public void testToManageReception() {
+		testToManageTopNode(UMLElementTypes.Interface_ClassifierShape,UMLElementTypes.Reception_InterfaceReceptionLabel,  InterfaceOperationCompartmentEditPart.VISUAL_ID);
+	}
+
+	
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java
index 847d0cb6f55..a499ea7eb8f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestCommentLink;

-import org.junit.Test;

-

-public class TestComponentDiagramCommentLink extends TestCommentLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateComponentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-	

-	/**

-	 * Test to manage Comment

-	 */

-	@Test

-	public void testToManageComment() {

-		testToManageLink(UMLElementTypes.Comment_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Comment_AnnotatedElementEdge, UMLElementTypes.Package_Shape, 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestCommentLink;
+import org.junit.Test;
+
+public class TestComponentDiagramCommentLink extends TestCommentLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateComponentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+	
+	/**
+	 * Test to manage Comment
+	 */
+	@Test
+	public void testToManageComment() {
+		testToManageLink(UMLElementTypes.Comment_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Comment_AnnotatedElementEdge, UMLElementTypes.Package_Shape, true);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java
index 959730ba832..ab375f65ba9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * 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.uml.diagram.component.test.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramChildNode.

- */

-

-public class TestComponentDiagramComponentChildNode extends TestChildNode {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateComponentDiagramCommand();

-	}

-

-	@Override

-	protected CreateViewRequest createViewRequestShapeContainer() {

-		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Component_PackagedElementShape, getDiagramEditPart().getDiagramPreferencesHint());

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-

-	/**

-	 * Test to manage Constraint

-	 */

-	@Test

-	public void testToManagePropertyPart() {

-		testToManageNodeWithMask(UMLElementTypes.Property_Shape, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Component_PackagedElementShape, false, "Attribute", 0);

-	}

-

-	/**

-	 * Test to manage Constraint

-	 */

-	@Test

-	public void testToManagePort() {

-		setTestAffixedNode(true);

-		testToManageNode(UMLElementTypes.Port_Shape, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Component_PackagedElementShape, false, 4, 0, 1, 1, true, null, 0);

-		setTestAffixedNode(false);

-	}

-

-	@FailingTest

-	@Test

-	public void testToManageComponent() {

-		testToManageNode(UMLElementTypes.Component_PackagedElementShape_CCN, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Component_PackagedElementShape, true, 0, 0, 1, 1, false, "Component", 0);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.component.test.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramChildNode.
+ */
+
+public class TestComponentDiagramComponentChildNode extends TestChildNode {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateComponentDiagramCommand();
+	}
+
+	@Override
+	protected CreateViewRequest createViewRequestShapeContainer() {
+		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Component_PackagedElementShape, getDiagramEditPart().getDiagramPreferencesHint());
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+
+	/**
+	 * Test to manage Constraint
+	 */
+	@Test
+	public void testToManagePropertyPart() {
+		testToManageNodeWithMask(UMLElementTypes.Property_Shape, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Component_PackagedElementShape, false, "Attribute", 0);
+	}
+
+	/**
+	 * Test to manage Constraint
+	 */
+	@Test
+	public void testToManagePort() {
+		setTestAffixedNode(true);
+		testToManageNode(UMLElementTypes.Port_Shape, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Component_PackagedElementShape, false, 4, 0, 1, 1, true, null, 0);
+		setTestAffixedNode(false);
+	}
+
+	@FailingTest
+	@Test
+	public void testToManageComponent() {
+		testToManageNode(UMLElementTypes.Component_PackagedElementShape_CCN, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Component_PackagedElementShape, true, 0, 0, 1, 1, false, "Component", 0);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConnector.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConnector.java
index 46e5a055409..a188d646e84 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConnector.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConnector.java
@@ -1,79 +1,79 @@
-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-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.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-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.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Test;

-

-public class TestComponentDiagramConnector extends TestChildNode {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateComponentDiagramCommand();

-	}

-

-	@Override

-	protected CreateViewRequest createViewRequestShapeContainer() {

-		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Component_PackagedElementShape, getDiagramEditPart().getDiagramPreferencesHint());

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testToManagePropertyPortConnection() {

-		testToManageNodeWithMask(UMLElementTypes.Property_Shape, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Component_PackagedElementShape, false, "Attribute", 0);

-		setTestAffixedNode(true);

-		testToManageNode(UMLElementTypes.Port_Shape, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Component_PackagedElementShape, false, 4, 0, 1, 1, true, null, 0);

-		GraphicalEditPart parent = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);

-		GraphicalEditPart source = (GraphicalEditPart) parent.getChildBySemanticHint(((IHintedType) UMLElementTypes.Port_Shape).getSemanticHint());

-		GraphicalEditPart targetCompartment = (GraphicalEditPart) parent.getChildren().get(2);

-		GraphicalEditPart target = (GraphicalEditPart) targetCompartment.getChildren().get(0);

-		Command command = target.getCommand(createConnectionViewRequest(UMLElementTypes.Connector_Edge, source, target));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-	}

-

-	private CreateConnectionViewRequest createConnectionViewRequest(IElementType type, EditPart source, EditPart target) {

-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, ((IGraphicalEditPart) getDiagramEditPart()).getDiagramPreferencesHint());

-		connectionRequest.setSourceEditPart(null);

-		connectionRequest.setTargetEditPart(source);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);

-		source.getCommand(connectionRequest);

-		connectionRequest.setSourceEditPart(source);

-		connectionRequest.setTargetEditPart(target);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);

-		return connectionRequest;

-	}

-}

+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+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.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+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.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Test;
+
+public class TestComponentDiagramConnector extends TestChildNode {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateComponentDiagramCommand();
+	}
+
+	@Override
+	protected CreateViewRequest createViewRequestShapeContainer() {
+		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Component_PackagedElementShape, getDiagramEditPart().getDiagramPreferencesHint());
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testToManagePropertyPortConnection() {
+		testToManageNodeWithMask(UMLElementTypes.Property_Shape, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Component_PackagedElementShape, false, "Attribute", 0);
+		setTestAffixedNode(true);
+		testToManageNode(UMLElementTypes.Port_Shape, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Component_PackagedElementShape, false, 4, 0, 1, 1, true, null, 0);
+		GraphicalEditPart parent = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);
+		GraphicalEditPart source = (GraphicalEditPart) parent.getChildBySemanticHint(((IHintedType) UMLElementTypes.Port_Shape).getSemanticHint());
+		GraphicalEditPart targetCompartment = (GraphicalEditPart) parent.getChildren().get(2);
+		GraphicalEditPart target = (GraphicalEditPart) targetCompartment.getChildren().get(0);
+		Command command = target.getCommand(createConnectionViewRequest(UMLElementTypes.Connector_Edge, source, target));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+	}
+
+	private CreateConnectionViewRequest createConnectionViewRequest(IElementType type, EditPart source, EditPart target) {
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, ((IGraphicalEditPart) getDiagramEditPart()).getDiagramPreferencesHint());
+		connectionRequest.setSourceEditPart(null);
+		connectionRequest.setTargetEditPart(source);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
+		source.getCommand(connectionRequest);
+		connectionRequest.setSourceEditPart(source);
+		connectionRequest.setTargetEditPart(target);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
+		return connectionRequest;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java
index a81b4752c96..879effbb409 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestConstraintLink;

-import org.junit.Test;

-

-public class TestComponentDiagramConstraintLink extends TestConstraintLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateComponentDiagramCommand();

-	}

-	

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage Constraint

-	 */

-	@Test

-	public void testToManageConstraint() {

-		testToManageLink(UMLElementTypes.Constraint_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Constraint_ConstrainedElementEdge, UMLElementTypes.Package_Shape, 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestConstraintLink;
+import org.junit.Test;
+
+public class TestComponentDiagramConstraintLink extends TestConstraintLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateComponentDiagramCommand();
+	}
+	
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage Constraint
+	 */
+	@Test
+	public void testToManageConstraint() {
+		testToManageLink(UMLElementTypes.Constraint_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Constraint_ConstrainedElementEdge, UMLElementTypes.Package_Shape, true);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java
index 7f7255327e5..8756d53d5c1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramLink.

- */

-public class TestComponentDiagramLink extends TestLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateComponentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage Abstraction

-	 */

-	@Test

-	@FailingTest

-	public void testToManageAbstraction() {

-		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Dependency

-	 */

-	@Test

-	@FailingTest

-	public void testToManageDependency() {

-		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);

-

-	}

-

-	/**

-	 * Test to manage Manifestation

-	 */

-	@Test

-	@FailingTest

-	public void testToManageManifestation() {

-		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Usage

-	 */

-	@Test

-	@FailingTest

-	public void testToManageUsage() {

-		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Interface Realization

-	 */

-	@Test

-	@FailingTest

-	public void testToManageInterfaceRealization() {

-		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.InterfaceRealization_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Component Realization

-	 */

-	@Test

-	@FailingTest

-	public void testToManageComponentRealization() {

-		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.ComponentRealization_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Abstraction for Interface source

-	 */

-	@Test

-	public void testToManageInterfaceAbstraction() {

-		testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to manage Dependency for Interface source

-	 */

-	@Test

-	public void testToManageInterfaceDependency() {

-		testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);

-

-	}

-

-	/**

-	 * Test to manage Manifestation for Interface source

-	 */

-	@Test

-	public void testToManageInterfaceManifestation() {

-		testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-	/**

-	 * Test to manage Usage for Interface source

-	 */

-	@Test

-	public void testToManageInterfaceUsage() {

-		testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	/**

-	 * Test to create a link.

-	 *

-	 * @param linkType

-	 *            the type

-	 */

-	@Override

-	public void testToCreateALink(IElementType linkType, String initialName) {

-		testCreateLink(linkType, initialName);

-	}

-

-	/**

-	 * htis method is used to test the created link editpart

-	 *

-	 * @param linkEditPart

-	 */

-	@Override

-	protected void testLinkEditPart(ConnectionEditPart linkEditPart, String initialName) {

-		super.testLinkEditPart(linkEditPart, initialName);

-		EditPolicy policy = linkEditPart.getEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY);

-		Assert.assertNotNull("the link must have an stereotype edipolicy.", policy); //$NON-NLS-1$

-		Assert.assertTrue("the policy of the link must be an instance of AppliedStereotypeLinkLabelDisplayEditPolicy", policy instanceof AppliedStereotypeLinkLabelDisplayEditPolicy); //$NON-NLS-1$

-		Assert.assertTrue("Expected link childs count is 2.", linkEditPart.getChildren().size() == 2);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramLink.
+ */
+public class TestComponentDiagramLink extends TestLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateComponentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage Abstraction
+	 */
+	@Test
+	@FailingTest
+	public void testToManageAbstraction() {
+		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Dependency
+	 */
+	@Test
+	@FailingTest
+	public void testToManageDependency() {
+		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);
+
+	}
+
+	/**
+	 * Test to manage Manifestation
+	 */
+	@Test
+	@FailingTest
+	public void testToManageManifestation() {
+		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Usage
+	 */
+	@Test
+	@FailingTest
+	public void testToManageUsage() {
+		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Interface Realization
+	 */
+	@Test
+	@FailingTest
+	public void testToManageInterfaceRealization() {
+		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.InterfaceRealization_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Component Realization
+	 */
+	@Test
+	@FailingTest
+	public void testToManageComponentRealization() {
+		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.ComponentRealization_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Abstraction for Interface source
+	 */
+	@Test
+	public void testToManageInterfaceAbstraction() {
+		testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to manage Dependency for Interface source
+	 */
+	@Test
+	public void testToManageInterfaceDependency() {
+		testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);
+
+	}
+
+	/**
+	 * Test to manage Manifestation for Interface source
+	 */
+	@Test
+	public void testToManageInterfaceManifestation() {
+		testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+	/**
+	 * Test to manage Usage for Interface source
+	 */
+	@Test
+	public void testToManageInterfaceUsage() {
+		testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	/**
+	 * Test to create a link.
+	 *
+	 * @param linkType
+	 *            the type
+	 */
+	@Override
+	public void testToCreateALink(IElementType linkType, String initialName) {
+		testCreateLink(linkType, initialName);
+	}
+
+	/**
+	 * htis method is used to test the created link editpart
+	 *
+	 * @param linkEditPart
+	 */
+	@Override
+	protected void testLinkEditPart(ConnectionEditPart linkEditPart, String initialName) {
+		super.testLinkEditPart(linkEditPart, initialName);
+		EditPolicy policy = linkEditPart.getEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY);
+		Assert.assertNotNull("the link must have an stereotype edipolicy.", policy); //$NON-NLS-1$
+		Assert.assertTrue("the policy of the link must be an instance of AppliedStereotypeLinkLabelDisplayEditPolicy", policy instanceof AppliedStereotypeLinkLabelDisplayEditPolicy); //$NON-NLS-1$
+		Assert.assertTrue("Expected link childs count is 2.", linkEditPart.getChildren().size() == 2);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java
index 723d309c1f2..e3461b12b78 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 468646

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkOwnedBySource;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramLink use to test link that are contained by the owner of the target and the source

- */

-public class TestComponentDiagramLinkOwnedBySource extends TestLinkOwnedBySource {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateComponentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage Generalization

-	 */

-	@Test

-	public void testToManageGeneralization() {

-		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 468646
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkOwnedBySource;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramLink use to test link that are contained by the owner of the target and the source
+ */
+public class TestComponentDiagramLinkOwnedBySource extends TestLinkOwnedBySource {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateComponentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage Generalization
+	 */
+	@Test
+	public void testToManageGeneralization() {
+		testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentIllegalElements.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentIllegalElements.java
index e739079b386..bc7981ba532 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentIllegalElements.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentIllegalElements.java
@@ -1,61 +1,61 @@
-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;

-import org.junit.Test;

-

-/**

- *

- */

-public class TestListCompartmentIllegalElements extends AbstractPapyrusTestCase {

-

-	private TestListCompartmentHelper myHelper;

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testPropertyInInterfaceOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInInterfaceAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testReceptionInInterfaceAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableChildCreate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, ReceptionInInterfaceEditPart.VISUAL_ID);

-	}

-

-	private TestListCompartmentHelper getHelper() {

-		if (myHelper == null) {

-			myHelper = new ComponentDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);

-		}

-		return myHelper;

-	}

-}

+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class TestListCompartmentIllegalElements extends AbstractPapyrusTestCase {
+
+	private TestListCompartmentHelper myHelper;
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testPropertyInInterfaceOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInInterfaceAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testReceptionInInterfaceAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableChildCreate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, ReceptionInInterfaceEditPart.VISUAL_ID);
+	}
+
+	private TestListCompartmentHelper getHelper() {
+		if (myHelper == null) {
+			myHelper = new ComponentDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);
+		}
+		return myHelper;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentNodeChildDuplicates.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentNodeChildDuplicates.java
index b57c9202253..87c99096df3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentNodeChildDuplicates.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentNodeChildDuplicates.java
@@ -1,61 +1,61 @@
-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;

-import org.junit.Test;

-

-/**

- *

- */

-public class TestListCompartmentNodeChildDuplicates extends AbstractPapyrusTestCase {

-

-	private TestListCompartmentHelper myHelper;

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testInterfaceVsOperation() throws Exception {

-		getHelper().checkDuplicate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsProperty() throws Exception {

-		getHelper().checkDuplicate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testInterfaceVsReception() throws Exception {

-		getHelper().checkDuplicate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, ReceptionInInterfaceEditPart.VISUAL_ID);

-	}

-

-	private TestListCompartmentHelper getHelper() {

-		if (myHelper == null) {

-			myHelper = new ComponentDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);

-		}

-		return myHelper;

-	}

-}

+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class TestListCompartmentNodeChildDuplicates extends AbstractPapyrusTestCase {
+
+	private TestListCompartmentHelper myHelper;
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testInterfaceVsOperation() throws Exception {
+		getHelper().checkDuplicate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsProperty() throws Exception {
+		getHelper().checkDuplicate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testInterfaceVsReception() throws Exception {
+		getHelper().checkDuplicate(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, ReceptionInInterfaceEditPart.VISUAL_ID);
+	}
+
+	private TestListCompartmentHelper getHelper() {
+		if (myHelper == null) {
+			myHelper = new ComponentDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);
+		}
+		return myHelper;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentPropertiesOperationsDrop.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentPropertiesOperationsDrop.java
index 67dcc585d87..303566bce97 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentPropertiesOperationsDrop.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestListCompartmentPropertiesOperationsDrop.java
@@ -1,76 +1,76 @@
-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;

-import org.junit.Test;

-

-/**

- *

- */

-public class TestListCompartmentPropertiesOperationsDrop extends AbstractPapyrusTestCase {

-

-	private TestListCompartmentHelper myHelper;

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	@FailingTest

-	public void testPropertyInInterfaceAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@FailingTest

-	public void testOperationInInterfaceOperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop2Canvas(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testPropertyInInterfaceDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testOperationInInterfaceDropFromModelExplorer() throws Exception {

-		getHelper().checkDropPropertyFromModelExplorer2Canvas(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropInterface2PropertyAttributeCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, RectangleInterfaceEditPart.VISUAL_ID);

-	}

-

-	@Test

-	public void testDropInterface2OperationCompartment() throws Exception {

-		getHelper().checkUnexecutableDrop(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, RectangleInterfaceEditPart.VISUAL_ID);

-	}

-

-	private TestListCompartmentHelper getHelper() {

-		if (myHelper == null) {

-			myHelper = new ComponentDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);

-		}

-		return myHelper;

-	}

-}

+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestListCompartmentHelper;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class TestListCompartmentPropertiesOperationsDrop extends AbstractPapyrusTestCase {
+
+	private TestListCompartmentHelper myHelper;
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	@FailingTest
+	public void testPropertyInInterfaceAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@FailingTest
+	public void testOperationInInterfaceOperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop2Canvas(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testPropertyInInterfaceDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, PropertyForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testOperationInInterfaceDropFromModelExplorer() throws Exception {
+		getHelper().checkDropPropertyFromModelExplorer2Canvas(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, OperationForInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropInterface2PropertyAttributeCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(RectangleInterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, RectangleInterfaceEditPart.VISUAL_ID);
+	}
+
+	@Test
+	public void testDropInterface2OperationCompartment() throws Exception {
+		getHelper().checkUnexecutableDrop(RectangleInterfaceEditPart.VISUAL_ID, InterfaceOperationCompartmentEditPart.VISUAL_ID, RectangleInterfaceEditPart.VISUAL_ID);
+	}
+
+	private TestListCompartmentHelper getHelper() {
+		if (myHelper == null) {
+			myHelper = new ComponentDiagramListCompartmentTestHelper(getDiagramEditPart(), diagramEditor);
+		}
+		return myHelper;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestPortLocation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestPortLocation.java
index 5efd132fb6b..07e5258371a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestPortLocation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestPortLocation.java
@@ -1,48 +1,48 @@
-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentCompositeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.junit.Test;

-

-public class TestPortLocation extends org.eclipse.papyrus.uml.diagram.tests.canonical.TestPortLocation {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateComponentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Test

-	public void testComponentPortLocation() {

-		testPortLocation(UMLElementTypes.Component_PackagedElementShape);

-	}

-

-	@Test

-	public void testComponentPartPortLocation() {

-		testPortLocation(UMLElementTypes.Component_PackagedElementShape, ComponentCompositeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Property_Shape);

-	}

-

-	@Override

-	protected IElementType getPortType() {

-		return UMLElementTypes.Port_Shape;

-	}

-}

+package org.eclipse.papyrus.uml.diagram.component.test.canonical;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentCompositeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.junit.Test;
+
+public class TestPortLocation extends org.eclipse.papyrus.uml.diagram.tests.canonical.TestPortLocation {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateComponentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Test
+	public void testComponentPortLocation() {
+		testPortLocation(UMLElementTypes.Component_PackagedElementShape);
+	}
+
+	@Test
+	public void testComponentPartPortLocation() {
+		testPortLocation(UMLElementTypes.Component_PackagedElementShape, ComponentCompositeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Property_Shape);
+	}
+
+	@Override
+	protected IElementType getPortType() {
+		return UMLElementTypes.Port_Shape;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java
index 419b523a87f..eaacf3e5fce 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load1000ComponentTest.

- */

-public class Load1000ComponentTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a Component.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load1000 Component.

-	 */

-	@Test

-	public void testLoad1000Component() {

-		for(int i = 0; i < 1000; i++) {

-			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load1000ComponentTest.
+ */
+public class Load1000ComponentTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a Component.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load1000 Component.
+	 */
+	@Test
+	public void testLoad1000Component() {
+		for(int i = 0; i < 1000; i++) {
+			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java
index c85cf41a084..6fc4e22f397 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load100ComponentTest.

- */

-public class Load100ComponentTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a Component.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load100 Component.

-	 */

-	@Test

-	public void testLoad100Component() {

-		for(int i = 0; i < 100; i++) {

-			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load100ComponentTest.
+ */
+public class Load100ComponentTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a Component.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load100 Component.
+	 */
+	@Test
+	public void testLoad100Component() {
+		for(int i = 0; i < 100; i++) {
+			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java
index bbd3479fd4f..0d7355dee84 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load10ComponentTest.

- */

-public class Load10ComponentTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a Component.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load10 Component.

-	 */

-	@Test

-	public void testLoad10Component() {

-		for(int i = 0; i < 10; i++) {

-			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load10ComponentTest.
+ */
+public class Load10ComponentTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a Component.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load10 Component.
+	 */
+	@Test
+	public void testLoad10Component() {
+		for(int i = 0; i < 10; i++) {
+			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java
index 3db39006ecb..910955fce40 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load200ComponentTest.

- */

-public class Load200ComponentTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a Component.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load200 Component.

-	 */

-	@Test

-	public void testLoad200Component() {

-		for(int i = 0; i < 200; i++) {

-			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load200ComponentTest.
+ */
+public class Load200ComponentTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a Component.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load200 Component.
+	 */
+	@Test
+	public void testLoad200Component() {
+		for(int i = 0; i < 200; i++) {
+			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java
index 12789f5e99d..f3e08a2c9dd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load300ComponentTest.

- */

-public class Load300ComponentTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a Component.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load300 Component.

-	 */

-	@Test

-	public void testLoad300Component() {

-		for(int i = 0; i < 300; i++) {

-			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load300ComponentTest.
+ */
+public class Load300ComponentTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a Component.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load300 Component.
+	 */
+	@Test
+	public void testLoad300Component() {
+		for(int i = 0; i < 300; i++) {
+			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java
index 3ea5b665c0f..f0d8159ff73 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load400ComponentTest.

- */

-public class Load400ComponentTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a Component.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load400 Component.

-	 */

-	@Test

-	public void testLoad400Component() {

-		for(int i = 0; i < 400; i++) {

-			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load400ComponentTest.
+ */
+public class Load400ComponentTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a Component.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load400 Component.
+	 */
+	@Test
+	public void testLoad400Component() {
+		for(int i = 0; i < 400; i++) {
+			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java
index def277e05c8..e775836e7ca 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load500ComponentTest.

- */

-public class Load500ComponentTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IComponentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IComponentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a Component.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load500 Component.

-	 */

-	@Test

-	public void testLoad500Component() {

-		for(int i = 0; i < 500; i++) {

-			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load500ComponentTest.
+ */
+public class Load500ComponentTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IComponentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IComponentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a Component.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load500 Component.
+	 */
+	@Test
+	public void testLoad500Component() {
+		for(int i = 0; i < 500; i++) {
+			testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/LoadTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/LoadTests.java
index 792e94db892..a2fd8dce18e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/LoadTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/LoadTests.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.load;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-// 10 Component

-Load10ComponentTest.class,

-//100 Component

-Load100ComponentTest.class,

-//200 Component

-Load200ComponentTest.class,

-//300 Component

-Load300ComponentTest.class,

-//400 Component

-Load400ComponentTest.class,

-//500 Component

-Load500ComponentTest.class,

-//1000 Component

-Load1000ComponentTest.class, })

-public class LoadTests {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.test.load;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All tests together.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+// 10 Component
+Load10ComponentTest.class,
+//100 Component
+Load100ComponentTest.class,
+//200 Component
+Load200ComponentTest.class,
+//300 Component
+Load300ComponentTest.class,
+//400 Component
+Load400ComponentTest.class,
+//500 Component
+Load500ComponentTest.class,
+//1000 Component
+Load1000ComponentTest.class, })
+public class LoadTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF
index 8fd283d190f..d3701ec5b1a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF
@@ -1,34 +1,34 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.xtend.lib;bundle-version="2.8.1",

- org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.composite.test,

- org.eclipse.papyrus.uml.diagram.composite.test.canonical,

- org.eclipse.papyrus.uml.diagram.composite.test.generation

-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.uml.diagram.composite.test.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.core.expressions,
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.composite.test,
+ org.eclipse.papyrus.uml.diagram.composite.test.canonical,
+ org.eclipse.papyrus.uml.diagram.composite.test.generation
+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.uml.diagram.composite.test.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/RoundedCompartmentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/RoundedCompartmentTest.java
index 3dd05e0b8ef..85a779c2e8e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/RoundedCompartmentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/RoundedCompartmentTest.java
@@ -1,182 +1,182 @@
-/*****************************************************************************

- * 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

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.composite.test;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AnyReceiveEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.BehaviorPortEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CallEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ChangeEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationRoleEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationUseEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationIntervalEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExpressionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InstanceValueEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralBooleanEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralIntegerEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralNullEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralStringEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralUnlimitedNaturalEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueExpressionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.StringExpressionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeExpressionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeIntervalEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseEditPartCN;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;

-

-/**

- * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.

- */

-public class RoundedCompartmentTest extends AbstractGenericShapeTest {

-

-	/**

-	 * Gets the rounded compartment edit parts.

-	 *

-	 * @return the rounded compartment edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()

-	 */

-	public List<Class<?>> getRoundedCompartmentEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-

-		classes.add(BehaviorPortEditPart.class);

-		classes.add(ActivityCompositeEditPart.class);

-		classes.add(ActivityCompositeEditPartCN.class);

-		classes.add(AnyReceiveEventEditPart.class);

-		classes.add(CallEventEditPart.class);

-		classes.add(ChangeEventEditPart.class);

-		classes.add(ClassCompositeEditPart.class);

-		classes.add(ClassCompositeEditPartCN.class);

-		classes.add(CollaborationCompositeEditPart.class);

-		classes.add(CollaborationCompositeEditPartCN.class);

-		classes.add(CollaborationRoleEditPartCN.class);

-		classes.add(CollaborationUseEditPartCN.class);

-		classes.add(ComponentCompositeEditPart.class);

-		classes.add(ComponentCompositeEditPartCN.class);

-		classes.add(DataTypeEditPart.class);

-		classes.add(DataTypeEditPartCN.class);

-		classes.add(DeploymentSpecificationEditPart.class);

-		classes.add(DeploymentSpecificationEditPartCN.class);

-		classes.add(DeviceCompositeEditPart.class);

-		classes.add(DeviceCompositeEditPartCN.class);

-		classes.add(DurationEditPart.class);

-		classes.add(DurationIntervalEditPart.class);

-		classes.add(DurationObservationEditPart.class);

-		classes.add(EnumerationEditPart.class);

-		classes.add(EnumerationEditPartCN.class);

-		classes.add(ExecutionEnvironmentCompositeEditPart.class);

-		classes.add(ExecutionEnvironmentCompositeEditPartCN.class);

-		classes.add(ExpressionEditPart.class);

-		classes.add(FunctionBehaviorCompositeEditPart.class);

-		classes.add(FunctionBehaviorCompositeEditPartCN.class);

-		classes.add(InformationItemEditPart.class);

-		classes.add(InformationItemEditPartCN.class);

-		classes.add(InstanceValueEditPart.class);

-		classes.add(InteractionCompositeEditPart.class);

-		classes.add(InteractionCompositeEditPartCN.class);

-		classes.add(InterfaceEditPart.class);

-		classes.add(InterfaceEditPartCN.class);

-		classes.add(IntervalEditPart.class);

-		classes.add(LiteralBooleanEditPart.class);

-		classes.add(LiteralIntegerEditPart.class);

-		classes.add(LiteralNullEditPart.class);

-		classes.add(LiteralStringEditPart.class);

-		classes.add(LiteralUnlimitedNaturalEditPart.class);

-		classes.add(NodeCompositeEditPart.class);

-		classes.add(NodeCompositeEditPartCN.class);

-		classes.add(OpaqueBehaviorCompositeEditPart.class);

-		classes.add(OpaqueBehaviorCompositeEditPartCN.class);

-		classes.add(OpaqueExpressionEditPart.class);

-		classes.add(PrimitiveTypeEditPart.class);

-		classes.add(PrimitiveTypeEditPartCN.class);

-		classes.add(PropertyPartEditPartCN.class);

-		classes.add(ProtocolStateMachineCompositeEditPart.class);

-		classes.add(ProtocolStateMachineCompositeEditPartCN.class);

-		classes.add(SignalEditPart.class);

-		classes.add(SignalEditPartCN.class);

-		classes.add(SignalEventEditPart.class);

-		classes.add(StateMachineCompositeEditPart.class);

-		classes.add(StateMachineCompositeEditPartCN.class);

-		classes.add(StringExpressionEditPart.class);

-		classes.add(TimeEventEditPart.class);

-		classes.add(TimeExpressionEditPart.class);

-		classes.add(TimeIntervalEditPart.class);

-		classes.add(TimeObservationEditPart.class);

-		classes.add(UseCaseEditPart.class);

-		classes.add(UseCaseEditPartCN.class);

-		return classes;

-	}

-

-	/**

-	 * Gets the rounded border named element edit parts.

-	 *

-	 * @return the rounded border named element edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()

-	 */

-	public List<Class<?>> getRoundedBorderNamedElementEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-		classes.add(ParameterEditPart.class);

-		classes.add(PortEditPart.class);

-		return classes;

-	}

-}

+/*****************************************************************************
+ * 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
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.composite.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AnyReceiveEventEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.BehaviorPortEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CallEventEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ChangeEventEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationRoleEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationUseEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationIntervalEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExpressionEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InstanceValueEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralBooleanEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralIntegerEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralNullEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralStringEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralUnlimitedNaturalEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueExpressionEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEventEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeEditPartCN;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.StringExpressionEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeEventEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeExpressionEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeIntervalEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseEditPartCN;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;
+
+/**
+ * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.
+ */
+public class RoundedCompartmentTest extends AbstractGenericShapeTest {
+
+	/**
+	 * Gets the rounded compartment edit parts.
+	 *
+	 * @return the rounded compartment edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()
+	 */
+	public List<Class<?>> getRoundedCompartmentEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+
+		classes.add(BehaviorPortEditPart.class);
+		classes.add(ActivityCompositeEditPart.class);
+		classes.add(ActivityCompositeEditPartCN.class);
+		classes.add(AnyReceiveEventEditPart.class);
+		classes.add(CallEventEditPart.class);
+		classes.add(ChangeEventEditPart.class);
+		classes.add(ClassCompositeEditPart.class);
+		classes.add(ClassCompositeEditPartCN.class);
+		classes.add(CollaborationCompositeEditPart.class);
+		classes.add(CollaborationCompositeEditPartCN.class);
+		classes.add(CollaborationRoleEditPartCN.class);
+		classes.add(CollaborationUseEditPartCN.class);
+		classes.add(ComponentCompositeEditPart.class);
+		classes.add(ComponentCompositeEditPartCN.class);
+		classes.add(DataTypeEditPart.class);
+		classes.add(DataTypeEditPartCN.class);
+		classes.add(DeploymentSpecificationEditPart.class);
+		classes.add(DeploymentSpecificationEditPartCN.class);
+		classes.add(DeviceCompositeEditPart.class);
+		classes.add(DeviceCompositeEditPartCN.class);
+		classes.add(DurationEditPart.class);
+		classes.add(DurationIntervalEditPart.class);
+		classes.add(DurationObservationEditPart.class);
+		classes.add(EnumerationEditPart.class);
+		classes.add(EnumerationEditPartCN.class);
+		classes.add(ExecutionEnvironmentCompositeEditPart.class);
+		classes.add(ExecutionEnvironmentCompositeEditPartCN.class);
+		classes.add(ExpressionEditPart.class);
+		classes.add(FunctionBehaviorCompositeEditPart.class);
+		classes.add(FunctionBehaviorCompositeEditPartCN.class);
+		classes.add(InformationItemEditPart.class);
+		classes.add(InformationItemEditPartCN.class);
+		classes.add(InstanceValueEditPart.class);
+		classes.add(InteractionCompositeEditPart.class);
+		classes.add(InteractionCompositeEditPartCN.class);
+		classes.add(InterfaceEditPart.class);
+		classes.add(InterfaceEditPartCN.class);
+		classes.add(IntervalEditPart.class);
+		classes.add(LiteralBooleanEditPart.class);
+		classes.add(LiteralIntegerEditPart.class);
+		classes.add(LiteralNullEditPart.class);
+		classes.add(LiteralStringEditPart.class);
+		classes.add(LiteralUnlimitedNaturalEditPart.class);
+		classes.add(NodeCompositeEditPart.class);
+		classes.add(NodeCompositeEditPartCN.class);
+		classes.add(OpaqueBehaviorCompositeEditPart.class);
+		classes.add(OpaqueBehaviorCompositeEditPartCN.class);
+		classes.add(OpaqueExpressionEditPart.class);
+		classes.add(PrimitiveTypeEditPart.class);
+		classes.add(PrimitiveTypeEditPartCN.class);
+		classes.add(PropertyPartEditPartCN.class);
+		classes.add(ProtocolStateMachineCompositeEditPart.class);
+		classes.add(ProtocolStateMachineCompositeEditPartCN.class);
+		classes.add(SignalEditPart.class);
+		classes.add(SignalEditPartCN.class);
+		classes.add(SignalEventEditPart.class);
+		classes.add(StateMachineCompositeEditPart.class);
+		classes.add(StateMachineCompositeEditPartCN.class);
+		classes.add(StringExpressionEditPart.class);
+		classes.add(TimeEventEditPart.class);
+		classes.add(TimeExpressionEditPart.class);
+		classes.add(TimeIntervalEditPart.class);
+		classes.add(TimeObservationEditPart.class);
+		classes.add(UseCaseEditPart.class);
+		classes.add(UseCaseEditPartCN.class);
+		return classes;
+	}
+
+	/**
+	 * Gets the rounded border named element edit parts.
+	 *
+	 * @return the rounded border named element edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()
+	 */
+	public List<Class<?>> getRoundedBorderNamedElementEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+		classes.add(ParameterEditPart.class);
+		classes.add(PortEditPart.class);
+		return classes;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramActivityChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramActivityChildNode.java
index 17920674c14..c8ed7b814a0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramActivityChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramActivityChildNode.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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.composite.test.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramChildNode.

- */

-

-public class TestCompositeDiagramActivityChildNode extends TestChildNode {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateCompositeDiagramCommand();

-	}

-

-	@Override

-	protected CreateViewRequest createViewRequestShapeContainer() {

-		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Activity_Shape, getDiagramEditPart().getDiagramPreferencesHint());

-	}

-

-	@Override

-	protected String getProjectName() {

-		return ICompositeDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return ICompositeDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage Parameter.

-	 */

-	@Test

-	public void testToParameter() {

-		setTestAffixedNode(true);

-		testToManageNode(UMLElementTypes.Parameter_Shape, UMLPackage.eINSTANCE.getParameter(), UMLElementTypes.Activity_Shape, false, 4, 0, 1, 1, false, null, 0);

-		setTestAffixedNode(false);

-	}

-

-

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.composite.test.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramChildNode.
+ */
+
+public class TestCompositeDiagramActivityChildNode extends TestChildNode {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateCompositeDiagramCommand();
+	}
+
+	@Override
+	protected CreateViewRequest createViewRequestShapeContainer() {
+		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Activity_Shape, getDiagramEditPart().getDiagramPreferencesHint());
+	}
+
+	@Override
+	protected String getProjectName() {
+		return ICompositeDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return ICompositeDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage Parameter.
+	 */
+	@Test
+	public void testToParameter() {
+		setTestAffixedNode(true);
+		testToManageNode(UMLElementTypes.Parameter_Shape, UMLPackage.eINSTANCE.getParameter(), UMLElementTypes.Activity_Shape, false, 4, 0, 1, 1, false, null, 0);
+		setTestAffixedNode(false);
+	}
+
+
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramChildLabel.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramChildLabel.java
index 1168fab2afd..775b2f505f1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramChildLabel.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramChildLabel.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * 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.uml.diagram.composite.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildLabel;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramChildNode.

- */

-

-public class TestCompositeDiagramChildLabel extends TestChildLabel {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateCompositeDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return ICompositeDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return ICompositeDiagramTestsConstants.FILE_NAME;

-	}

-	

-	/**

-	* Test to manage Property.

-	*/

-	@Test

-	@FailingTest

-	public void testToProperty() {

-	testToManageTopNodeWithMask(UMLElementTypes.DataType_Shape,UMLElementTypes.Property_AttributeLabel, DataTypeAttributeCompartmentEditPart.VISUAL_ID,null);

-	}

-	/**

-	* Test to manage Operation.

-	*/

-	@Test

-	@FailingTest

-	public void testToOperation() {

-	testToManageTopNodeWithMask(UMLElementTypes.DataType_Shape,UMLElementTypes.Operation_OperationLabel, DataTypeOperationCompartmentEditPart.VISUAL_ID,null);

-	}

-	/**

-	* Test to manage EnumerationLiteral.

-	*/

-	@Test

-	@FailingTest

-	public void testToEnumerationLiteral() {

-	testToManageTopNode(UMLElementTypes.Enumeration_Shape,UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID,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.uml.diagram.composite.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildLabel;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramChildNode.
+ */
+
+public class TestCompositeDiagramChildLabel extends TestChildLabel {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateCompositeDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return ICompositeDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return ICompositeDiagramTestsConstants.FILE_NAME;
+	}
+	
+	/**
+	* Test to manage Property.
+	*/
+	@Test
+	@FailingTest
+	public void testToProperty() {
+	testToManageTopNodeWithMask(UMLElementTypes.DataType_Shape,UMLElementTypes.Property_AttributeLabel, DataTypeAttributeCompartmentEditPart.VISUAL_ID,null);
+	}
+	/**
+	* Test to manage Operation.
+	*/
+	@Test
+	@FailingTest
+	public void testToOperation() {
+	testToManageTopNodeWithMask(UMLElementTypes.DataType_Shape,UMLElementTypes.Operation_OperationLabel, DataTypeOperationCompartmentEditPart.VISUAL_ID,null);
+	}
+	/**
+	* Test to manage EnumerationLiteral.
+	*/
+	@Test
+	@FailingTest
+	public void testToEnumerationLiteral() {
+	testToManageTopNode(UMLElementTypes.Enumeration_Shape,UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID,null);
+	}
+
+	
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramCompositeChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramCompositeChildNode.java
index d366265c00a..de2b1761f7f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramCompositeChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramCompositeChildNode.java
@@ -1,337 +1,337 @@
-/*****************************************************************************

- * 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.uml.diagram.composite.test.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.junit.framework.classification.InteractiveTest;

-import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramChildNode.

- */

-

-public class TestCompositeDiagramCompositeChildNode extends TestChildNode {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateCompositeDiagramCommand();

-	}

-

-	@Override

-	protected CreateViewRequest createViewRequestShapeContainer() {

-		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_Shape, getDiagramEditPart().getDiagramPreferencesHint());

-	}

-

-	@Override

-	protected String getProjectName() {

-		return ICompositeDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return ICompositeDiagramTestsConstants.FILE_NAME;

-	}

-

-

-	/**

-	 * Test to manage Property.

-	 */

-	@Test

-	public void testToProperty() {

-		testToManageNodeWithMask(UMLElementTypes.Property_Shape, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Class_Shape, false, "Attribute", 0);

-	}

-

-	/**

-	 * Test to manage CollaborationUse.

-	 */

-	@Test

-	public void testToCollaborationUse() {

-		testToManageNode(UMLElementTypes.CollaborationUse_Shape, UMLPackage.eINSTANCE.getCollaborationUse(), UMLElementTypes.Class_Shape, false);

-	}

-

-	/**

-	 * Test to manage Activity.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToActivity() {

-		testToManageNode(UMLElementTypes.Activity_Shape_CN, UMLPackage.eINSTANCE.getActivity(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Interaction.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToInteraction() {

-		testToManageNode(UMLElementTypes.Interaction_Shape_CN, UMLPackage.eINSTANCE.getInteraction(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage ProtocolStateMachine.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToProtocolStateMachine() {

-		testToManageNode(UMLElementTypes.ProtocolStateMachine_Shape_CN, UMLPackage.eINSTANCE.getProtocolStateMachine(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage StateMachine.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToStateMachine() {

-		testToManageNode(UMLElementTypes.StateMachine_Shape_CN, UMLPackage.eINSTANCE.getStateMachine(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage FunctionBehavior.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToFunctionBehavior() {

-		testToManageNode(UMLElementTypes.FunctionBehavior_Shape_CN, UMLPackage.eINSTANCE.getFunctionBehavior(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage OpaqueBehavior.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToOpaqueBehavior() {

-		testToManageNode(UMLElementTypes.OpaqueBehavior_Shape_CN, UMLPackage.eINSTANCE.getOpaqueBehavior(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Component.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToComponent() {

-		testToManageNode(UMLElementTypes.Component_Shape_CN, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Device.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToDevice() {

-		testToManageNode(UMLElementTypes.Device_Shape_CN, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage ExecutionEnvironment.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToExecutionEnvironment() {

-		testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape_CN, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Class_Shape, false);

-	}

-

-	/**

-	 * Test to manage Node.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToNode() {

-		testToManageNode(UMLElementTypes.Node_Shape_CN, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Class.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToClass() {

-		testToManageNode(UMLElementTypes.Class_Shape_CN, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Collaboration.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToCollaboration() {

-		testToManageNode(UMLElementTypes.Collaboration_Shape_CN, UMLPackage.eINSTANCE.getCollaboration(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Interface.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToInterface() {

-		testToManageNode(UMLElementTypes.Interface_Shape_CN, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage PrimitiveType.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToPrimitiveType() {

-		testToManageNode(UMLElementTypes.PrimitiveType_Shape_CN, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Enumeration.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToEnumeration() {

-		testToManageNode(UMLElementTypes.Enumeration_Shape_CN, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage DataType.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToDataType() {

-		testToManageNode(UMLElementTypes.DataType_Shape_CN, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Actor.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToActor() {

-		testToManageNode(UMLElementTypes.Actor_Shape_CN, UMLPackage.eINSTANCE.getActor(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage DeploymentSpecification.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToDeploymentSpecification() {

-		testToManageNode(UMLElementTypes.DeploymentSpecification_Shape_CN, UMLPackage.eINSTANCE.getDeploymentSpecification(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Artifact.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToArtifact() {

-		testToManageNode(UMLElementTypes.Artifact_Shape_CN, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage InformationItem.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToInformationItem() {

-		testToManageNode(UMLElementTypes.InformationItem_Shape_CN, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Signal.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToSignal() {

-		testToManageNode(UMLElementTypes.Signal_Shape_CN, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage UseCase.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToUseCase() {

-		testToManageNode(UMLElementTypes.UseCase_Shape_CN, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Comment.

-	 */

-	@Test

-	public void testToComment() {

-		testToManageNode(UMLElementTypes.Comment_Shape_CN, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Class_Shape, false);

-	}

-

-	/**

-	 * Test to manage DurationConstraint.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToDurationConstraint() {

-		testToManageNode(UMLElementTypes.DurationConstraint_Shape_CN, UMLPackage.eINSTANCE.getDurationConstraint(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage TimeConstraint.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToTimeConstraint() {

-		testToManageNode(UMLElementTypes.TimeConstraint_Shape_CN, UMLPackage.eINSTANCE.getTimeConstraint(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage IntervalConstraint.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToIntervalConstraint() {

-		testToManageNode(UMLElementTypes.IntervalConstraint_Shape_CN, UMLPackage.eINSTANCE.getIntervalConstraint(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage InteractionConstraint.

-	 */

-	@Test

-	@InteractiveTest

-	public void testToInteractionConstraint() {

-		testToManageNode(UMLElementTypes.InteractionConstraint_Shape_CN, UMLPackage.eINSTANCE.getInteractionConstraint(), UMLElementTypes.Class_Shape, true);

-	}

-

-	/**

-	 * Test to manage Constraint.

-	 */

-	@Test

-	public void testToConstraint() {

-		testToManageNode(UMLElementTypes.Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Class_Shape, false);

-	}

-

-	/**

-	 * Test to manage Port.

-	 */

-	@Test

-	public void testToPort() {

-		setTestAffixedNode(true);

-		testToManageNode(UMLElementTypes.Port_Shape, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Class_Shape, false, 4, 0, 1, 1, true, null, 0);

-		setTestAffixedNode(false);

-	}

-

-}

+/*****************************************************************************
+ * 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.uml.diagram.composite.test.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.InteractiveTest;
+import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramChildNode.
+ */
+
+public class TestCompositeDiagramCompositeChildNode extends TestChildNode {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateCompositeDiagramCommand();
+	}
+
+	@Override
+	protected CreateViewRequest createViewRequestShapeContainer() {
+		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_Shape, getDiagramEditPart().getDiagramPreferencesHint());
+	}
+
+	@Override
+	protected String getProjectName() {
+		return ICompositeDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return ICompositeDiagramTestsConstants.FILE_NAME;
+	}
+
+
+	/**
+	 * Test to manage Property.
+	 */
+	@Test
+	public void testToProperty() {
+		testToManageNodeWithMask(UMLElementTypes.Property_Shape, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Class_Shape, false, "Attribute", 0);
+	}
+
+	/**
+	 * Test to manage CollaborationUse.
+	 */
+	@Test
+	public void testToCollaborationUse() {
+		testToManageNode(UMLElementTypes.CollaborationUse_Shape, UMLPackage.eINSTANCE.getCollaborationUse(), UMLElementTypes.Class_Shape, false);
+	}
+
+	/**
+	 * Test to manage Activity.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToActivity() {
+		testToManageNode(UMLElementTypes.Activity_Shape_CN, UMLPackage.eINSTANCE.getActivity(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Interaction.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToInteraction() {
+		testToManageNode(UMLElementTypes.Interaction_Shape_CN, UMLPackage.eINSTANCE.getInteraction(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage ProtocolStateMachine.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToProtocolStateMachine() {
+		testToManageNode(UMLElementTypes.ProtocolStateMachine_Shape_CN, UMLPackage.eINSTANCE.getProtocolStateMachine(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage StateMachine.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToStateMachine() {
+		testToManageNode(UMLElementTypes.StateMachine_Shape_CN, UMLPackage.eINSTANCE.getStateMachine(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage FunctionBehavior.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToFunctionBehavior() {
+		testToManageNode(UMLElementTypes.FunctionBehavior_Shape_CN, UMLPackage.eINSTANCE.getFunctionBehavior(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage OpaqueBehavior.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToOpaqueBehavior() {
+		testToManageNode(UMLElementTypes.OpaqueBehavior_Shape_CN, UMLPackage.eINSTANCE.getOpaqueBehavior(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Component.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToComponent() {
+		testToManageNode(UMLElementTypes.Component_Shape_CN, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Device.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToDevice() {
+		testToManageNode(UMLElementTypes.Device_Shape_CN, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage ExecutionEnvironment.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToExecutionEnvironment() {
+		testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape_CN, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Class_Shape, false);
+	}
+
+	/**
+	 * Test to manage Node.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToNode() {
+		testToManageNode(UMLElementTypes.Node_Shape_CN, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Class.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToClass() {
+		testToManageNode(UMLElementTypes.Class_Shape_CN, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Collaboration.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToCollaboration() {
+		testToManageNode(UMLElementTypes.Collaboration_Shape_CN, UMLPackage.eINSTANCE.getCollaboration(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Interface.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToInterface() {
+		testToManageNode(UMLElementTypes.Interface_Shape_CN, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage PrimitiveType.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToPrimitiveType() {
+		testToManageNode(UMLElementTypes.PrimitiveType_Shape_CN, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Enumeration.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToEnumeration() {
+		testToManageNode(UMLElementTypes.Enumeration_Shape_CN, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage DataType.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToDataType() {
+		testToManageNode(UMLElementTypes.DataType_Shape_CN, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Actor.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToActor() {
+		testToManageNode(UMLElementTypes.Actor_Shape_CN, UMLPackage.eINSTANCE.getActor(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage DeploymentSpecification.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToDeploymentSpecification() {
+		testToManageNode(UMLElementTypes.DeploymentSpecification_Shape_CN, UMLPackage.eINSTANCE.getDeploymentSpecification(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Artifact.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToArtifact() {
+		testToManageNode(UMLElementTypes.Artifact_Shape_CN, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage InformationItem.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToInformationItem() {
+		testToManageNode(UMLElementTypes.InformationItem_Shape_CN, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Signal.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToSignal() {
+		testToManageNode(UMLElementTypes.Signal_Shape_CN, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage UseCase.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToUseCase() {
+		testToManageNode(UMLElementTypes.UseCase_Shape_CN, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Comment.
+	 */
+	@Test
+	public void testToComment() {
+		testToManageNode(UMLElementTypes.Comment_Shape_CN, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Class_Shape, false);
+	}
+
+	/**
+	 * Test to manage DurationConstraint.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToDurationConstraint() {
+		testToManageNode(UMLElementTypes.DurationConstraint_Shape_CN, UMLPackage.eINSTANCE.getDurationConstraint(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage TimeConstraint.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToTimeConstraint() {
+		testToManageNode(UMLElementTypes.TimeConstraint_Shape_CN, UMLPackage.eINSTANCE.getTimeConstraint(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage IntervalConstraint.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToIntervalConstraint() {
+		testToManageNode(UMLElementTypes.IntervalConstraint_Shape_CN, UMLPackage.eINSTANCE.getIntervalConstraint(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage InteractionConstraint.
+	 */
+	@Test
+	@InteractiveTest
+	public void testToInteractionConstraint() {
+		testToManageNode(UMLElementTypes.InteractionConstraint_Shape_CN, UMLPackage.eINSTANCE.getInteractionConstraint(), UMLElementTypes.Class_Shape, true);
+	}
+
+	/**
+	 * Test to manage Constraint.
+	 */
+	@Test
+	public void testToConstraint() {
+		testToManageNode(UMLElementTypes.Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Class_Shape, false);
+	}
+
+	/**
+	 * Test to manage Port.
+	 */
+	@Test
+	public void testToPort() {
+		setTestAffixedNode(true);
+		testToManageNode(UMLElementTypes.Port_Shape, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Class_Shape, false, 4, 0, 1, 1, true, null, 0);
+		setTestAffixedNode(false);
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestPortLocation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestPortLocation.java
index bf1cd30781f..3000dbe1fce 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestPortLocation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestPortLocation.java
@@ -1,62 +1,62 @@
-package org.eclipse.papyrus.uml.diagram.composite.test.canonical;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants;

-import org.junit.Test;

-

-public class TestPortLocation extends org.eclipse.papyrus.uml.diagram.tests.canonical.TestPortLocation {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateCompositeDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return ICompositeDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return ICompositeDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testStateMachinePortLocation() {

-		testPortLocation(UMLElementTypes.StateMachine_Shape);

-	}

-

-	@Test

-	public void testProtocolStateMachinePortLocation() {

-		testPortLocation(UMLElementTypes.ProtocolStateMachine_Shape);

-	}

-

-	@Test

-	public void testInteractionItemPortLocation() {

-		testPortLocation(UMLElementTypes.Interaction_Shape);

-	}

-

-	@Test

-	public void testClassPortLocation() {

-		testPortLocation(UMLElementTypes.Class_Shape);

-	}

-

-	@Test

-	public void testClassPartPortLocation() {

-		testPortLocation(UMLElementTypes.Class_Shape, ClassCompositeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Property_Shape);

-	}

-

-	@Test

-	public void testActivityPortLocation() {

-		testPortLocation(UMLElementTypes.Activity_Shape);

-	}

-

-	@Override

-	protected IElementType getPortType() {

-		return UMLElementTypes.Port_Shape;

-	}

-}

+package org.eclipse.papyrus.uml.diagram.composite.test.canonical;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants;
+import org.junit.Test;
+
+public class TestPortLocation extends org.eclipse.papyrus.uml.diagram.tests.canonical.TestPortLocation {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateCompositeDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return ICompositeDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return ICompositeDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testStateMachinePortLocation() {
+		testPortLocation(UMLElementTypes.StateMachine_Shape);
+	}
+
+	@Test
+	public void testProtocolStateMachinePortLocation() {
+		testPortLocation(UMLElementTypes.ProtocolStateMachine_Shape);
+	}
+
+	@Test
+	public void testInteractionItemPortLocation() {
+		testPortLocation(UMLElementTypes.Interaction_Shape);
+	}
+
+	@Test
+	public void testClassPortLocation() {
+		testPortLocation(UMLElementTypes.Class_Shape);
+	}
+
+	@Test
+	public void testClassPartPortLocation() {
+		testPortLocation(UMLElementTypes.Class_Shape, ClassCompositeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Property_Shape);
+	}
+
+	@Test
+	public void testActivityPortLocation() {
+		testPortLocation(UMLElementTypes.Activity_Shape);
+	}
+
+	@Override
+	protected IElementType getPortType() {
+		return UMLElementTypes.Port_Shape;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF
index 89181b12475..b3a82a45f7b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.xtend.lib;bundle-version="2.8.1"

-Export-Package: org.eclipse.papyrus.uml.diagram.deployment.test,

- org.eclipse.papyrus.uml.diagram.deployment.test.canonical,

- org.eclipse.papyrus.uml.diagram.deployment.test.generation,

- org.eclipse.papyrus.uml.diagram.deployment.test.load

-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.uml.diagram.deployment.test.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtend.lib;bundle-version="2.8.1"
+Export-Package: org.eclipse.papyrus.uml.diagram.deployment.test,
+ org.eclipse.papyrus.uml.diagram.deployment.test.canonical,
+ org.eclipse.papyrus.uml.diagram.deployment.test.generation,
+ org.eclipse.papyrus.uml.diagram.deployment.test.load
+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.uml.diagram.deployment.test.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/build.properties
index eecc3564ca8..5dbebe2e596 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/,\

-           test-gen/,\

-           xtend-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               about.html

-src.includes = about.html

+source.. = src/,\
+           test-gen/,\
+           xtend-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/plugin.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/plugin.properties
index 55e711487d1..d9f9a242cec 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/plugin.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/plugin.properties
@@ -1,55 +1,55 @@
-pluginName=Papyrus Deployment Diagram

-providerName=Eclipse Modeling Project

-editorName=PapyrusUMLDeploymentDiagram Diagram Editing

-context.description=Papyrus UML Deployment Diagram Editing

-context.name=In Papyrus UML Deployment Diagram Editor

-newWizardName=PapyrusUMLDeploymentDiagram Diagram

-newWizardDesc=Creates PapyrusUMLDeploymentDiagram diagram.

-
initDiagramActionLabel=Initialize PapyrusUMLDeployment_diagram diagram file

-
navigatorContentName=*.PapyrusUMLDeployment_diagram diagram contents

-update.diagram.name=Update PapyrusUMLDeploymentDiagram diagram

-update.diagram.description=Perform PapyrusUMLDeploymentDiagram diagram update

-
tab.appearance=Appearance

-tab.diagram=Rulers & Grid

-tab.domain=Core

-
prefpage.org.eclipse.uml2.uml.diagram.general=UML Diagram

-prefpage.org.eclipse.uml2.uml.diagram.appearance=Appearance

-prefpage.org.eclipse.uml2.uml.diagram.connections=Connections

-prefpage.org.eclipse.uml2.uml.diagram.printing=Printing

-prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid=Rulers And Grid

-
metatype.name.Model_1000=DeploymentDiagram

-metatype.name.Comment_Shape=Comment

-metatype.name.Constraint_Shape=Constraint

-metatype.name.ExecutionEnvironment_2002=ExecutionEnvironment

-metatype.name.Device_2003=Device

-metatype.name.Artifact_Shape=Artifact

-metatype.name.Node_Shape=Node

-metatype.name.Node_Shape_CCN=Node

-metatype.name.Device_Shape_CCN=Device

-metatype.name.ExecutionEnvironment_Shape_CCN=ExecutionEnvironment

-metatype.name.Artifact_Shape_CCN=Artifact

-metatype.name.Artifact_28=Artifact

-metatype.name.Link_4005=Undefined

-metatype.name.Comment_AnnotatedElementEdge=CommentAnnotatedElement

-metatype.name.Constraint_ConstrainedElementEdge=ConstraintConstrainedElement

-metatype.name.Deployment_Edge=Deployment

-metatype.name.Manifestation_4002=Manifestation

-metatype.name.Generalization_4003=Generalization

-metatype.name.Dependency_4004=Dependency

-
cmdcategory.name=PapyrusUMLDeploymentDiagram Editor Commands

-cmdcategory.desc=PapyrusUMLDeploymentDiagram Editor Commands

-

-metatype.name.Package_1000=DeploymentDiagram

-metatype.name.Dependency_Shape=DependencyNode

-metatype.name.Model_2010=Model

-metatype.name.Package_Shape=Package

-metatype.name.NamedElement_DefaultShape=DefaultNamedElement

-metatype.name.Model_Shape_CN=Model

-metatype.name.Package_Shape_CN=Package

-metatype.name.Device_Shape_CN=Device

-metatype.name.ExecutionEnvironment_Shape_CN=ExecutionEnvironment

-metatype.name.Node_Shape_CN=Node

-metatype.name.Artifact_Shape_CN=Artifact

-metatype.name.Comment_Shape_CN=Comment

-metatype.name.Constraint_Shape_CN=Constraint

-metatype.name.Dependency_BranchEdge=DependencyBranchLink

+pluginName=Papyrus Deployment Diagram
+providerName=Eclipse Modeling Project
+editorName=PapyrusUMLDeploymentDiagram Diagram Editing
+context.description=Papyrus UML Deployment Diagram Editing
+context.name=In Papyrus UML Deployment Diagram Editor
+newWizardName=PapyrusUMLDeploymentDiagram Diagram
+newWizardDesc=Creates PapyrusUMLDeploymentDiagram diagram.
+
initDiagramActionLabel=Initialize PapyrusUMLDeployment_diagram diagram file
+
navigatorContentName=*.PapyrusUMLDeployment_diagram diagram contents
+update.diagram.name=Update PapyrusUMLDeploymentDiagram diagram
+update.diagram.description=Perform PapyrusUMLDeploymentDiagram diagram update
+
tab.appearance=Appearance
+tab.diagram=Rulers & Grid
+tab.domain=Core
+
prefpage.org.eclipse.uml2.uml.diagram.general=UML Diagram
+prefpage.org.eclipse.uml2.uml.diagram.appearance=Appearance
+prefpage.org.eclipse.uml2.uml.diagram.connections=Connections
+prefpage.org.eclipse.uml2.uml.diagram.printing=Printing
+prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid=Rulers And Grid
+
metatype.name.Model_1000=DeploymentDiagram
+metatype.name.Comment_Shape=Comment
+metatype.name.Constraint_Shape=Constraint
+metatype.name.ExecutionEnvironment_2002=ExecutionEnvironment
+metatype.name.Device_2003=Device
+metatype.name.Artifact_Shape=Artifact
+metatype.name.Node_Shape=Node
+metatype.name.Node_Shape_CCN=Node
+metatype.name.Device_Shape_CCN=Device
+metatype.name.ExecutionEnvironment_Shape_CCN=ExecutionEnvironment
+metatype.name.Artifact_Shape_CCN=Artifact
+metatype.name.Artifact_28=Artifact
+metatype.name.Link_4005=Undefined
+metatype.name.Comment_AnnotatedElementEdge=CommentAnnotatedElement
+metatype.name.Constraint_ConstrainedElementEdge=ConstraintConstrainedElement
+metatype.name.Deployment_Edge=Deployment
+metatype.name.Manifestation_4002=Manifestation
+metatype.name.Generalization_4003=Generalization
+metatype.name.Dependency_4004=Dependency
+
cmdcategory.name=PapyrusUMLDeploymentDiagram Editor Commands
+cmdcategory.desc=PapyrusUMLDeploymentDiagram Editor Commands
+
+metatype.name.Package_1000=DeploymentDiagram
+metatype.name.Dependency_Shape=DependencyNode
+metatype.name.Model_2010=Model
+metatype.name.Package_Shape=Package
+metatype.name.NamedElement_DefaultShape=DefaultNamedElement
+metatype.name.Model_Shape_CN=Model
+metatype.name.Package_Shape_CN=Package
+metatype.name.Device_Shape_CN=Device
+metatype.name.ExecutionEnvironment_Shape_CN=ExecutionEnvironment
+metatype.name.Node_Shape_CN=Node
+metatype.name.Artifact_Shape_CN=Artifact
+metatype.name.Comment_Shape_CN=Comment
+metatype.name.Constraint_Shape_CN=Constraint
+metatype.name.Dependency_BranchEdge=DependencyBranchLink
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/Activator.java
index ba97d024737..49cf6834fb9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/Activator.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.deployment.tests"; //$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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.deployment.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/AllTests.java
index df0e9e983a9..a2b3ad6db8e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/AllTests.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * 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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- *  Christian W. Damus - bug 464647

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;

-import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AllCanonicalTests;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		// canonical

-		AllCanonicalTests.class,

-		RoundedCompartmentTest.class,

-

-		// load

-		// LoadTests.class,

-})

-@DynamicClasses("org.eclipse.papyrus.uml.diagram.deployment.test.AllGenTests")

-public class AllTests {

-

-}

+/*****************************************************************************
+ * 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus - bug 464647
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;
+import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AllCanonicalTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All tests together.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		// canonical
+		AllCanonicalTests.class,
+		RoundedCompartmentTest.class,
+
+		// load
+		// LoadTests.class,
+})
+@DynamicClasses("org.eclipse.papyrus.uml.diagram.deployment.test.AllGenTests")
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/IDeploymentDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/IDeploymentDiagramTestsConstants.java
index 85b5bc47884..6db782d9c11 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/IDeploymentDiagramTestsConstants.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/IDeploymentDiagramTestsConstants.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test;

-

-public interface IDeploymentDiagramTestsConstants {

-

-	/** name of the test project */

-	public final String PROJECT_NAME = "DeploymentDiagramTestProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "DeploymentDiagramTest.di";

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test;
+
+public interface IDeploymentDiagramTestsConstants {
+
+	/** name of the test project */
+	public final String PROJECT_NAME = "DeploymentDiagramTestProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "DeploymentDiagramTest.di";
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/RoundedCompartmentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/RoundedCompartmentTest.java
index 3e81435816c..a7a5b635398 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/RoundedCompartmentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/RoundedCompartmentTest.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * 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

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPart;

-import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPartACN;

-import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPartCN;

-import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;

-

-/**

- * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.

- */

-public class RoundedCompartmentTest extends AbstractGenericShapeTest {

-

-	/**

-	 * Gets the rounded compartment edit parts.

-	 *

-	 * @return the rounded compartment edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()

-	 */

-	public List<Class<?>> getRoundedCompartmentEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-

-		classes.add(ArtifactEditPart.class);

-		classes.add(ArtifactEditPartACN.class);

-		classes.add(ArtifactEditPartCN.class);

-		classes.add(ModelEditPart.class);

-		classes.add(ModelEditPartCN.class);

-		classes.add(PackageEditPart.class);

-		classes.add(PackageEditPartCN.class);

-

-		return classes;

-	}

-

-	/**

-	 * Gets the rounded border named element edit parts.

-	 *

-	 * @return the rounded border named element edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()

-	 */

-	public List<Class<?>> getRoundedBorderNamedElementEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-		return classes;

-	}

-}

+/*****************************************************************************
+ * 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
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPart;
+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPartACN;
+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPartCN;
+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ModelEditPartCN;
+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.PackageEditPartCN;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;
+
+/**
+ * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.
+ */
+public class RoundedCompartmentTest extends AbstractGenericShapeTest {
+
+	/**
+	 * Gets the rounded compartment edit parts.
+	 *
+	 * @return the rounded compartment edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()
+	 */
+	public List<Class<?>> getRoundedCompartmentEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+
+		classes.add(ArtifactEditPart.class);
+		classes.add(ArtifactEditPartACN.class);
+		classes.add(ArtifactEditPartCN.class);
+		classes.add(ModelEditPart.class);
+		classes.add(ModelEditPartCN.class);
+		classes.add(PackageEditPart.class);
+		classes.add(PackageEditPartCN.class);
+
+		return classes;
+	}
+
+	/**
+	 * Gets the rounded border named element edit parts.
+	 *
+	 * @return the rounded border named element edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()
+	 */
+	public List<Class<?>> getRoundedBorderNamedElementEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+		return classes;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AbstractPapyrusTestCase.java
index ac3b3e4cf4d..a5d9e1b3b8d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AbstractPapyrusTestCase.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusSemanticTestCase;

-

-/**

- * The Class AbstractPapyrusTestCase.

- */

-public abstract class AbstractPapyrusTestCase extends AbstractPapyrusSemanticTestCase {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateDeploymentDiagramCommand();

-	}

-

-	@Override

-	protected IElementType getTypeByID(String vid) {

-		return UMLElementTypes.getElementType(vid);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusSemanticTestCase;
+
+/**
+ * The Class AbstractPapyrusTestCase.
+ */
+public abstract class AbstractPapyrusTestCase extends AbstractPapyrusSemanticTestCase {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateDeploymentDiagramCommand();
+	}
+
+	@Override
+	protected IElementType getTypeByID(String vid) {
+		return UMLElementTypes.getElementType(vid);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AllCanonicalTests.java
index 44b7f88cb3f..227bd7e9062 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AllCanonicalTests.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All test in canonical package

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-// Top Node

-TestDeploymentDiagramTopNode.class,

-// Child Node

-TestDeploymentDiagramForPackageChildNode.class,

-TestDeploymentDiagramForNodeChildNode.class,

-// Deployment Link

-TestDeploymentDiagramDeploymentLink.class,

-// Link by owned source 

-TestDeploymentDiagramLinkOwnedBySource.class,

-// Comment link

-TestDeploymentDiagramCommentLink.class,

-// Cosntraint link

-TestDeploymentDiagramConstraintLink.class,

-// Manifestation Link

-TestDeploymentDiagramManifestationLink.class,

-// Others Link

-TestDeploymentDiagramLink.class,

-//

-TestSemantics.class

-// End

-})

-public class AllCanonicalTests {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All test in canonical package
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+// Top Node
+TestDeploymentDiagramTopNode.class,
+// Child Node
+TestDeploymentDiagramForPackageChildNode.class,
+TestDeploymentDiagramForNodeChildNode.class,
+// Deployment Link
+TestDeploymentDiagramDeploymentLink.class,
+// Link by owned source 
+TestDeploymentDiagramLinkOwnedBySource.class,
+// Comment link
+TestDeploymentDiagramCommentLink.class,
+// Cosntraint link
+TestDeploymentDiagramConstraintLink.class,
+// Manifestation Link
+TestDeploymentDiagramManifestationLink.class,
+// Others Link
+TestDeploymentDiagramLink.class,
+//
+TestSemantics.class
+// End
+})
+public class AllCanonicalTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramCommentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramCommentLink.java
index fac1b3475e0..47f87fe70f9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramCommentLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramCommentLink.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestCommentLink;

-import org.junit.Test;

-

-public class TestDeploymentDiagramCommentLink extends TestCommentLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateDeploymentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-	

-	/**

-	 * Test to manage Comment

-	 */

-	@Test

-	public void testToManageComment() {

-		testToManageLink(UMLElementTypes.Comment_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Comment_AnnotatedElementEdge, UMLElementTypes.Package_Shape, 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestCommentLink;
+import org.junit.Test;
+
+public class TestDeploymentDiagramCommentLink extends TestCommentLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateDeploymentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+	
+	/**
+	 * Test to manage Comment
+	 */
+	@Test
+	public void testToManageComment() {
+		testToManageLink(UMLElementTypes.Comment_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Comment_AnnotatedElementEdge, UMLElementTypes.Package_Shape, true);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramConstraintLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramConstraintLink.java
index 1d233a46eef..c2c0044795e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramConstraintLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramConstraintLink.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestConstraintLink;

-import org.junit.Test;

-

-public class TestDeploymentDiagramConstraintLink extends TestConstraintLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateDeploymentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-	

-	/**

-	 * Test to manage Constraint

-	 */

-	@Test

-	public void testToManageConstraint() {

-		testToManageLink(UMLElementTypes.Constraint_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Constraint_ConstrainedElementEdge, UMLElementTypes.Package_Shape, 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestConstraintLink;
+import org.junit.Test;
+
+public class TestDeploymentDiagramConstraintLink extends TestConstraintLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateDeploymentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+	
+	/**
+	 * Test to manage Constraint
+	 */
+	@Test
+	public void testToManageConstraint() {
+		testToManageLink(UMLElementTypes.Constraint_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Constraint_ConstrainedElementEdge, UMLElementTypes.Package_Shape, true);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramDeploymentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramDeploymentLink.java
index 52bf2b500ad..f48f7e7df62 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramDeploymentLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramDeploymentLink.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.uml2.uml.Element;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramLink.

- */

-public class TestDeploymentDiagramDeploymentLink extends TestWithoutReconnectAMultilinkk {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateDeploymentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage Deployment

-	 */

-

-	@Test

-	public void testToManageDeployment() {

-		testToManageLink(UMLElementTypes.Artifact_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Deployment_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-	@Test

-	public void testUnexecutableNodeArtifactDeployment() {

-		testUnexecutableLink(UMLElementTypes.Node_Shape, UMLElementTypes.Artifact_Shape, UMLElementTypes.Deployment_Edge);

-	}

-

-	@Test

-	public void testUnexecutableNodeNodeDeployment() {

-		testUnexecutableLink(UMLElementTypes.Node_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Deployment_Edge);

-	}

-

-	@Test

-	public void testUnexecutableArtifactArtifactDeployment() {

-		testUnexecutableLink(UMLElementTypes.Artifact_Shape, UMLElementTypes.Artifact_Shape, UMLElementTypes.Deployment_Edge);

-	}

-

-	@Override

-	protected void checkOwnedElementsAfterCreation(String prefix) {

-		assertTrue(prefix + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertEquals(prefix + TEST_THE_EXECUTION, 0, ((Element) source.resolveSemanticElement()).getOwnedElements().size());

-		assertEquals(prefix + TEST_THE_EXECUTION, 1, ((Element) target.resolveSemanticElement()).getOwnedElements().size());

-	}

-

-	@Override

-	protected void checkOwnedElementsBeforeCreation(String prefix) {

-		assertTrue(prefix + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertEquals(prefix + TEST_THE_UNDO, 0, ((Element) source.resolveSemanticElement()).getOwnedElements().size());

-		assertEquals(prefix + TEST_THE_UNDO, 0, ((Element) target.resolveSemanticElement()).getOwnedElements().size());

-	}

-

-	private void testUnexecutableLink(IElementType sourceType, IElementType targetType, IElementType linkType) {

-		installEnvironment(sourceType, targetType);

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command == null || !command.canExecute());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.uml2.uml.Element;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramLink.
+ */
+public class TestDeploymentDiagramDeploymentLink extends TestWithoutReconnectAMultilinkk {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateDeploymentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage Deployment
+	 */
+
+	@Test
+	public void testToManageDeployment() {
+		testToManageLink(UMLElementTypes.Artifact_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Deployment_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+	@Test
+	public void testUnexecutableNodeArtifactDeployment() {
+		testUnexecutableLink(UMLElementTypes.Node_Shape, UMLElementTypes.Artifact_Shape, UMLElementTypes.Deployment_Edge);
+	}
+
+	@Test
+	public void testUnexecutableNodeNodeDeployment() {
+		testUnexecutableLink(UMLElementTypes.Node_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Deployment_Edge);
+	}
+
+	@Test
+	public void testUnexecutableArtifactArtifactDeployment() {
+		testUnexecutableLink(UMLElementTypes.Artifact_Shape, UMLElementTypes.Artifact_Shape, UMLElementTypes.Deployment_Edge);
+	}
+
+	@Override
+	protected void checkOwnedElementsAfterCreation(String prefix) {
+		assertTrue(prefix + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertEquals(prefix + TEST_THE_EXECUTION, 0, ((Element) source.resolveSemanticElement()).getOwnedElements().size());
+		assertEquals(prefix + TEST_THE_EXECUTION, 1, ((Element) target.resolveSemanticElement()).getOwnedElements().size());
+	}
+
+	@Override
+	protected void checkOwnedElementsBeforeCreation(String prefix) {
+		assertTrue(prefix + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertEquals(prefix + TEST_THE_UNDO, 0, ((Element) source.resolveSemanticElement()).getOwnedElements().size());
+		assertEquals(prefix + TEST_THE_UNDO, 0, ((Element) target.resolveSemanticElement()).getOwnedElements().size());
+	}
+
+	private void testUnexecutableLink(IElementType sourceType, IElementType targetType, IElementType linkType) {
+		installEnvironment(sourceType, targetType);
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command == null || !command.canExecute());
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForNodeChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForNodeChildNode.java
index 12d244d2542..40e9dfeefd2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForNodeChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForNodeChildNode.java
@@ -1,97 +1,97 @@
-/*****************************************************************************

- * Copyright (c) 2009, 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 480000

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;

-import org.eclipse.papyrus.uml.diagram.tests.rules.DisableDropStrategiesRule;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.ClassRule;

-import org.junit.Test;

-import org.junit.rules.TestRule;

-

-/**

- * The Class TestDepoloymentDiagramChildNode.

- */

-

-public class TestDeploymentDiagramForNodeChildNode extends TestChildNode {

-

-	@ClassRule

-	public static final TestRule suppressDropStrategies = new DisableDropStrategiesRule();

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateDeploymentDiagramCommand();

-	}

-

-	@Override

-	protected CreateViewRequest createViewRequestShapeContainer() {

-		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Node_Shape, getDiagramEditPart().getDiagramPreferencesHint());

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage Device.

-	 */

-	@Test

-	public void testToDevice() {

-		testToManageNode(UMLElementTypes.Device_Shape_CCN, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Node_Shape_CCN, false);

-	}

-

-	/**

-	 * Test to manage ExecutionEnvironment.

-	 */

-	@Test

-	public void testToExecutionEnvironment() {

-		testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape_CCN, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Node_Shape_CCN, false);

-	}

-

-	/**

-	 * Test to manage Node.

-	 */

-	@Test

-	public void testToNode() {

-		testToManageNode(UMLElementTypes.Node_Shape_CCN, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Node_Shape_CCN, false);

-	}

-

-	/**

-	 * Test to manage Artifact.

-	 */

-	@Test

-	public void testToArtifact() {

-		testToManageNode(UMLElementTypes.Artifact_Shape_CCN, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Node_Shape_CCN, false);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 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 480000
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;
+import org.eclipse.papyrus.uml.diagram.tests.rules.DisableDropStrategiesRule;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+
+/**
+ * The Class TestDepoloymentDiagramChildNode.
+ */
+
+public class TestDeploymentDiagramForNodeChildNode extends TestChildNode {
+
+	@ClassRule
+	public static final TestRule suppressDropStrategies = new DisableDropStrategiesRule();
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateDeploymentDiagramCommand();
+	}
+
+	@Override
+	protected CreateViewRequest createViewRequestShapeContainer() {
+		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Node_Shape, getDiagramEditPart().getDiagramPreferencesHint());
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage Device.
+	 */
+	@Test
+	public void testToDevice() {
+		testToManageNode(UMLElementTypes.Device_Shape_CCN, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Node_Shape_CCN, false);
+	}
+
+	/**
+	 * Test to manage ExecutionEnvironment.
+	 */
+	@Test
+	public void testToExecutionEnvironment() {
+		testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape_CCN, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Node_Shape_CCN, false);
+	}
+
+	/**
+	 * Test to manage Node.
+	 */
+	@Test
+	public void testToNode() {
+		testToManageNode(UMLElementTypes.Node_Shape_CCN, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Node_Shape_CCN, false);
+	}
+
+	/**
+	 * Test to manage Artifact.
+	 */
+	@Test
+	public void testToArtifact() {
+		testToManageNode(UMLElementTypes.Artifact_Shape_CCN, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Node_Shape_CCN, false);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLink.java
index d514d78ac68..5695199ff01 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLink.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramLink.

- */

-public class TestDeploymentDiagramLink extends TestLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateDeploymentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-	

-	/**

-	 * Test to manage Dependency

-	 */

-

-	@Test

-	@FailingTest

-	public void testToManageDependency() {

-		testToManageLink(UMLElementTypes.Node_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);

-	}

-	/**

-	* Test to manage component.

-	*/

-	@Test

-	@FailingTest

-	public void testToManifestation() {

-	testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramLink.
+ */
+public class TestDeploymentDiagramLink extends TestLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateDeploymentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+	
+	/**
+	 * Test to manage Dependency
+	 */
+
+	@Test
+	@FailingTest
+	public void testToManageDependency() {
+		testToManageLink(UMLElementTypes.Node_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);
+	}
+	/**
+	* Test to manage component.
+	*/
+	@Test
+	@FailingTest
+	public void testToManifestation() {
+	testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLinkOwnedBySource.java
index 326cfd806b0..8b9e0bd8aa8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLinkOwnedBySource.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLinkOwnedBySource.java
@@ -1,58 +1,58 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 468646

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkOwnedBySource;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramLink use to test link that are contained by the owner of the target and the source

- */

-public class TestDeploymentDiagramLinkOwnedBySource extends TestLinkOwnedBySource {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateDeploymentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage Generalization

-	 */

-	@Test

-	public void testToManageGeneralization() {

-		testToManageLink(UMLElementTypes.Node_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 468646
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkOwnedBySource;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramLink use to test link that are contained by the owner of the target and the source
+ */
+public class TestDeploymentDiagramLinkOwnedBySource extends TestLinkOwnedBySource {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateDeploymentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage Generalization
+	 */
+	@Test
+	public void testToManageGeneralization() {
+		testToManageLink(UMLElementTypes.Node_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramManifestationLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramManifestationLink.java
index cdca3492176..cc036d969a8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramManifestationLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramManifestationLink.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.junit.Test;

-

-/**

- * The Class TestComponentDiagramLink.

- */

-public class TestDeploymentDiagramManifestationLink extends TestWithoutReconnectAMultilinkk {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateDeploymentDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-	

-	/**

-	 * Test to manage Manifestation

-	 */

-

-	@Test

-	public void testToManageManifestation() {

-		testToManageLink(UMLElementTypes.Artifact_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.junit.Test;
+
+/**
+ * The Class TestComponentDiagramLink.
+ */
+public class TestDeploymentDiagramManifestationLink extends TestWithoutReconnectAMultilinkk {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateDeploymentDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+	
+	/**
+	 * Test to manage Manifestation
+	 */
+
+	@Test
+	public void testToManageManifestation() {
+		testToManageLink(UMLElementTypes.Artifact_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestWithoutReconnectAMultilinkk.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestWithoutReconnectAMultilinkk.java
index f44384ce57c..edb7829ca1d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestWithoutReconnectAMultilinkk.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestWithoutReconnectAMultilinkk.java
@@ -1,245 +1,245 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;

-import org.eclipse.uml2.uml.Element;

-

-public abstract class TestWithoutReconnectAMultilinkk extends TestLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testViewDeletion(IElementType type) {

-		// DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		checkOwnedElementsAfterCreation(VIEW_DELETION);

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		checkOwnedElementsAfterCreation(VIEW_DELETION);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		checkOwnedElementsAfterCreation(VIEW_DELETION);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		checkOwnedElementsAfterCreation(VIEW_DELETION);

-	}

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDestroy(IElementType type) {

-

-		// DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		checkOwnedElementsAfterCreation(DESTROY_DELETION);

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		checkOwnedElementsBeforeCreation(DESTROY_DELETION);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		checkOwnedElementsAfterCreation(DESTROY_DELETION);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		checkOwnedElementsBeforeCreation(DESTROY_DELETION);

-	}

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDrop(IElementType type) {

-		// DROP

-

-		// it is impossible to drop but you can recreat the link between this element

-		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		checkOwnedElementsAfterCreation(DROP);

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);

-	}

-

-	/**

-	 * Test to create a link.

-	 *

-	 * @param linkType

-	 *            the type

-	 */

-	@Override

-	public void testToCreateALink(IElementType linkType, String initialName) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		checkOwnedElementsBeforeCreation(CREATION);

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		checkOwnedElementsAfterCreation(CREATION);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-		checkOwnedElementsBeforeCreation(CREATION);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);

-		checkOwnedElementsAfterCreation(CREATION);

-	}

-

-	protected void checkOwnedElementsAfterCreation(String prefix) {

-		assertTrue(prefix + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertEquals(prefix + TEST_THE_EXECUTION, 1, ((Element) source.resolveSemanticElement()).getOwnedElements().size());

-	}

-

-	protected void checkOwnedElementsBeforeCreation(String prefix) {

-		assertTrue(prefix + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertEquals(prefix + TEST_THE_UNDO, 0, ((Element) source.resolveSemanticElement()).getOwnedElements().size());

-	}

-

-	@Override

-	public void installEnvironment(IElementType sourceType, IElementType targetType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-

-		// create the source

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 100));

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		// create the source player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		// create the target

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 100));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		// create the target player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);

-		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);

-		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);

-		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);

-

-	}

-

-	@Override

-	public void testTargetReconnectAMultiLink(IElementType type) {

-

-	}

-

-	@Override

-	public void testSourceReconnectAMultiLink(IElementType type) {

-

-	}

-

-	/**

-	 * test the drop of a link where the source and the target are the same objects

-	 *

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {

-

-	}

-

-	/**

-	 * test the creation of a link where the source and the target are the same objects

-	 *

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		if (!allowed) {

-			return;

-		}

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, source));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 2);

-		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;
+import org.eclipse.uml2.uml.Element;
+
+public abstract class TestWithoutReconnectAMultilinkk extends TestLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testViewDeletion(IElementType type) {
+		// DELETION OF THE VIEW
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
+		checkOwnedElementsAfterCreation(VIEW_DELETION);
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);
+		checkOwnedElementsAfterCreation(VIEW_DELETION);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);
+		checkOwnedElementsAfterCreation(VIEW_DELETION);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);
+		checkOwnedElementsAfterCreation(VIEW_DELETION);
+	}
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDestroy(IElementType type) {
+
+		// DESTROY SEMANTIC+ VIEW
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
+		checkOwnedElementsAfterCreation(DESTROY_DELETION);
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);
+		checkOwnedElementsBeforeCreation(DESTROY_DELETION);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);
+		checkOwnedElementsAfterCreation(DESTROY_DELETION);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);
+		checkOwnedElementsBeforeCreation(DESTROY_DELETION);
+	}
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDrop(IElementType type) {
+		// DROP
+
+		// it is impossible to drop but you can recreat the link between this element
+		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		checkOwnedElementsAfterCreation(DROP);
+		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);
+	}
+
+	/**
+	 * Test to create a link.
+	 *
+	 * @param linkType
+	 *            the type
+	 */
+	@Override
+	public void testToCreateALink(IElementType linkType, String initialName) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		checkOwnedElementsBeforeCreation(CREATION);
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		checkOwnedElementsAfterCreation(CREATION);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);
+		checkOwnedElementsBeforeCreation(CREATION);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);
+		checkOwnedElementsAfterCreation(CREATION);
+	}
+
+	protected void checkOwnedElementsAfterCreation(String prefix) {
+		assertTrue(prefix + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertEquals(prefix + TEST_THE_EXECUTION, 1, ((Element) source.resolveSemanticElement()).getOwnedElements().size());
+	}
+
+	protected void checkOwnedElementsBeforeCreation(String prefix) {
+		assertTrue(prefix + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertEquals(prefix + TEST_THE_UNDO, 0, ((Element) source.resolveSemanticElement()).getOwnedElements().size());
+	}
+
+	@Override
+	public void installEnvironment(IElementType sourceType, IElementType targetType) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+
+		// create the source
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 100));
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+		// create the source player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+		// create the target
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 100));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+		// create the target player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);
+		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);
+		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);
+		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);
+
+	}
+
+	@Override
+	public void testTargetReconnectAMultiLink(IElementType type) {
+
+	}
+
+	@Override
+	public void testSourceReconnectAMultiLink(IElementType type) {
+
+	}
+
+	/**
+	 * test the drop of a link where the source and the target are the same objects
+	 *
+	 * @param linkType
+	 * @param allowed
+	 */
+	@Override
+	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {
+
+	}
+
+	/**
+	 * test the creation of a link where the source and the target are the same objects
+	 *
+	 * @param linkType
+	 * @param allowed
+	 */
+	@Override
+	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		if (!allowed) {
+			return;
+		}
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, source));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);
+		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 2);
+		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java
index bfef77a6fee..ae11da4f508 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load1000NodeTest.

- */

-public class Load1000NodeTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load1000 node.

-	 */

-	@Test

-	public void testLoad10Node() {

-		for(int i = 0; i < 1000; i++) {

-			testToCreateANode(UMLElementTypes.Node_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load1000NodeTest.
+ */
+public class Load1000NodeTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load1000 node.
+	 */
+	@Test
+	public void testLoad10Node() {
+		for(int i = 0; i < 1000; i++) {
+			testToCreateANode(UMLElementTypes.Node_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java
index fec7535c3c6..f5d369138c8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load100NodeTest.

- */

-public class Load100NodeTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load100 node.

-	 */

-	@Test

-	public void testLoad10Node() {

-		for(int i = 0; i < 100; i++) {

-			testToCreateANode(UMLElementTypes.Node_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load100NodeTest.
+ */
+public class Load100NodeTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load100 node.
+	 */
+	@Test
+	public void testLoad10Node() {
+		for(int i = 0; i < 100; i++) {
+			testToCreateANode(UMLElementTypes.Node_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java
index f70e85f234f..1a9503e0008 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load10NodeTest.

- */

-public class Load10NodeTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load10 node.

-	 */

-	@Test

-	public void testLoad10Node() {

-		for(int i = 0; i < 10; i++) {

-			testToCreateANode(UMLElementTypes.Node_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load10NodeTest.
+ */
+public class Load10NodeTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load10 node.
+	 */
+	@Test
+	public void testLoad10Node() {
+		for(int i = 0; i < 10; i++) {
+			testToCreateANode(UMLElementTypes.Node_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java
index 4af4536967c..3bda4e5e06e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load200NodeTest.

- */

-public class Load200NodeTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load200 node.

-	 */

-	@Test

-	public void testLoad10Node() {

-		for(int i = 0; i < 200; i++) {

-			testToCreateANode(UMLElementTypes.Node_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load200NodeTest.
+ */
+public class Load200NodeTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load200 node.
+	 */
+	@Test
+	public void testLoad10Node() {
+		for(int i = 0; i < 200; i++) {
+			testToCreateANode(UMLElementTypes.Node_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java
index 7dde36cc8d2..a4ee9bd85b8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load300NodeTest.

- */

-public class Load300NodeTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load300 node.

-	 */

-	@Test

-	public void testLoad10Node() {

-		for(int i = 0; i < 300; i++) {

-			testToCreateANode(UMLElementTypes.Node_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load300NodeTest.
+ */
+public class Load300NodeTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load300 node.
+	 */
+	@Test
+	public void testLoad10Node() {
+		for(int i = 0; i < 300; i++) {
+			testToCreateANode(UMLElementTypes.Node_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java
index 7ac2b65643b..7ffff9900e9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load400NodeTest.

- */

-public class Load400NodeTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load400 node.

-	 */

-	@Test

-	public void testLoad10Node() {

-		for(int i = 0; i < 400; i++) {

-			testToCreateANode(UMLElementTypes.Node_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load400NodeTest.
+ */
+public class Load400NodeTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load400 node.
+	 */
+	@Test
+	public void testLoad10Node() {
+		for(int i = 0; i < 400; i++) {
+			testToCreateANode(UMLElementTypes.Node_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java
index 6f58fa8786c..740b19633ed 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.load;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;

-import org.junit.Test;

-

-/**

- * The Class Load500NodeTest.

- */

-public class Load500NodeTest extends AbstractPapyrusTestCase {

-

-	@Override

-	protected String getProjectName() {

-		return IDeploymentDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IDeploymentDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull("CREATION: creation command null", command);

-		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Test load500 node.

-	 */

-	@Test

-	public void testLoad10Node() {

-		for(int i = 0; i < 500; i++) {

-			testToCreateANode(UMLElementTypes.Node_Shape);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.deployment.test.IDeploymentDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.deployment.test.canonical.AbstractPapyrusTestCase;
+import org.junit.Test;
+
+/**
+ * The Class Load500NodeTest.
+ */
+public class Load500NodeTest extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IDeploymentDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IDeploymentDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateANode(IElementType type) {
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull("CREATION: creation command null", command);
+		assertTrue("CREATION: test if the command is created", command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: test if the command can be executed", command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+	}
+
+	/**
+	 * Test load500 node.
+	 */
+	@Test
+	public void testLoad10Node() {
+		for(int i = 0; i < 500; i++) {
+			testToCreateANode(UMLElementTypes.Node_Shape);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/LoadTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/LoadTests.java
index 179c36233ed..b0e4a7b82d2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/LoadTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/LoadTests.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.test.load;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-// 10 Node

-Load10NodeTest.class,

-//100 Node

-Load100NodeTest.class,

-//200 Node

-Load200NodeTest.class,

-//300 Node

-Load300NodeTest.class,

-//400 Node

-Load400NodeTest.class,

-//500 Node

-Load500NodeTest.class,

-//1000 Node

-Load1000NodeTest.class, })

-public class LoadTests {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All tests together.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+// 10 Node
+Load10NodeTest.class,
+//100 Node
+Load100NodeTest.class,
+//200 Node
+Load200NodeTest.class,
+//300 Node
+Load300NodeTest.class,
+//400 Node
+Load400NodeTest.class,
+//500 Node
+Load500NodeTest.class,
+//1000 Node
+Load1000NodeTest.class, })
+public class LoadTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.classpath
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.project b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.project
index 6f169c223d2..701b247c2a7 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.project
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.dnd.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.dnd.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF
index fe54cbdc8c3..97d4bacc833 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF
@@ -1,33 +1,33 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.ui,

- org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.dnd;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.services.edit;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.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.dnd.tests.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: DND Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui,
+ org.eclipse.emf.ecore;bundle-version="2.8.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.dnd;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.edit;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.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.dnd.tests.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: DND Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/build.properties
index e2306275b30..74d76124156 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               model/,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               model/,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.di
index c536f42002e..d6160fa79ed 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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="drop.notation#_DisMwK8SEeGy9aF7W4MfLQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="drop.notation#_DisMwK8SEeGy9aF7W4MfLQ"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<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="drop.notation#_DisMwK8SEeGy9aF7W4MfLQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="drop.notation#_DisMwK8SEeGy9aF7W4MfLQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.notation
index d0689de3879..a935e8d1d3a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.notation
@@ -1,156 +1,156 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_DisMwK8SEeGy9aF7W4MfLQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_Gu97gK8SEeGy9aF7W4MfLQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_GvHFcK8SEeGy9aF7W4MfLQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_GvHFca8SEeGy9aF7W4MfLQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GvQ2cK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvQ2ca8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_TuxZ0a8SEeGy9aF7W4MfLQ" type="3012">

-        <element xmi:type="uml:Property" href="drop.uml#_TuxZ0K8SEeGy9aF7W4MfLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TuxZ0q8SEeGy9aF7W4MfLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_UAe04a8SEeGy9aF7W4MfLQ" type="3012">

-        <element xmi:type="uml:Property" href="drop.uml#_UAe04K8SEeGy9aF7W4MfLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UAe04q8SEeGy9aF7W4MfLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_UGv08a8SEeGy9aF7W4MfLQ" type="3012">

-        <element xmi:type="uml:Property" href="drop.uml#_UGv08K8SEeGy9aF7W4MfLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UGv08q8SEeGy9aF7W4MfLQ"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GvHFcq8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_GvHFc68SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_GvHFdK8SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GvHFda8SEeGy9aF7W4MfLQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_GvHFdq8SEeGy9aF7W4MfLQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GvQ2cq8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvQ2c68SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GvHFd68SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_GvHFeK8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_GvHFea8SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GvHFeq8SEeGy9aF7W4MfLQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_GvHFe68SEeGy9aF7W4MfLQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GvQ2dK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvQ2da8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GvHFfK8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_GvHFfa8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_GvHFfq8SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GvHFf68SEeGy9aF7W4MfLQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="drop.uml#_GuOUoK8SEeGy9aF7W4MfLQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gu97ga8SEeGy9aF7W4MfLQ" x="195" y="185"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_KuJG0a8SEeGy9aF7W4MfLQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_KuSQwK8SEeGy9aF7W4MfLQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_KuSQwa8SEeGy9aF7W4MfLQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KucBwK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KucBwa8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_UPEqga8SEeGy9aF7W4MfLQ" type="3006">

-        <element xmi:type="uml:Property" href="drop.uml#_UPEqgK8SEeGy9aF7W4MfLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UPEqgq8SEeGy9aF7W4MfLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_UVolgK8SEeGy9aF7W4MfLQ" type="3006">

-        <element xmi:type="uml:Property" href="drop.uml#_UVe0gK8SEeGy9aF7W4MfLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UVolga8SEeGy9aF7W4MfLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Ud0RIa8SEeGy9aF7W4MfLQ" type="3006">

-        <element xmi:type="uml:Property" href="drop.uml#_Ud0RIK8SEeGy9aF7W4MfLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud0RIq8SEeGy9aF7W4MfLQ"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_KuSQwq8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KuSQw68SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KuSQxK8SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KuSQxa8SEeGy9aF7W4MfLQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_KuSQxq8SEeGy9aF7W4MfLQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KucBwq8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KucBw68SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_KuSQx68SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KuSQyK8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KuSQya8SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KuSQyq8SEeGy9aF7W4MfLQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_KuSQy68SEeGy9aF7W4MfLQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KulLsK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KulLsa8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_KuSQzK8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KuSQza8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KuSQzq8SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KuSQz68SEeGy9aF7W4MfLQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="drop.uml#_KuJG0K8SEeGy9aF7W4MfLQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KuJG0q8SEeGy9aF7W4MfLQ" x="620" y="150"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_WO83kK8SEeGy9aF7W4MfLQ" type="2001">

-    <children xmi:type="notation:DecorationNode" xmi:id="_WO83kq8SEeGy9aF7W4MfLQ" type="5002"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_WO83k68SEeGy9aF7W4MfLQ" type="7001">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WO83mK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WO83ma8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_WO83lK8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WO83la8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WO83lq8SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WO83l68SEeGy9aF7W4MfLQ"/>

-    </children>

-    <element xmi:type="uml:InstanceSpecification" href="drop.uml#_WKfOUK8SEeGy9aF7W4MfLQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WO83ka8SEeGy9aF7W4MfLQ" x="390" y="390" width="238"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_hBfNEK8SEeGy9aF7W4MfLQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_hBfNEq8SEeGy9aF7W4MfLQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_hBfNE68SEeGy9aF7W4MfLQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hBfNIq8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hBfNI68SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_irJ5kK8SEeGy9aF7W4MfLQ" type="3012">

-        <element xmi:type="uml:Property" href="drop.uml#_irAvoK8SEeGy9aF7W4MfLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_irJ5ka8SEeGy9aF7W4MfLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_iy6HYa8SEeGy9aF7W4MfLQ" type="3012">

-        <element xmi:type="uml:Property" href="drop.uml#_iy6HYK8SEeGy9aF7W4MfLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iy6HYq8SEeGy9aF7W4MfLQ"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_hBfNFK8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hBfNFa8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hBfNFq8SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBfNF68SEeGy9aF7W4MfLQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_hBfNGK8SEeGy9aF7W4MfLQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hBfNJK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hBfNJa8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_hBfNGa8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hBfNGq8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hBfNG68SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBfNHK8SEeGy9aF7W4MfLQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_hBfNHa8SEeGy9aF7W4MfLQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hBfNJq8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hBfNJ68SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_hBfNHq8SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hBfNH68SEeGy9aF7W4MfLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hBfNIK8SEeGy9aF7W4MfLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBfNIa8SEeGy9aF7W4MfLQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="drop.uml#_hBWDIK8SEeGy9aF7W4MfLQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBfNEa8SEeGy9aF7W4MfLQ" x="195" y="10" width="186" height="116"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_DisMwa8SEeGy9aF7W4MfLQ"/>

-  <element xmi:type="uml:Model" href="drop.uml#_DfkAQK8SEeGy9aF7W4MfLQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_h8k8UK8SEeGy9aF7W4MfLQ" type="4002" source="_Gu97gK8SEeGy9aF7W4MfLQ" target="_hBfNEK8SEeGy9aF7W4MfLQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_h8k8U68SEeGy9aF7W4MfLQ" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_h8k8VK8SEeGy9aF7W4MfLQ" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_h8k8Ua8SEeGy9aF7W4MfLQ"/>

-    <element xmi:type="uml:Generalization" href="drop.uml#_h7_GcK8SEeGy9aF7W4MfLQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h8k8Uq8SEeGy9aF7W4MfLQ" points="[-4, -4, 3, 117]$[-4, -63, 3, 58]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h8utUK8SEeGy9aF7W4MfLQ" id="(0.563953488372093,0.03125)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_DisMwK8SEeGy9aF7W4MfLQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_Gu97gK8SEeGy9aF7W4MfLQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_GvHFcK8SEeGy9aF7W4MfLQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_GvHFca8SEeGy9aF7W4MfLQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GvQ2cK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvQ2ca8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_TuxZ0a8SEeGy9aF7W4MfLQ" type="3012">
+        <element xmi:type="uml:Property" href="drop.uml#_TuxZ0K8SEeGy9aF7W4MfLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TuxZ0q8SEeGy9aF7W4MfLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_UAe04a8SEeGy9aF7W4MfLQ" type="3012">
+        <element xmi:type="uml:Property" href="drop.uml#_UAe04K8SEeGy9aF7W4MfLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UAe04q8SEeGy9aF7W4MfLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_UGv08a8SEeGy9aF7W4MfLQ" type="3012">
+        <element xmi:type="uml:Property" href="drop.uml#_UGv08K8SEeGy9aF7W4MfLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UGv08q8SEeGy9aF7W4MfLQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GvHFcq8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_GvHFc68SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_GvHFdK8SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GvHFda8SEeGy9aF7W4MfLQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_GvHFdq8SEeGy9aF7W4MfLQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GvQ2cq8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvQ2c68SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GvHFd68SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_GvHFeK8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_GvHFea8SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GvHFeq8SEeGy9aF7W4MfLQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_GvHFe68SEeGy9aF7W4MfLQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GvQ2dK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvQ2da8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GvHFfK8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_GvHFfa8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_GvHFfq8SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GvHFf68SEeGy9aF7W4MfLQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="drop.uml#_GuOUoK8SEeGy9aF7W4MfLQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gu97ga8SEeGy9aF7W4MfLQ" x="195" y="185"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_KuJG0a8SEeGy9aF7W4MfLQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_KuSQwK8SEeGy9aF7W4MfLQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_KuSQwa8SEeGy9aF7W4MfLQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KucBwK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KucBwa8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_UPEqga8SEeGy9aF7W4MfLQ" type="3006">
+        <element xmi:type="uml:Property" href="drop.uml#_UPEqgK8SEeGy9aF7W4MfLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UPEqgq8SEeGy9aF7W4MfLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_UVolgK8SEeGy9aF7W4MfLQ" type="3006">
+        <element xmi:type="uml:Property" href="drop.uml#_UVe0gK8SEeGy9aF7W4MfLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UVolga8SEeGy9aF7W4MfLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Ud0RIa8SEeGy9aF7W4MfLQ" type="3006">
+        <element xmi:type="uml:Property" href="drop.uml#_Ud0RIK8SEeGy9aF7W4MfLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ud0RIq8SEeGy9aF7W4MfLQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_KuSQwq8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_KuSQw68SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KuSQxK8SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KuSQxa8SEeGy9aF7W4MfLQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_KuSQxq8SEeGy9aF7W4MfLQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KucBwq8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KucBw68SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_KuSQx68SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_KuSQyK8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KuSQya8SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KuSQyq8SEeGy9aF7W4MfLQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_KuSQy68SEeGy9aF7W4MfLQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KulLsK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KulLsa8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_KuSQzK8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_KuSQza8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KuSQzq8SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KuSQz68SEeGy9aF7W4MfLQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="drop.uml#_KuJG0K8SEeGy9aF7W4MfLQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KuJG0q8SEeGy9aF7W4MfLQ" x="620" y="150"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_WO83kK8SEeGy9aF7W4MfLQ" type="2001">
+    <children xmi:type="notation:DecorationNode" xmi:id="_WO83kq8SEeGy9aF7W4MfLQ" type="5002"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_WO83k68SEeGy9aF7W4MfLQ" type="7001">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WO83mK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WO83ma8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_WO83lK8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_WO83la8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WO83lq8SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WO83l68SEeGy9aF7W4MfLQ"/>
+    </children>
+    <element xmi:type="uml:InstanceSpecification" href="drop.uml#_WKfOUK8SEeGy9aF7W4MfLQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WO83ka8SEeGy9aF7W4MfLQ" x="390" y="390" width="238"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_hBfNEK8SEeGy9aF7W4MfLQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_hBfNEq8SEeGy9aF7W4MfLQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_hBfNE68SEeGy9aF7W4MfLQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hBfNIq8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hBfNI68SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_irJ5kK8SEeGy9aF7W4MfLQ" type="3012">
+        <element xmi:type="uml:Property" href="drop.uml#_irAvoK8SEeGy9aF7W4MfLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_irJ5ka8SEeGy9aF7W4MfLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iy6HYa8SEeGy9aF7W4MfLQ" type="3012">
+        <element xmi:type="uml:Property" href="drop.uml#_iy6HYK8SEeGy9aF7W4MfLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iy6HYq8SEeGy9aF7W4MfLQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hBfNFK8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hBfNFa8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hBfNFq8SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBfNF68SEeGy9aF7W4MfLQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_hBfNGK8SEeGy9aF7W4MfLQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hBfNJK8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hBfNJa8SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hBfNGa8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hBfNGq8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hBfNG68SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBfNHK8SEeGy9aF7W4MfLQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_hBfNHa8SEeGy9aF7W4MfLQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hBfNJq8SEeGy9aF7W4MfLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hBfNJ68SEeGy9aF7W4MfLQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hBfNHq8SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hBfNH68SEeGy9aF7W4MfLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hBfNIK8SEeGy9aF7W4MfLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBfNIa8SEeGy9aF7W4MfLQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="drop.uml#_hBWDIK8SEeGy9aF7W4MfLQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBfNEa8SEeGy9aF7W4MfLQ" x="195" y="10" width="186" height="116"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_DisMwa8SEeGy9aF7W4MfLQ"/>
+  <element xmi:type="uml:Model" href="drop.uml#_DfkAQK8SEeGy9aF7W4MfLQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_h8k8UK8SEeGy9aF7W4MfLQ" type="4002" source="_Gu97gK8SEeGy9aF7W4MfLQ" target="_hBfNEK8SEeGy9aF7W4MfLQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_h8k8U68SEeGy9aF7W4MfLQ" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_h8k8VK8SEeGy9aF7W4MfLQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_h8k8Ua8SEeGy9aF7W4MfLQ"/>
+    <element xmi:type="uml:Generalization" href="drop.uml#_h7_GcK8SEeGy9aF7W4MfLQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h8k8Uq8SEeGy9aF7W4MfLQ" points="[-4, -4, 3, 117]$[-4, -63, 3, 58]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h8utUK8SEeGy9aF7W4MfLQ" id="(0.563953488372093,0.03125)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.uml
index fbcd7c1a777..34aae6cb3e8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop.uml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_DfkAQK8SEeGy9aF7W4MfLQ" name="model">

-  <packagedElement xmi:type="uml:Class" xmi:id="_GuOUoK8SEeGy9aF7W4MfLQ" name="Class1">

-    <generalization xmi:id="_h7_GcK8SEeGy9aF7W4MfLQ" general="_hBWDIK8SEeGy9aF7W4MfLQ"/>

-    <ownedAttribute xmi:id="_TuxZ0K8SEeGy9aF7W4MfLQ" name="Property1"/>

-    <ownedAttribute xmi:id="_UAe04K8SEeGy9aF7W4MfLQ" name="Property2"/>

-    <ownedAttribute xmi:id="_UGv08K8SEeGy9aF7W4MfLQ" name="Property3"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_KuJG0K8SEeGy9aF7W4MfLQ" name="Interface1">

-    <ownedAttribute xmi:id="_UPEqgK8SEeGy9aF7W4MfLQ" name="Property1"/>

-    <ownedAttribute xmi:id="_UVe0gK8SEeGy9aF7W4MfLQ" name="Property2"/>

-    <ownedAttribute xmi:id="_Ud0RIK8SEeGy9aF7W4MfLQ" name="Property3"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_WKfOUK8SEeGy9aF7W4MfLQ" name="InstanceSpecification1"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_hBWDIK8SEeGy9aF7W4MfLQ" name="Class2">

-    <ownedAttribute xmi:id="_irAvoK8SEeGy9aF7W4MfLQ" name="Property1"/>

-    <ownedAttribute xmi:id="_iy6HYK8SEeGy9aF7W4MfLQ" name="Property2"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_DfkAQK8SEeGy9aF7W4MfLQ" name="model">
+  <packagedElement xmi:type="uml:Class" xmi:id="_GuOUoK8SEeGy9aF7W4MfLQ" name="Class1">
+    <generalization xmi:id="_h7_GcK8SEeGy9aF7W4MfLQ" general="_hBWDIK8SEeGy9aF7W4MfLQ"/>
+    <ownedAttribute xmi:id="_TuxZ0K8SEeGy9aF7W4MfLQ" name="Property1"/>
+    <ownedAttribute xmi:id="_UAe04K8SEeGy9aF7W4MfLQ" name="Property2"/>
+    <ownedAttribute xmi:id="_UGv08K8SEeGy9aF7W4MfLQ" name="Property3"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_KuJG0K8SEeGy9aF7W4MfLQ" name="Interface1">
+    <ownedAttribute xmi:id="_UPEqgK8SEeGy9aF7W4MfLQ" name="Property1"/>
+    <ownedAttribute xmi:id="_UVe0gK8SEeGy9aF7W4MfLQ" name="Property2"/>
+    <ownedAttribute xmi:id="_Ud0RIK8SEeGy9aF7W4MfLQ" name="Property3"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_WKfOUK8SEeGy9aF7W4MfLQ" name="InstanceSpecification1"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_hBWDIK8SEeGy9aF7W4MfLQ" name="Class2">
+    <ownedAttribute xmi:id="_irAvoK8SEeGy9aF7W4MfLQ" name="Property1"/>
+    <ownedAttribute xmi:id="_iy6HYK8SEeGy9aF7W4MfLQ" name="Property2"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/Activator.java
index 7a9aba29915..2f3525286e1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/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.uml.diagram.dnd.tests;

-

-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.uml.diagram.dnd.tests"; //$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.uml.diagram.dnd.tests;
+
+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.uml.diagram.dnd.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/AllTests.java
index 1687b51f265..353c46f6182 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/AllTests.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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.dnd.tests.tests;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({ InstanceSpecificationTest.class })

-public class AllTests {

-	//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.uml.diagram.dnd.tests.tests;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({ InstanceSpecificationTest.class })
+public class AllTests {
+	//Nothing
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/InstanceSpecificationTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/InstanceSpecificationTest.java
index d8c8f7133f2..cfc61dd087b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/InstanceSpecificationTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/InstanceSpecificationTest.java
@@ -1,419 +1,419 @@
-/*****************************************************************************

- * 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 434993

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.dnd.tests.tests;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URL;

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CommandStack;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.RequestUtils;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.policy.DropStrategyManager;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.TreeToFlatContentProvider;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui.ClassifierPropertiesContentProvider;

-import org.eclipse.papyrus.uml.diagram.dnd.tests.Activator;

-import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Slot;

-import org.eclipse.uml2.uml.ValueSpecification;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.BeforeClass;

-import org.junit.ClassRule;

-import org.junit.Test;

-

-/**

- * A Class to test the drop of a Classifier (or a list of Classifiers)

- * on an InstanceSpecification

- *

- * @author Camille Letavernier

- *

- */

-public class InstanceSpecificationTest extends AbstractPapyrusTest {

-

-	@ClassRule

-	public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();

-

-	private static Diagram diagram;

-

-	private static IMultiDiagramEditor papyrusEditor;

-

-	private static final Set<IFile> model = new HashSet<IFile>();

-

-	private static DropStrategy strategy;

-

-	@BeforeClass

-	public static void init() {

-		String projectName = "dnd.test";

-		String modelName = "drop"; // drop.di, drop.notation, drop.uml

-

-		try {

-			initModel("org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop", projectName, modelName);

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			Assert.fail("Cannot load the test model");

-		}

-

-		houseKeeper.setField("strategy", DropStrategyManager.instance.findStrategy(org.eclipse.papyrus.uml.diagram.dnd.Activator.PLUGIN_ID + ".instanceSpecification"));

-	}

-

-	@After

-	@Before

-	public void initDefaults() {

-		// Restore the default DND preferences before each test

-		DropStrategyManager.instance.restoreDefaults();

-	}

-

-	protected static void initModel(String sourcePath, String projectName, String modelName) throws CoreException, IOException {

-		IProject project = houseKeeper.createProject(projectName);

-

-		String[] extensions = { "di", "notation", "uml" };

-		for (String extension : extensions) {

-			IFile targetFile = project.getFile(modelName + "." + extension);

-			URL sourceURL = new URL("platform:/plugin/" + sourcePath + "." + extension);

-			copyToWorkspace(sourceURL, targetFile);

-		}

-

-		final IFile modelFile = project.getFile(modelName + ".di");

-

-		Display.getDefault().syncExec(new Runnable() {

-

-			public void run() {

-				try {

-					papyrusEditor = houseKeeper.openPapyrusEditor(modelFile);

-					diagram = papyrusEditor.getAdapter(Diagram.class);

-				} catch (Exception ex) {

-					ex.printStackTrace(System.out);

-				}

-			}

-		});

-

-		Assert.assertNotNull("Cannot load the test diagram", diagram);

-	}

-

-	protected static void copyToWorkspace(URL sourceURL, IFile targetFile) throws CoreException, IOException {

-		InputStream sourceStream = sourceURL.openStream();

-		targetFile.create(sourceStream, true, new NullProgressMonitor());

-		model.add(targetFile);

-		sourceStream.close();

-	}

-

-	protected Command drop(Object source, EditPart target, boolean shouldWork) {

-		return drop(Collections.singletonList(source), target, shouldWork);

-	}

-

-	protected Command drop(Object source, EditPart target) {

-		return drop(source, target, true);

-	}

-

-	protected Command drop(List<? extends Object> source, EditPart target) {

-		return drop(source, target, true);

-	}

-

-	protected Command drop(List<? extends Object> source, EditPart target, boolean shouldWork) {

-		DropObjectsRequest request = new DropObjectsRequest();

-		RequestUtils.setUseGUI(request, false);

-		request.setObjects(source);

-		Command command = target.getCommand(request);

-		if (shouldWork) {

-			Assert.assertNotNull("The drop command is null", command);

-			Assert.assertTrue("The drop command cannot be executed", command.canExecute());

-		} else {

-			Assert.assertNull("The drop command should be null", command);

-		}

-

-		return command;

-	}

-

-	protected Command drop(EditPart target, EObject... source) {

-		return drop(Arrays.asList(source), target, true);

-	}

-

-	protected Command drop(EditPart target, boolean shouldWork, EObject... source) {

-		return drop(Arrays.asList(source), target, shouldWork);

-	}

-

-	protected EObject find(String name) {

-		return find(name, diagram.getElement());

-	}

-

-	protected EObject find(String name, EObject context) {

-		if (context instanceof NamedElement) {

-			if (name.equals(((NamedElement) context).getName())) {

-				return context;

-			}

-		}

-

-		for (EObject element : context.eContents()) {

-			EObject result = find(name, element);

-			if (result != null) {

-				return result;

-			}

-		}

-

-		return null;

-	}

-

-	protected EditPart findEditPart(String name) {

-		return findEditPart(name, papyrusEditor.getAdapter(DiagramEditPart.class));

-	}

-

-	protected EditPart findEditPart(String name, EditPart context) {

-		Element element = UMLUtil.resolveUMLElement(context);

-		if (element instanceof NamedElement) {

-			if (name.equals(((NamedElement) element).getName())) {

-				return context;

-			}

-		}

-

-		for (Object editPartObject : context.getChildren()) {

-			EditPart editPart = (EditPart) editPartObject;

-			EditPart result = findEditPart(name, editPart);

-			if (result != null) {

-				return result;

-			}

-		}

-

-		return null;

-	}

-

-	protected CommandStack getCommandStack(EditPart target) {

-		return target.getViewer().getEditDomain().getCommandStack();

-	}

-

-	protected void execute(Command gefCommand, EditPart target) throws Exception {

-		getCommandStack(target).execute(gefCommand);

-		// IStatus result = new CommandProxy(gefCommand).execute(new NullProgressMonitor(), null);

-		// Assert.assertEquals("The execution status should be OK", IStatus.OK, result.getSeverity());

-	}

-

-	protected void checkSlots(EditPart instanceSpecificationPart, List<Property>... expectedProperties) {

-		Set<Property> allProperties = new HashSet<Property>();

-		for (List<Property> properties : expectedProperties) {

-			allProperties.addAll(properties);

-		}

-

-		InstanceSpecification instanceSpecification = (InstanceSpecification) UMLUtil.resolveUMLElement(instanceSpecificationPart);

-

-		Assert.assertEquals("Slots should have been created in the InstanceSpecification", allProperties.size(), instanceSpecification.getSlots().size());

-

-		for (Property property : allProperties) {

-			Slot slot = findSlot(instanceSpecification, property);

-			Assert.assertNotNull("Slot corresponding to " + property.getQualifiedName() + " not found", slot);

-

-			ValueSpecification defaultValue = property.getDefaultValue();

-			if (defaultValue != null) {

-				Assert.assertEquals("The slot should have a value correspond to the Property's default value", 1, slot.getValues().size());

-				ValueSpecification slotValue = slot.getValues().get(0);

-				Assert.assertEquals(defaultValue.eClass(), slotValue.eClass());

-				// TODO Test value (switch/case on ValueSpecifications?)

-				// TODO The test model doesn't contain default values

-			}

-		}

-	}

-

-	protected Slot findSlot(InstanceSpecification specification, Property property) {

-		for (Slot slot : specification.getSlots()) {

-			if (property == slot.getDefiningFeature()) {

-				return slot;

-			}

-		}

-

-		return null;

-	}

-

-	protected void checkClassifiers(EditPart targetPart, EObject... classifiers) {

-		InstanceSpecification instance = (InstanceSpecification) UMLUtil.resolveUMLElement(targetPart);

-		Assert.assertEquals("The instance should be typed with " + classifiers.length + " classifiers", classifiers.length, instance.getClassifiers().size());

-		for (EObject classifier : classifiers) {

-			Assert.assertTrue("The instance specification should be typed with " + classifier, instance.getClassifiers().contains(classifier));

-		}

-	}

-

-	protected void undo(EditPart target) throws Exception {

-		getCommandStack(target).undo();

-		// EditingDomain domain = EMFHelper.resolveEditingDomain(diagram);

-		// CheckedOperationHistory.getInstance().undo(new EditingDomainUndoContext(domain), new NullProgressMonitor(), null);

-		InstanceSpecification instanceSpec = (InstanceSpecification) find("InstanceSpecification1");

-		Assert.assertEquals("Slots should not exist anymore", 0, instanceSpec.getSlots().size());

-		Assert.assertEquals("InstanceSpecification should not be typed anymore", 0, instanceSpec.getClassifiers().size());

-	}

-

-	@Test

-	public void dropClass() throws Exception {

-		EObject class2 = find("Class2");

-		EditPart target = findEditPart("InstanceSpecification1");

-		Command command = drop(class2, target);

-

-		execute(command, target);

-		checkSlots(target, ((org.eclipse.uml2.uml.Class) class2).getAllAttributes());

-		checkClassifiers(target, class2);

-		undo(target);

-

-		DropStrategyManager.instance.setActive(strategy, false);

-		drop(class2, target, false);

-	}

-

-	@Test

-	public void dropInterface() throws Exception {

-		EObject interface1 = find("Interface1");

-		EditPart target = findEditPart("InstanceSpecification1");

-		Command command = drop(interface1, target);

-

-		execute(command, target);

-		checkSlots(target, ((org.eclipse.uml2.uml.Interface) interface1).getAllAttributes());

-		checkClassifiers(target, interface1);

-		undo(target);

-

-		DropStrategyManager.instance.setActive(strategy, false);

-		drop(interface1, target, false);

-	}

-

-	@Test

-	public void dropClassAndInterface() throws Exception {

-		EObject class2 = find("Class2");

-		EObject interface1 = find("Interface1");

-

-		EditPart target = findEditPart("InstanceSpecification1");

-		Command command = drop(target, class2, interface1);

-

-		execute(command, target);

-		checkSlots(target, ((org.eclipse.uml2.uml.Interface) interface1).getAllAttributes(), ((org.eclipse.uml2.uml.Class) class2).getAllAttributes());

-		checkClassifiers(target, class2, interface1);

-		undo(target);

-

-		DropStrategyManager.instance.setActive(strategy, false);

-		drop(target, false, class2, interface1);

-	}

-

-	@Test

-	public void dropClassAndSuperclass() throws Exception {

-		EObject class1 = find("Class1");

-		EObject class2 = find("Class2");

-

-		EditPart target = findEditPart("InstanceSpecification1");

-		Command command = drop(target, class1, class2);

-

-		execute(command, target);

-		checkSlots(target, ((org.eclipse.uml2.uml.Class) class1).getAllAttributes(), ((org.eclipse.uml2.uml.Class) class2).getAllAttributes());

-		checkClassifiers(target, class1, class2);

-		undo(target);

-

-		DropStrategyManager.instance.setActive(strategy, false);

-		drop(target, false, class1, class2);

-	}

-

-	@Test

-	public void testPropertyContentProvider() {

-		Classifier class2 = (Classifier) find("Class2");

-		Property c2p1 = (Property) find("Property1", class2);

-		Property c2p2 = (Property) find("Property2", class2);

-

-		Classifier class1 = (Classifier) find("Class1");

-		Property c1p1 = (Property) find("Property1", class1);

-		Property c1p2 = (Property) find("Property2", class1);

-		Property c1p3 = (Property) find("Property3", class1);

-

-		Classifier interface1 = (Classifier) find("Interface1");

-		Property i1p1 = (Property) find("Property1", interface1);

-		Property i1p2 = (Property) find("Property2", interface1);

-		Property i1p3 = (Property) find("Property3", interface1);

-

-		ClassifierPropertiesContentProvider contentProvider = new ClassifierPropertiesContentProvider();

-

-		EncapsulatedContentProvider encapsulatedProvider = new EncapsulatedContentProvider(contentProvider);

-		TreeToFlatContentProvider provider = new TreeToFlatContentProvider(encapsulatedProvider);

-

-		final Set<Property> expectedResult = new HashSet<Property>();

-

-		// Test 1 : Class2 (Simple Class)

-

-		expectedResult.add(c2p1);

-		expectedResult.add(c2p2);

-

-		contentProvider.inputChanged(null, null, Collections.singletonList(class2));

-		checkProviderResult(provider, expectedResult, "Test1");

-

-		// Clear Test1

-		expectedResult.clear();

-

-		// Test2 : Class1 (Inherited class)

-

-		expectedResult.add(c1p1);

-		expectedResult.add(c1p2);

-		expectedResult.add(c1p3);

-		expectedResult.add(c2p1);

-		expectedResult.add(c2p2);

-

-		contentProvider.inputChanged(null, null, Collections.singletonList(class1));

-		checkProviderResult(provider, expectedResult, "Test2");

-

-		// Test3 : Class1 + Class2 (Expected result is the same as Test2, do not clear the Set)

-		contentProvider.inputChanged(null, null, Arrays.asList(new Classifier[] { class1, class2 }));

-		checkProviderResult(provider, expectedResult, "Test3");

-

-

-		// Test4 : Class1 + Interface1 (Previous result + properties from Interface1)

-		expectedResult.add(i1p1);

-		expectedResult.add(i1p2);

-		expectedResult.add(i1p3);

-

-		contentProvider.inputChanged(null, null, Arrays.asList(new Classifier[] { class1, interface1 }));

-		checkProviderResult(provider, expectedResult, "Test4");

-

-		// TODO: Test the case where a Class implements an Interface. Class#getAllAttributes() will not

-		// retrieve the Interface's properties. The specification isn't clear whether we should create slots

-		// for these properties or not.

-	}

-

-	protected void checkProviderResult(IStaticContentProvider provider, Set<Property> expectedResult, String testName) {

-		Set<Property> propertiesResult = new HashSet<Property>();

-		for (Object element : provider.getElements()) {

-			// Only care about properties

-			if (element instanceof Property) {

-				propertiesResult.add((Property) element);

-			}

-		}

-

-		Assert.assertEquals("ClassifierPropertiesContentProvider did not return the expected result for test " + testName, expectedResult, propertiesResult);

-	}

-

-}

+/*****************************************************************************
+ * 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 434993
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.dnd.tests.tests;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CommandStack;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.RequestUtils;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.policy.DropStrategyManager;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.TreeToFlatContentProvider;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui.ClassifierPropertiesContentProvider;
+import org.eclipse.papyrus.uml.diagram.dnd.tests.Activator;
+import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Slot;
+import org.eclipse.uml2.uml.ValueSpecification;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+/**
+ * A Class to test the drop of a Classifier (or a list of Classifiers)
+ * on an InstanceSpecification
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class InstanceSpecificationTest extends AbstractPapyrusTest {
+
+	@ClassRule
+	public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
+
+	private static Diagram diagram;
+
+	private static IMultiDiagramEditor papyrusEditor;
+
+	private static final Set<IFile> model = new HashSet<IFile>();
+
+	private static DropStrategy strategy;
+
+	@BeforeClass
+	public static void init() {
+		String projectName = "dnd.test";
+		String modelName = "drop"; // drop.di, drop.notation, drop.uml
+
+		try {
+			initModel("org.eclipse.papyrus.uml.diagram.dnd.tests/model/drop", projectName, modelName);
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			Assert.fail("Cannot load the test model");
+		}
+
+		houseKeeper.setField("strategy", DropStrategyManager.instance.findStrategy(org.eclipse.papyrus.uml.diagram.dnd.Activator.PLUGIN_ID + ".instanceSpecification"));
+	}
+
+	@After
+	@Before
+	public void initDefaults() {
+		// Restore the default DND preferences before each test
+		DropStrategyManager.instance.restoreDefaults();
+	}
+
+	protected static void initModel(String sourcePath, String projectName, String modelName) throws CoreException, IOException {
+		IProject project = houseKeeper.createProject(projectName);
+
+		String[] extensions = { "di", "notation", "uml" };
+		for (String extension : extensions) {
+			IFile targetFile = project.getFile(modelName + "." + extension);
+			URL sourceURL = new URL("platform:/plugin/" + sourcePath + "." + extension);
+			copyToWorkspace(sourceURL, targetFile);
+		}
+
+		final IFile modelFile = project.getFile(modelName + ".di");
+
+		Display.getDefault().syncExec(new Runnable() {
+
+			public void run() {
+				try {
+					papyrusEditor = houseKeeper.openPapyrusEditor(modelFile);
+					diagram = papyrusEditor.getAdapter(Diagram.class);
+				} catch (Exception ex) {
+					ex.printStackTrace(System.out);
+				}
+			}
+		});
+
+		Assert.assertNotNull("Cannot load the test diagram", diagram);
+	}
+
+	protected static void copyToWorkspace(URL sourceURL, IFile targetFile) throws CoreException, IOException {
+		InputStream sourceStream = sourceURL.openStream();
+		targetFile.create(sourceStream, true, new NullProgressMonitor());
+		model.add(targetFile);
+		sourceStream.close();
+	}
+
+	protected Command drop(Object source, EditPart target, boolean shouldWork) {
+		return drop(Collections.singletonList(source), target, shouldWork);
+	}
+
+	protected Command drop(Object source, EditPart target) {
+		return drop(source, target, true);
+	}
+
+	protected Command drop(List<? extends Object> source, EditPart target) {
+		return drop(source, target, true);
+	}
+
+	protected Command drop(List<? extends Object> source, EditPart target, boolean shouldWork) {
+		DropObjectsRequest request = new DropObjectsRequest();
+		RequestUtils.setUseGUI(request, false);
+		request.setObjects(source);
+		Command command = target.getCommand(request);
+		if (shouldWork) {
+			Assert.assertNotNull("The drop command is null", command);
+			Assert.assertTrue("The drop command cannot be executed", command.canExecute());
+		} else {
+			Assert.assertNull("The drop command should be null", command);
+		}
+
+		return command;
+	}
+
+	protected Command drop(EditPart target, EObject... source) {
+		return drop(Arrays.asList(source), target, true);
+	}
+
+	protected Command drop(EditPart target, boolean shouldWork, EObject... source) {
+		return drop(Arrays.asList(source), target, shouldWork);
+	}
+
+	protected EObject find(String name) {
+		return find(name, diagram.getElement());
+	}
+
+	protected EObject find(String name, EObject context) {
+		if (context instanceof NamedElement) {
+			if (name.equals(((NamedElement) context).getName())) {
+				return context;
+			}
+		}
+
+		for (EObject element : context.eContents()) {
+			EObject result = find(name, element);
+			if (result != null) {
+				return result;
+			}
+		}
+
+		return null;
+	}
+
+	protected EditPart findEditPart(String name) {
+		return findEditPart(name, papyrusEditor.getAdapter(DiagramEditPart.class));
+	}
+
+	protected EditPart findEditPart(String name, EditPart context) {
+		Element element = UMLUtil.resolveUMLElement(context);
+		if (element instanceof NamedElement) {
+			if (name.equals(((NamedElement) element).getName())) {
+				return context;
+			}
+		}
+
+		for (Object editPartObject : context.getChildren()) {
+			EditPart editPart = (EditPart) editPartObject;
+			EditPart result = findEditPart(name, editPart);
+			if (result != null) {
+				return result;
+			}
+		}
+
+		return null;
+	}
+
+	protected CommandStack getCommandStack(EditPart target) {
+		return target.getViewer().getEditDomain().getCommandStack();
+	}
+
+	protected void execute(Command gefCommand, EditPart target) throws Exception {
+		getCommandStack(target).execute(gefCommand);
+		// IStatus result = new CommandProxy(gefCommand).execute(new NullProgressMonitor(), null);
+		// Assert.assertEquals("The execution status should be OK", IStatus.OK, result.getSeverity());
+	}
+
+	protected void checkSlots(EditPart instanceSpecificationPart, List<Property>... expectedProperties) {
+		Set<Property> allProperties = new HashSet<Property>();
+		for (List<Property> properties : expectedProperties) {
+			allProperties.addAll(properties);
+		}
+
+		InstanceSpecification instanceSpecification = (InstanceSpecification) UMLUtil.resolveUMLElement(instanceSpecificationPart);
+
+		Assert.assertEquals("Slots should have been created in the InstanceSpecification", allProperties.size(), instanceSpecification.getSlots().size());
+
+		for (Property property : allProperties) {
+			Slot slot = findSlot(instanceSpecification, property);
+			Assert.assertNotNull("Slot corresponding to " + property.getQualifiedName() + " not found", slot);
+
+			ValueSpecification defaultValue = property.getDefaultValue();
+			if (defaultValue != null) {
+				Assert.assertEquals("The slot should have a value correspond to the Property's default value", 1, slot.getValues().size());
+				ValueSpecification slotValue = slot.getValues().get(0);
+				Assert.assertEquals(defaultValue.eClass(), slotValue.eClass());
+				// TODO Test value (switch/case on ValueSpecifications?)
+				// TODO The test model doesn't contain default values
+			}
+		}
+	}
+
+	protected Slot findSlot(InstanceSpecification specification, Property property) {
+		for (Slot slot : specification.getSlots()) {
+			if (property == slot.getDefiningFeature()) {
+				return slot;
+			}
+		}
+
+		return null;
+	}
+
+	protected void checkClassifiers(EditPart targetPart, EObject... classifiers) {
+		InstanceSpecification instance = (InstanceSpecification) UMLUtil.resolveUMLElement(targetPart);
+		Assert.assertEquals("The instance should be typed with " + classifiers.length + " classifiers", classifiers.length, instance.getClassifiers().size());
+		for (EObject classifier : classifiers) {
+			Assert.assertTrue("The instance specification should be typed with " + classifier, instance.getClassifiers().contains(classifier));
+		}
+	}
+
+	protected void undo(EditPart target) throws Exception {
+		getCommandStack(target).undo();
+		// EditingDomain domain = EMFHelper.resolveEditingDomain(diagram);
+		// CheckedOperationHistory.getInstance().undo(new EditingDomainUndoContext(domain), new NullProgressMonitor(), null);
+		InstanceSpecification instanceSpec = (InstanceSpecification) find("InstanceSpecification1");
+		Assert.assertEquals("Slots should not exist anymore", 0, instanceSpec.getSlots().size());
+		Assert.assertEquals("InstanceSpecification should not be typed anymore", 0, instanceSpec.getClassifiers().size());
+	}
+
+	@Test
+	public void dropClass() throws Exception {
+		EObject class2 = find("Class2");
+		EditPart target = findEditPart("InstanceSpecification1");
+		Command command = drop(class2, target);
+
+		execute(command, target);
+		checkSlots(target, ((org.eclipse.uml2.uml.Class) class2).getAllAttributes());
+		checkClassifiers(target, class2);
+		undo(target);
+
+		DropStrategyManager.instance.setActive(strategy, false);
+		drop(class2, target, false);
+	}
+
+	@Test
+	public void dropInterface() throws Exception {
+		EObject interface1 = find("Interface1");
+		EditPart target = findEditPart("InstanceSpecification1");
+		Command command = drop(interface1, target);
+
+		execute(command, target);
+		checkSlots(target, ((org.eclipse.uml2.uml.Interface) interface1).getAllAttributes());
+		checkClassifiers(target, interface1);
+		undo(target);
+
+		DropStrategyManager.instance.setActive(strategy, false);
+		drop(interface1, target, false);
+	}
+
+	@Test
+	public void dropClassAndInterface() throws Exception {
+		EObject class2 = find("Class2");
+		EObject interface1 = find("Interface1");
+
+		EditPart target = findEditPart("InstanceSpecification1");
+		Command command = drop(target, class2, interface1);
+
+		execute(command, target);
+		checkSlots(target, ((org.eclipse.uml2.uml.Interface) interface1).getAllAttributes(), ((org.eclipse.uml2.uml.Class) class2).getAllAttributes());
+		checkClassifiers(target, class2, interface1);
+		undo(target);
+
+		DropStrategyManager.instance.setActive(strategy, false);
+		drop(target, false, class2, interface1);
+	}
+
+	@Test
+	public void dropClassAndSuperclass() throws Exception {
+		EObject class1 = find("Class1");
+		EObject class2 = find("Class2");
+
+		EditPart target = findEditPart("InstanceSpecification1");
+		Command command = drop(target, class1, class2);
+
+		execute(command, target);
+		checkSlots(target, ((org.eclipse.uml2.uml.Class) class1).getAllAttributes(), ((org.eclipse.uml2.uml.Class) class2).getAllAttributes());
+		checkClassifiers(target, class1, class2);
+		undo(target);
+
+		DropStrategyManager.instance.setActive(strategy, false);
+		drop(target, false, class1, class2);
+	}
+
+	@Test
+	public void testPropertyContentProvider() {
+		Classifier class2 = (Classifier) find("Class2");
+		Property c2p1 = (Property) find("Property1", class2);
+		Property c2p2 = (Property) find("Property2", class2);
+
+		Classifier class1 = (Classifier) find("Class1");
+		Property c1p1 = (Property) find("Property1", class1);
+		Property c1p2 = (Property) find("Property2", class1);
+		Property c1p3 = (Property) find("Property3", class1);
+
+		Classifier interface1 = (Classifier) find("Interface1");
+		Property i1p1 = (Property) find("Property1", interface1);
+		Property i1p2 = (Property) find("Property2", interface1);
+		Property i1p3 = (Property) find("Property3", interface1);
+
+		ClassifierPropertiesContentProvider contentProvider = new ClassifierPropertiesContentProvider();
+
+		EncapsulatedContentProvider encapsulatedProvider = new EncapsulatedContentProvider(contentProvider);
+		TreeToFlatContentProvider provider = new TreeToFlatContentProvider(encapsulatedProvider);
+
+		final Set<Property> expectedResult = new HashSet<Property>();
+
+		// Test 1 : Class2 (Simple Class)
+
+		expectedResult.add(c2p1);
+		expectedResult.add(c2p2);
+
+		contentProvider.inputChanged(null, null, Collections.singletonList(class2));
+		checkProviderResult(provider, expectedResult, "Test1");
+
+		// Clear Test1
+		expectedResult.clear();
+
+		// Test2 : Class1 (Inherited class)
+
+		expectedResult.add(c1p1);
+		expectedResult.add(c1p2);
+		expectedResult.add(c1p3);
+		expectedResult.add(c2p1);
+		expectedResult.add(c2p2);
+
+		contentProvider.inputChanged(null, null, Collections.singletonList(class1));
+		checkProviderResult(provider, expectedResult, "Test2");
+
+		// Test3 : Class1 + Class2 (Expected result is the same as Test2, do not clear the Set)
+		contentProvider.inputChanged(null, null, Arrays.asList(new Classifier[] { class1, class2 }));
+		checkProviderResult(provider, expectedResult, "Test3");
+
+
+		// Test4 : Class1 + Interface1 (Previous result + properties from Interface1)
+		expectedResult.add(i1p1);
+		expectedResult.add(i1p2);
+		expectedResult.add(i1p3);
+
+		contentProvider.inputChanged(null, null, Arrays.asList(new Classifier[] { class1, interface1 }));
+		checkProviderResult(provider, expectedResult, "Test4");
+
+		// TODO: Test the case where a Class implements an Interface. Class#getAllAttributes() will not
+		// retrieve the Interface's properties. The specification isn't clear whether we should create slots
+		// for these properties or not.
+	}
+
+	protected void checkProviderResult(IStaticContentProvider provider, Set<Property> expectedResult, String testName) {
+		Set<Property> propertiesResult = new HashSet<Property>();
+		for (Object element : provider.getElements()) {
+			// Only care about properties
+			if (element instanceof Property) {
+				propertiesResult.add((Property) element);
+			}
+		}
+
+		Assert.assertEquals("ClassifierPropertiesContentProvider did not return the expected result for test " + testName, expectedResult, propertiesResult);
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF
index 1d3cc1053f5..174ec8d6f4f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;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.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.3.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.gmf.runtime.diagram.ui,

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: IODiagram Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;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.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: IODiagram Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/RoundedCompartmentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/RoundedCompartmentTest.java
index 0669a877f67..494bf3cf908 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/RoundedCompartmentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/RoundedCompartmentTest.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * 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

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.interactionoverview.tests;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CallBehaviorActionAsInteractionEditPart;

-import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CustomActivityEditPartTN;

-import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CustomInteractionUseEditPartCN;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;

-

-/**

- * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.

- */

-public class RoundedCompartmentTest extends AbstractGenericShapeTest {

-

-	/**

-	 * Gets the rounded compartment edit parts.

-	 *

-	 * @return the rounded compartment edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()

-	 */

-	public List<Class<?>> getRoundedCompartmentEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-

-		classes.add(CustomActivityEditPartTN.class);

-		classes.add(CallBehaviorActionAsInteractionEditPart.class);

-		classes.add(CustomInteractionUseEditPartCN.class);

-

-		return classes;

-	}

-

-	/**

-	 * Gets the rounded border named element edit parts.

-	 *

-	 * @return the rounded border named element edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()

-	 */

-	public List<Class<?>> getRoundedBorderNamedElementEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-		return classes;

-	}

-}

+/*****************************************************************************
+ * 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
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CallBehaviorActionAsInteractionEditPart;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CustomActivityEditPartTN;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CustomInteractionUseEditPartCN;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;
+
+/**
+ * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.
+ */
+public class RoundedCompartmentTest extends AbstractGenericShapeTest {
+
+	/**
+	 * Gets the rounded compartment edit parts.
+	 *
+	 * @return the rounded compartment edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()
+	 */
+	public List<Class<?>> getRoundedCompartmentEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+
+		classes.add(CustomActivityEditPartTN.class);
+		classes.add(CallBehaviorActionAsInteractionEditPart.class);
+		classes.add(CustomInteractionUseEditPartCN.class);
+
+		return classes;
+	}
+
+	/**
+	 * Gets the rounded border named element edit parts.
+	 *
+	 * @return the rounded border named element edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()
+	 */
+	public List<Class<?>> getRoundedBorderNamedElementEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+		return classes;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF
index 683f8c58bb9..1ac9b31db24 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.core.resources;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;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.editor;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.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;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.editor;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.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/build.properties
index cfc0232c9c8..de3865a9ccd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/,\

-           test-gen/,\

-           xtend-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               resource/

-src.includes = about.html

+source.. = src/,\
+           test-gen/,\
+           xtend-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               resource/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/DefineProfileCommandTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/DefineProfileCommandTest.java
index 076b9404a90..45d9d2f8065 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/DefineProfileCommandTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/DefineProfileCommandTest.java
@@ -1,98 +1,98 @@
-/*****************************************************************************

- * Copyright (c) 2014 Christian W. Damus and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.uml.diagram.profile.custom.commands.tests;

-

-import static org.hamcrest.CoreMatchers.hasItem;

-import static org.hamcrest.CoreMatchers.notNullValue;

-import static org.hamcrest.CoreMatchers.nullValue;

-import static org.hamcrest.MatcherAssert.assertThat;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.ENamedElement;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.eclipse.papyrus.uml.diagram.profile.custom.commands.DefineProfileCommand;

-import org.eclipse.papyrus.uml.tools.profile.definition.PapyrusDefinitionAnnotation;

-import org.eclipse.papyrus.uml.tools.profile.definition.Version;

-import org.eclipse.uml2.uml.Profile;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * Test suite for the {@code DefineProfileCommand} class.

- */

-public class DefineProfileCommandTest extends AbstractPapyrusTest {

-

-	@Rule

-	public final ModelSetFixture modelSet = new ModelSetFixture();

-

-	/**

-	 * Initializes me.

-	 */

-	public DefineProfileCommandTest() {

-		super();

-	}

-

-	@Test

-	@PluginResource("resource/profile_simple/simple.profile.di")

-	public void testDefineSimpleProfile() {

-		Profile rootProfile = (Profile) modelSet.getModel();

-

-		executeDefineCommand(rootProfile, "0.0.1");

-

-		EAnnotation annotation = getUMLAnnotation(rootProfile.getDefinition());

-		assertThat(annotation, nullValue()); // Don't need the annotation for a simple self-contained profile

-	}

-

-	@Test

-	@PluginResource("resource/profile_dependencies/datatypes.profile.di")

-	public void testDefineNestedProfileWithDependencies() {

-		Profile rootProfile = (Profile) modelSet.getModel();

-

-		executeDefineCommand(rootProfile, "0.0.1");

-

-		Profile profile1 = (Profile) rootProfile.getNestedPackage("Profile1");

-		Profile profile2 = (Profile) rootProfile.getNestedPackage("Profile2");

-

-		EAnnotation annotation = getUMLAnnotation(profile1.getDefinition());

-		assertThat(annotation, notNullValue());

-		assertThat(annotation.getReferences(), hasItem(profile2.getDefinition()));

-	}

-

-	//

-	// Test framework

-	//

-

-	void executeDefineCommand(Profile profile, String version) {

-		PapyrusDefinitionAnnotation annotation = new PapyrusDefinitionAnnotation(Version.parseVersion(version), "", "", "", "");

-		DefineProfileCommand command = new DefineProfileCommand(modelSet.getEditingDomain(), annotation, profile, true);

-		modelSet.getEditingDomain().getCommandStack().execute(GMFtoEMFCommandWrapper.wrap(command));

-	}

-

-	static EAnnotation getUMLAnnotation(ENamedElement namedElement) {

-		EAnnotation result = null;

-

-		for (EAnnotation next : namedElement.getEAnnotations()) {

-			String source = next.getSource();

-			if ((source != null) && source.startsWith("http://www.eclipse.org/uml2/")) {

-				result = next;

-				break;

-			}

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.uml.diagram.profile.custom.commands.tests;
+
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.DefineProfileCommand;
+import org.eclipse.papyrus.uml.tools.profile.definition.PapyrusDefinitionAnnotation;
+import org.eclipse.papyrus.uml.tools.profile.definition.Version;
+import org.eclipse.uml2.uml.Profile;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test suite for the {@code DefineProfileCommand} class.
+ */
+public class DefineProfileCommandTest extends AbstractPapyrusTest {
+
+	@Rule
+	public final ModelSetFixture modelSet = new ModelSetFixture();
+
+	/**
+	 * Initializes me.
+	 */
+	public DefineProfileCommandTest() {
+		super();
+	}
+
+	@Test
+	@PluginResource("resource/profile_simple/simple.profile.di")
+	public void testDefineSimpleProfile() {
+		Profile rootProfile = (Profile) modelSet.getModel();
+
+		executeDefineCommand(rootProfile, "0.0.1");
+
+		EAnnotation annotation = getUMLAnnotation(rootProfile.getDefinition());
+		assertThat(annotation, nullValue()); // Don't need the annotation for a simple self-contained profile
+	}
+
+	@Test
+	@PluginResource("resource/profile_dependencies/datatypes.profile.di")
+	public void testDefineNestedProfileWithDependencies() {
+		Profile rootProfile = (Profile) modelSet.getModel();
+
+		executeDefineCommand(rootProfile, "0.0.1");
+
+		Profile profile1 = (Profile) rootProfile.getNestedPackage("Profile1");
+		Profile profile2 = (Profile) rootProfile.getNestedPackage("Profile2");
+
+		EAnnotation annotation = getUMLAnnotation(profile1.getDefinition());
+		assertThat(annotation, notNullValue());
+		assertThat(annotation.getReferences(), hasItem(profile2.getDefinition()));
+	}
+
+	//
+	// Test framework
+	//
+
+	void executeDefineCommand(Profile profile, String version) {
+		PapyrusDefinitionAnnotation annotation = new PapyrusDefinitionAnnotation(Version.parseVersion(version), "", "", "", "");
+		DefineProfileCommand command = new DefineProfileCommand(modelSet.getEditingDomain(), annotation, profile, true);
+		modelSet.getEditingDomain().getCommandStack().execute(GMFtoEMFCommandWrapper.wrap(command));
+	}
+
+	static EAnnotation getUMLAnnotation(ENamedElement namedElement) {
+		EAnnotation result = null;
+
+		for (EAnnotation next : namedElement.getEAnnotations()) {
+			String source = next.getSource();
+			if ((source != null) && source.startsWith("http://www.eclipse.org/uml2/")) {
+				result = next;
+				break;
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/Activator.java
index b08d188c732..289f7bdb474 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/Activator.java
@@ -1,30 +1,30 @@
-package org.eclipse.papyrus.uml.diagram.profile.tests;

-

-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;

-	}

-

-}

+package org.eclipse.papyrus.uml.diagram.profile.tests;
+
+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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/AllTests.java
index ecba0442871..69a93d2a42c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/AllTests.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * 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:

- *   Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation

- *   Christian W. Damus - bug 451613

- *   Christian W. Damus - bug 464647

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.profile.tests;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;

-import org.eclipse.papyrus.uml.diagram.profile.custom.commands.tests.AllCustomCommandTests;

-import org.eclipse.papyrus.uml.diagram.profile.tests.canonical.AllCanonicalTests;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		AllCustomCommandTests.class,

-		AllCanonicalTests.class,

-})

-@DynamicClasses("org.eclipse.papyrus.uml.diagram.profile.tests.AllGenTests")

-public class AllTests {

-	// Test suite

-}

+/*****************************************************************************
+ * 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:
+ *   Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation
+ *   Christian W. Damus - bug 451613
+ *   Christian W. Damus - bug 464647
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.profile.tests;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;
+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.tests.AllCustomCommandTests;
+import org.eclipse.papyrus.uml.diagram.profile.tests.canonical.AllCanonicalTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		AllCustomCommandTests.class,
+		AllCanonicalTests.class,
+})
+@DynamicClasses("org.eclipse.papyrus.uml.diagram.profile.tests.AllGenTests")
+public class AllTests {
+	// Test suite
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/IProfileDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/IProfileDiagramTestsConstants.java
index 3490d6e4eb0..dc66eaf4d2a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/IProfileDiagramTestsConstants.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/IProfileDiagramTestsConstants.java
@@ -1,25 +1,25 @@
-/*****************************************************************************

- * 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:

- *   Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation

- *   Christian W. Damus - bug 464647

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.profile.tests;

-

-

-/**

- * Repository of string constants used throughout the Profile Diagram tests.

- */

-public abstract interface IProfileDiagramTestsConstants {

-

-	public static final String PROJECT_NAME = "ProfileDiagramTestProject";

-

-	public static final String FILE_NAME = "ProfileDiagramTest.profile.di";

-}

+/*****************************************************************************
+ * 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:
+ *   Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation
+ *   Christian W. Damus - bug 464647
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.profile.tests;
+
+
+/**
+ * Repository of string constants used throughout the Profile Diagram tests.
+ */
+public abstract interface IProfileDiagramTestsConstants {
+
+	public static final String PROJECT_NAME = "ProfileDiagramTestProject";
+
+	public static final String FILE_NAME = "ProfileDiagramTest.profile.di";
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/AllCanonicalTests.java
index 642658f2e35..194cc360b8b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/AllCanonicalTests.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:

- * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.profile.tests.canonical;

-

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		TestProfileDiagramTopNode.class,

-		TestProfileDiagramChildNode.class,

-		TestProfileDiagramLink.class,

-		TestImportMetaClass.class,

-		TestProfileDiagramExtension.class,

-		TestProfileDiagramContextLink.class })

-public class AllCanonicalTests {

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.profile.tests.canonical;
+
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		TestProfileDiagramTopNode.class,
+		TestProfileDiagramChildNode.class,
+		TestProfileDiagramLink.class,
+		TestImportMetaClass.class,
+		TestProfileDiagramExtension.class,
+		TestProfileDiagramContextLink.class })
+public class AllCanonicalTests {
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/OSGI-INF/l10n/bundle.properties
index 50ca9a70d01..9df793f0760 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.uml.diagram.sequence.tests

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.uml.diagram.sequence.tests
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Tests for UML Sequence Diagram
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/build.properties
index 377f2809d02..6fc34290345 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/build.properties
@@ -1,10 +1,10 @@
-source.. = src/,\

-           test-gen/,\

-           xtend-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               OSGI-INF/,\

-               about.html,\

-               resource/

-src.includes = about.html

+source.. = src/,\
+           test-gen/,\
+           xtend-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about.html,\
+               resource/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.di
index 08128862c28..8c549eecdc6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.notation
@@ -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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.uml
index dbcbd1b8189..24278f4daea 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/model/model.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_wkERsC_lEeewedGDxk86iw" name="RootElement"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_wkERsC_lEeewedGDxk86iw" name="RootElement"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.uml
index 079088ead7c..269cbf3b6cd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.uml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_y0i7YGeuEeW_sJdBHKjxSg" name="RootElement">

-  <packagedElement xmi:type="uml:Interaction" xmi:id="_y4uQwGeuEeW_sJdBHKjxSg" name="Interaction1">

-    <lifeline xmi:type="uml:Lifeline" xmi:id="_FdIAEGevEeW_sJdBHKjxSg" name="Lifeline" coveredBy="_JaE90GevEeW_sJdBHKjxSg _JaGzAGevEeW_sJdBHKjxSg _JaGL8GevEeW_sJdBHKjxSg _LqPpoGevEeW_sJdBHKjxSg"/>

-    <lifeline xmi:type="uml:Lifeline" xmi:id="_F47LQGevEeW_sJdBHKjxSg" name="Lifeline0" coveredBy="_J8ixsGevEeW_sJdBHKjxSg _J8lN8GevEeW_sJdBHKjxSg _LqObgGevEeW_sJdBHKjxSg _MvidwGevEeW_sJdBHKjxSg"/>

-    <fragment xmi:type="uml:ExecutionOccurrenceSpecification" xmi:id="_J8ixsGevEeW_sJdBHKjxSg" name="BehaviorExecSpec0Start" covered="_F47LQGevEeW_sJdBHKjxSg" execution="_J8lN8GevEeW_sJdBHKjxSg"/>

-    <fragment xmi:type="uml:BehaviorExecutionSpecification" xmi:id="_J8lN8GevEeW_sJdBHKjxSg" name="BehaviorExecSpec0" covered="_F47LQGevEeW_sJdBHKjxSg" finish="_MvidwGevEeW_sJdBHKjxSg" start="_J8ixsGevEeW_sJdBHKjxSg"/>

-    <fragment xmi:type="uml:ExecutionOccurrenceSpecification" xmi:id="_JaE90GevEeW_sJdBHKjxSg" name="BehaviorExecSpecStart" covered="_FdIAEGevEeW_sJdBHKjxSg" execution="_JaGL8GevEeW_sJdBHKjxSg"/>

-    <fragment xmi:type="uml:BehaviorExecutionSpecification" xmi:id="_JaGL8GevEeW_sJdBHKjxSg" name="BehaviorExecSpec" covered="_FdIAEGevEeW_sJdBHKjxSg" finish="_JaGzAGevEeW_sJdBHKjxSg" start="_JaE90GevEeW_sJdBHKjxSg"/>

-    <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_LqObgGevEeW_sJdBHKjxSg" name="MessageSend" covered="_F47LQGevEeW_sJdBHKjxSg" message="_LqIU4GevEeW_sJdBHKjxSg"/>

-    <fragment xmi:type="uml:ExecutionOccurrenceSpecification" xmi:id="_MvidwGevEeW_sJdBHKjxSg" name="BehaviorExecSpec0Finish" covered="_F47LQGevEeW_sJdBHKjxSg" execution="_J8lN8GevEeW_sJdBHKjxSg"/>

-    <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_LqPpoGevEeW_sJdBHKjxSg" name="MessageRecv" covered="_FdIAEGevEeW_sJdBHKjxSg" message="_LqIU4GevEeW_sJdBHKjxSg"/>

-    <fragment xmi:type="uml:ExecutionOccurrenceSpecification" xmi:id="_JaGzAGevEeW_sJdBHKjxSg" name="BehaviorExecSpecFinish" covered="_FdIAEGevEeW_sJdBHKjxSg" execution="_JaGL8GevEeW_sJdBHKjxSg"/>

-    <message xmi:type="uml:Message" xmi:id="_LqIU4GevEeW_sJdBHKjxSg" name="Message" messageSort="reply" receiveEvent="_LqPpoGevEeW_sJdBHKjxSg" sendEvent="_LqObgGevEeW_sJdBHKjxSg"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_y0i7YGeuEeW_sJdBHKjxSg" name="RootElement">
+  <packagedElement xmi:type="uml:Interaction" xmi:id="_y4uQwGeuEeW_sJdBHKjxSg" name="Interaction1">
+    <lifeline xmi:type="uml:Lifeline" xmi:id="_FdIAEGevEeW_sJdBHKjxSg" name="Lifeline" coveredBy="_JaE90GevEeW_sJdBHKjxSg _JaGzAGevEeW_sJdBHKjxSg _JaGL8GevEeW_sJdBHKjxSg _LqPpoGevEeW_sJdBHKjxSg"/>
+    <lifeline xmi:type="uml:Lifeline" xmi:id="_F47LQGevEeW_sJdBHKjxSg" name="Lifeline0" coveredBy="_J8ixsGevEeW_sJdBHKjxSg _J8lN8GevEeW_sJdBHKjxSg _LqObgGevEeW_sJdBHKjxSg _MvidwGevEeW_sJdBHKjxSg"/>
+    <fragment xmi:type="uml:ExecutionOccurrenceSpecification" xmi:id="_J8ixsGevEeW_sJdBHKjxSg" name="BehaviorExecSpec0Start" covered="_F47LQGevEeW_sJdBHKjxSg" execution="_J8lN8GevEeW_sJdBHKjxSg"/>
+    <fragment xmi:type="uml:BehaviorExecutionSpecification" xmi:id="_J8lN8GevEeW_sJdBHKjxSg" name="BehaviorExecSpec0" covered="_F47LQGevEeW_sJdBHKjxSg" finish="_MvidwGevEeW_sJdBHKjxSg" start="_J8ixsGevEeW_sJdBHKjxSg"/>
+    <fragment xmi:type="uml:ExecutionOccurrenceSpecification" xmi:id="_JaE90GevEeW_sJdBHKjxSg" name="BehaviorExecSpecStart" covered="_FdIAEGevEeW_sJdBHKjxSg" execution="_JaGL8GevEeW_sJdBHKjxSg"/>
+    <fragment xmi:type="uml:BehaviorExecutionSpecification" xmi:id="_JaGL8GevEeW_sJdBHKjxSg" name="BehaviorExecSpec" covered="_FdIAEGevEeW_sJdBHKjxSg" finish="_JaGzAGevEeW_sJdBHKjxSg" start="_JaE90GevEeW_sJdBHKjxSg"/>
+    <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_LqObgGevEeW_sJdBHKjxSg" name="MessageSend" covered="_F47LQGevEeW_sJdBHKjxSg" message="_LqIU4GevEeW_sJdBHKjxSg"/>
+    <fragment xmi:type="uml:ExecutionOccurrenceSpecification" xmi:id="_MvidwGevEeW_sJdBHKjxSg" name="BehaviorExecSpec0Finish" covered="_F47LQGevEeW_sJdBHKjxSg" execution="_J8lN8GevEeW_sJdBHKjxSg"/>
+    <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_LqPpoGevEeW_sJdBHKjxSg" name="MessageRecv" covered="_FdIAEGevEeW_sJdBHKjxSg" message="_LqIU4GevEeW_sJdBHKjxSg"/>
+    <fragment xmi:type="uml:ExecutionOccurrenceSpecification" xmi:id="_JaGzAGevEeW_sJdBHKjxSg" name="BehaviorExecSpecFinish" covered="_FdIAEGevEeW_sJdBHKjxSg" execution="_JaGL8GevEeW_sJdBHKjxSg"/>
+    <message xmi:type="uml:Message" xmi:id="_LqIU4GevEeW_sJdBHKjxSg" name="Message" messageSort="reply" receiveEvent="_LqPpoGevEeW_sJdBHKjxSg" sendEvent="_LqObgGevEeW_sJdBHKjxSg"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF
index 893e3629335..7cf0519cd28 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.xtend.lib;bundle-version="2.8.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.statemachine.tests,

- org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical,

- org.eclipse.papyrus.uml.diagram.statemachine.tests.generation

-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.uml.diagram.statemachine.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.statemachine.tests,
+ org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical,
+ org.eclipse.papyrus.uml.diagram.statemachine.tests.generation
+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.uml.diagram.statemachine.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/build.properties
index 16e44b21f4d..7cd4624e2ae 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/build.properties
@@ -1,10 +1,10 @@
-source.. = src/,\

-           test-gen/,\

-           xtend-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               resources/

-src.includes = about.html

+source.. = src/,\
+           test-gen/,\
+           xtend-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               resources/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/org.eclipse.papyrus.uml.diagram.statemachine.test.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/org.eclipse.papyrus.uml.diagram.statemachine.test.launch
index bab8c60d50b..a9686a49e52 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/org.eclipse.papyrus.uml.diagram.statemachine.test.launch
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/org.eclipse.papyrus.uml.diagram.statemachine.test.launch
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">

-<listEntry value="=org.eclipse.papyrus.uml.diagram.component/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.component/custom-src"/>

-</listAttribute>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.statemachine.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.statemachine.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1024m  "/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">
+<listEntry value="=org.eclipse.papyrus.uml.diagram.component/src"/>
+<listEntry value="=org.eclipse.papyrus.uml.diagram.component/custom-src"/>
+</listAttribute>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.statemachine.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.statemachine.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1024m  "/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/Activator.java
index 71a67ed068d..2cbde573022 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/Activator.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.uml.diagram.statemachine.tests;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.statemachine.tests"; //$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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.statemachine.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.statemachine.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/AllTests.java
index 220cc13db69..4a86e142c57 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/AllTests.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Patrick Tessier (CEA LIST) - Initial API and implementation

- * Christian W. Damus - bug 464647

- * Christian W. Damus - bug 468207

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.statemachine.tests;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.tests.ZoneTest;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;

-import org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical.AllCanonicalTests;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		// canonical

-		AllCanonicalTests.class,

-		RoundedCompartmentTest.class,

-		// load

-		// LoadTests.class,

-ZoneTest.class,

-})

-@DynamicClasses("org.eclipse.papyrus.uml.diagram.statemachine.test.AllGenTests")

-public class AllTests {

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ * Christian W. Damus - bug 464647
+ * Christian W. Damus - bug 468207
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.statemachine.tests;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.tests.ZoneTest;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;
+import org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical.AllCanonicalTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All tests together.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		// canonical
+		AllCanonicalTests.class,
+		RoundedCompartmentTest.class,
+		// load
+		// LoadTests.class,
+ZoneTest.class,
+})
+@DynamicClasses("org.eclipse.papyrus.uml.diagram.statemachine.test.AllGenTests")
+public class AllTests {
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/IStateMachineDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/IStateMachineDiagramTestsConstants.java
index 239ec3dcb59..2b4789dc28d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/IStateMachineDiagramTestsConstants.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/IStateMachineDiagramTestsConstants.java
@@ -1,21 +1,21 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Patrick Tessier (CEA LIST) - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.statemachine.tests;

-

-public interface IStateMachineDiagramTestsConstants {

-

-	/** name of the test project */ 

-	public final String PROJECT_NAME = "StateMachineDiagramTestProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "StateMachineDiagramTest.di";

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.statemachine.tests;
+
+public interface IStateMachineDiagramTestsConstants {
+
+	/** name of the test project */ 
+	public final String PROJECT_NAME = "StateMachineDiagramTestProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "StateMachineDiagramTest.di";
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/RoundedCompartmentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/RoundedCompartmentTest.java
index f442a3cfe45..dfabcf08209 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/RoundedCompartmentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/RoundedCompartmentTest.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * 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

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.statemachine.tests;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;

-

-/**

- * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.

- */

-public class RoundedCompartmentTest extends AbstractGenericShapeTest {

-

-	/**

-	 * Gets the rounded compartment edit parts.

-	 *

-	 * @return the rounded compartment edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()

-	 */

-	public List<Class<?>> getRoundedCompartmentEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-

-		classes.add(FinalStateEditPart.class);

-		classes.add(PseudostateChoiceEditPart.class);

-		classes.add(PseudostateDeepHistoryEditPart.class);

-		classes.add(PseudostateForkEditPart.class);

-		classes.add(PseudostateInitialEditPart.class);

-		classes.add(PseudostateJoinEditPart.class);

-		classes.add(PseudostateJunctionEditPart.class);

-		classes.add(PseudostateShallowHistoryEditPart.class);

-		classes.add(PseudostateTerminateEditPart.class);

-		classes.add(StateEditPart.class);

-		classes.add(StateMachineEditPart.class);

-

-		return classes;

-	}

-

-	/**

-	 * Gets the rounded border named element edit parts.

-	 *

-	 * @return the rounded border named element edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()

-	 */

-	public List<Class<?>> getRoundedBorderNamedElementEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-

-		classes.add(ConnectionPointReferenceEditPart.class);

-		classes.add(PseudostateEntryPointEditPart.class);

-		classes.add(PseudostateExitPointEditPart.class);

-

-		return classes;

-	}

-}

+/*****************************************************************************
+ * 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
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.statemachine.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;
+
+/**
+ * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.
+ */
+public class RoundedCompartmentTest extends AbstractGenericShapeTest {
+
+	/**
+	 * Gets the rounded compartment edit parts.
+	 *
+	 * @return the rounded compartment edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()
+	 */
+	public List<Class<?>> getRoundedCompartmentEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+
+		classes.add(FinalStateEditPart.class);
+		classes.add(PseudostateChoiceEditPart.class);
+		classes.add(PseudostateDeepHistoryEditPart.class);
+		classes.add(PseudostateForkEditPart.class);
+		classes.add(PseudostateInitialEditPart.class);
+		classes.add(PseudostateJoinEditPart.class);
+		classes.add(PseudostateJunctionEditPart.class);
+		classes.add(PseudostateShallowHistoryEditPart.class);
+		classes.add(PseudostateTerminateEditPart.class);
+		classes.add(StateEditPart.class);
+		classes.add(StateMachineEditPart.class);
+
+		return classes;
+	}
+
+	/**
+	 * Gets the rounded border named element edit parts.
+	 *
+	 * @return the rounded border named element edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()
+	 */
+	public List<Class<?>> getRoundedBorderNamedElementEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+
+		classes.add(ConnectionPointReferenceEditPart.class);
+		classes.add(PseudostateEntryPointEditPart.class);
+		classes.add(PseudostateExitPointEditPart.class);
+
+		return classes;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/StateMachineUtil.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/StateMachineUtil.java
index 40a5001c13d..892576c0834 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/StateMachineUtil.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/StateMachineUtil.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.uml.diagram.statemachine.tests;

-

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;

-import org.junit.Assert;

-

-/**

- * State machine diagram util class

- */

-public class StateMachineUtil {

-

-	/**

-	 * find region compartment edit part

-	 */

-	public static IGraphicalEditPart getRegionCompartmentEditPart(IGraphicalEditPart root) {

-		IGraphicalEditPart sm = findChildBySemanticHint(root, StateMachineEditPart.VISUAL_ID);

-		IGraphicalEditPart smCompartment = findChildBySemanticHint(sm, StateMachineCompartmentEditPart.VISUAL_ID);

-		IGraphicalEditPart region = findChildBySemanticHint(smCompartment, RegionEditPart.VISUAL_ID);

-		return findChildBySemanticHint(region, RegionCompartmentEditPart.VISUAL_ID);

-	}

-

-	public static IGraphicalEditPart findChildBySemanticHint(IGraphicalEditPart parent, String vid) {

-		IGraphicalEditPart childEP = parent.getChildBySemanticHint(vid);

-		Assert.assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);

-		return childEP;

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.statemachine.tests;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.junit.Assert;
+
+/**
+ * State machine diagram util class
+ */
+public class StateMachineUtil {
+
+	/**
+	 * find region compartment edit part
+	 */
+	public static IGraphicalEditPart getRegionCompartmentEditPart(IGraphicalEditPart root) {
+		IGraphicalEditPart sm = findChildBySemanticHint(root, StateMachineEditPart.VISUAL_ID);
+		IGraphicalEditPart smCompartment = findChildBySemanticHint(sm, StateMachineCompartmentEditPart.VISUAL_ID);
+		IGraphicalEditPart region = findChildBySemanticHint(smCompartment, RegionEditPart.VISUAL_ID);
+		return findChildBySemanticHint(region, RegionCompartmentEditPart.VISUAL_ID);
+	}
+
+	public static IGraphicalEditPart findChildBySemanticHint(IGraphicalEditPart parent, String vid) {
+		IGraphicalEditPart childEP = parent.getChildBySemanticHint(vid);
+		Assert.assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);
+		return childEP;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AbstractSMTestChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AbstractSMTestChildNode.java
index fd1dcde64d8..c18f54aa3c5 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AbstractSMTestChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AbstractSMTestChildNode.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:

- * Patrick Tessier (CEA LIST) - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNotSame;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomRegionCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomRegionEditPart;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;

-import org.junit.Before;

-

-

-

-public abstract class AbstractSMTestChildNode extends TestChildNode {

-

-	/**

-	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()

-	 *

-	 * @throws Exception

-	 */

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		CreateViewRequest requestcreation = createViewRequestShapeContainer();

-		if(requestcreation != null) {

-			requestcreation.setSize(new Dimension(500, 500));

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-			assertNotSame(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, UnexecutableCommand.INSTANCE, command);

-			assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-			executeOnUIThread(command);

-		}

-		assertEquals(CREATION + INITIALIZATION_TEST, 1, getDiagramEditPart().getChildren().size());

-		GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-		rootCompartment = null;

-

-		//compartment of statemachine

-		int index = 0;

-		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {

-			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {

-				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-

-		//compartment of CustomRegionEditPart

-		index = 0;

-		containerEditPart=rootCompartment;

-		rootCompartment=null;

-		CustomRegionEditPart regionEditPart=null;

-		while(regionEditPart == null && index < containerEditPart.getChildren().size()) {

-			if((containerEditPart.getChildren().get(index)) instanceof CustomRegionEditPart) {

-				regionEditPart = (CustomRegionEditPart)(containerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-		//compartment of CustomRegionEditPart

-		index = 0;

-		containerEditPart=regionEditPart;

-		rootCompartment=null;

-		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {

-			if((containerEditPart.getChildren().get(index)) instanceof CustomRegionCompartmentEditPart) {

-				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-		assertNotNull("There should be at least one container for the node tests", rootCompartment);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomRegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomRegionEditPart;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestChildNode;
+import org.junit.Before;
+
+
+
+public abstract class AbstractSMTestChildNode extends TestChildNode {
+
+	/**
+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()
+	 *
+	 * @throws Exception
+	 */
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		CreateViewRequest requestcreation = createViewRequestShapeContainer();
+		if(requestcreation != null) {
+			requestcreation.setSize(new Dimension(500, 500));
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+			assertNotSame(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, UnexecutableCommand.INSTANCE, command);
+			assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+			executeOnUIThread(command);
+		}
+		assertEquals(CREATION + INITIALIZATION_TEST, 1, getDiagramEditPart().getChildren().size());
+		GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
+		rootCompartment = null;
+
+		//compartment of statemachine
+		int index = 0;
+		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {
+			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
+				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+
+		//compartment of CustomRegionEditPart
+		index = 0;
+		containerEditPart=rootCompartment;
+		rootCompartment=null;
+		CustomRegionEditPart regionEditPart=null;
+		while(regionEditPart == null && index < containerEditPart.getChildren().size()) {
+			if((containerEditPart.getChildren().get(index)) instanceof CustomRegionEditPart) {
+				regionEditPart = (CustomRegionEditPart)(containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+		//compartment of CustomRegionEditPart
+		index = 0;
+		containerEditPart=regionEditPart;
+		rootCompartment=null;
+		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {
+			if((containerEditPart.getChildren().get(index)) instanceof CustomRegionCompartmentEditPart) {
+				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+		assertNotNull("There should be at least one container for the node tests", rootCompartment);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AllCanonicalTests.java
index fa58f334791..ef0de1fbd4a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AllCanonicalTests.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:

- * Patrick Tessier (CEA LIST) - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-

-/**

- * All test in canonical package

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-// child nodes

-TestStateMachineDiagramChildNode.class,

-//test links

-//TestStateMachineDiagramLink.class,

-TestLinks.class,

-TestTransitionLinks.class,

-TestSemantic.class,

-TestStateMachineNode.class,

-TestStateMachineContextLink.class

- })

-public class AllCanonicalTests {

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * All test in canonical package
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+// child nodes
+TestStateMachineDiagramChildNode.class,
+//test links
+//TestStateMachineDiagramLink.class,
+TestLinks.class,
+TestTransitionLinks.class,
+TestSemantic.class,
+TestStateMachineNode.class,
+TestStateMachineContextLink.class
+ })
+public class AllCanonicalTests {
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramChildNode.java
index 6fa8eb840c5..20582d3c4ee 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramChildNode.java
@@ -1,161 +1,161 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Patrick Tessier (CEA LIST) - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.junit.framework.classification.InvalidTest;

-import org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.statemachine.tests.IStateMachineDiagramTestsConstants;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Test;

-

-

-/**

- * The Class TestClassDiagramChildNode.

- */

-public class TestStateMachineDiagramChildNode extends AbstractSMTestChildNode {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected CreateViewRequest createViewRequestShapeContainer() {

-		return null;}

-

-	@Override

-	public boolean isTestAffixedNode() {

-		return true;

-	}

-	@Override

-	protected String getProjectName() {

-		return IStateMachineDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IStateMachineDiagramTestsConstants.FILE_NAME;

-	}

-

-	

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected boolean isSemanticTest() {

-		return true;

-	}

-

-	

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateStateMachineDiagramCommand();

-	}

-	/**

-	* Test to manage Region.

-	*/

-	@Test

-	@InvalidTest

-	public void testToRegion() {

-		testToManageNode(UMLElementTypes.Region_Shape, UMLPackage.eINSTANCE.getRegion(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage FinalState.

-	*/

-	@Test

-	public void testToFinalState() {

-		testToManageNode(UMLElementTypes.FinalState_Shape, UMLPackage.eINSTANCE.getFinalState(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage State.

-	*/

-	@Test

-	public void testToState() {

-		testToManageNode(UMLElementTypes.State_Shape, UMLPackage.eINSTANCE.getState(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Pseudostate.

-	*/

-	@Test

-	public void testToPseudostate8000() {

-		testToManageNode(UMLElementTypes.Pseudostate_InitialShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Pseudostate.

-	*/

-	@Test

-	public void testToPseudostate9000() {

-		testToManageNode(UMLElementTypes.Pseudostate_JoinShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Pseudostate.

-	*/

-	@Test

-	public void testToPseudostate10000() {

-		testToManageNode(UMLElementTypes.Pseudostate_ForkShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Pseudostate.

-	*/

-	@Test

-	public void testToPseudostate1100() {

-		testToManageNode(UMLElementTypes.Pseudostate_ChoiceShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Pseudostate.

-	*/

-	@Test

-	public void testToPseudostate12000() {

-		testToManageNode(UMLElementTypes.Pseudostate_JunctionShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Pseudostate.

-	*/

-	@Test

-	public void testToPseudostate13000() {

-		testToManageNode(UMLElementTypes.Pseudostate_ShallowHistoryShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Pseudostate.

-	*/

-	@Test

-	public void testToPseudostate14000() {

-		testToManageNode(UMLElementTypes.Pseudostate_DeepHistoryShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Pseudostate.

-	*/

-	@Test

-	public void testToPseudostate15000() {

-		testToManageNode(UMLElementTypes.Pseudostate_TerminateShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Comment.

-	*/

-	@Test

-	@InvalidTest

-	public void testToComment() {

-		testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Region_Shape, false);

-	}

-	/**

-	* Test to manage Constraint.

-	*/

-	@Test

-	@InvalidTest

-	public void testToConstraint() {

-		testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Region_Shape, false);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.InvalidTest;
+import org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.tests.IStateMachineDiagramTestsConstants;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Test;
+
+
+/**
+ * The Class TestClassDiagramChildNode.
+ */
+public class TestStateMachineDiagramChildNode extends AbstractSMTestChildNode {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected CreateViewRequest createViewRequestShapeContainer() {
+		return null;}
+
+	@Override
+	public boolean isTestAffixedNode() {
+		return true;
+	}
+	@Override
+	protected String getProjectName() {
+		return IStateMachineDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IStateMachineDiagramTestsConstants.FILE_NAME;
+	}
+
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean isSemanticTest() {
+		return true;
+	}
+
+	
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateStateMachineDiagramCommand();
+	}
+	/**
+	* Test to manage Region.
+	*/
+	@Test
+	@InvalidTest
+	public void testToRegion() {
+		testToManageNode(UMLElementTypes.Region_Shape, UMLPackage.eINSTANCE.getRegion(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage FinalState.
+	*/
+	@Test
+	public void testToFinalState() {
+		testToManageNode(UMLElementTypes.FinalState_Shape, UMLPackage.eINSTANCE.getFinalState(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage State.
+	*/
+	@Test
+	public void testToState() {
+		testToManageNode(UMLElementTypes.State_Shape, UMLPackage.eINSTANCE.getState(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Pseudostate.
+	*/
+	@Test
+	public void testToPseudostate8000() {
+		testToManageNode(UMLElementTypes.Pseudostate_InitialShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Pseudostate.
+	*/
+	@Test
+	public void testToPseudostate9000() {
+		testToManageNode(UMLElementTypes.Pseudostate_JoinShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Pseudostate.
+	*/
+	@Test
+	public void testToPseudostate10000() {
+		testToManageNode(UMLElementTypes.Pseudostate_ForkShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Pseudostate.
+	*/
+	@Test
+	public void testToPseudostate1100() {
+		testToManageNode(UMLElementTypes.Pseudostate_ChoiceShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Pseudostate.
+	*/
+	@Test
+	public void testToPseudostate12000() {
+		testToManageNode(UMLElementTypes.Pseudostate_JunctionShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Pseudostate.
+	*/
+	@Test
+	public void testToPseudostate13000() {
+		testToManageNode(UMLElementTypes.Pseudostate_ShallowHistoryShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Pseudostate.
+	*/
+	@Test
+	public void testToPseudostate14000() {
+		testToManageNode(UMLElementTypes.Pseudostate_DeepHistoryShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Pseudostate.
+	*/
+	@Test
+	public void testToPseudostate15000() {
+		testToManageNode(UMLElementTypes.Pseudostate_TerminateShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Comment.
+	*/
+	@Test
+	@InvalidTest
+	public void testToComment() {
+		testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Region_Shape, false);
+	}
+	/**
+	* Test to manage Constraint.
+	*/
+	@Test
+	@InvalidTest
+	public void testToConstraint() {
+		testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Region_Shape, false);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramLink.java
index 605eba9f48c..5c652cde8fd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramLink.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:

- * Patrick Tessier (CEA LIST) - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.statemachine.tests.IStateMachineDiagramTestsConstants;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;

-

-

-/**

- * The Class TestClassDiagramLink use to test link that are contained by the owner of the target and the source

- */

-public class TestStateMachineDiagramLink extends TestLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return UMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateStateMachineDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IStateMachineDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IStateMachineDiagramTestsConstants.FILE_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:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.tests.IStateMachineDiagramTestsConstants;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;
+
+
+/**
+ * The Class TestClassDiagramLink use to test link that are contained by the owner of the target and the source
+ */
+public class TestStateMachineDiagramLink extends TestLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateStateMachineDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IStateMachineDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IStateMachineDiagramTestsConstants.FILE_NAME;
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineNode.java
index ad55c841301..fb7dd0f62a6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineNode.java
@@ -1,136 +1,136 @@
-/*****************************************************************************

- * 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.uml.diagram.statemachine.tests.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-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.Rectangle;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.notation.Bounds;

-import org.eclipse.gmf.runtime.notation.LayoutConstraint;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;

-import org.junit.Test;

-

-/**

- * TestStateMachineNode class

- */

-public class TestStateMachineNode extends BaseTestCase {

-

-	private static final String STATE_MACHINE_RESIZE = "State machine Resize: ";

-

-	@Test

-	public void testStateMachineResizeWidth() {

-		IGraphicalEditPart sm = findChildBySemanticHint(getDiagramEditPart(), StateMachineEditPart.VISUAL_ID);

-		resizeEast(sm, new Dimension(100, 0));

-		resizeEast(sm, new Dimension(-20, 0));

-	}

-

-	@Test

-	public void testStateMachineResizeHeight() {

-		IGraphicalEditPart sm = findChildBySemanticHint(getDiagramEditPart(), StateMachineEditPart.VISUAL_ID);

-		resizeSouth(sm, new Dimension(50, 0));

-		resizeSouth(sm, new Dimension(-20, 0));

-	}

-

-	protected Point getRight(IGraphicalEditPart ep) {

-		IFigure f = ep.getFigure();

-		Rectangle b = f.getBounds().getCopy();

-		f.translateToAbsolute(b);

-		return b.getRight();

-	}

-

-	protected Point getBottom(IGraphicalEditPart ep) {

-		IFigure f = ep.getFigure();

-		Rectangle b = f.getBounds().getCopy();

-		f.translateToAbsolute(b);

-		return b.getBottom();

-	}

-

-	protected void resizeEast(IGraphicalEditPart editPart, Dimension deltaSize) {

-		resize(editPart, deltaSize, getRight(editPart), PositionConstants.EAST);

-	}

-

-	protected void resizeSouth(IGraphicalEditPart editPart, Dimension deltaSize) {

-		resize(editPart, deltaSize, getBottom(editPart), PositionConstants.SOUTH);

-	}

-

-	protected void resize(IGraphicalEditPart editPart, Dimension deltaSize, Point p, int direction) {

-		ChangeBoundsRequest req = new ChangeBoundsRequest(RequestConstants.REQ_RESIZE);

-		req.setLocation(p);

-		req.setEditParts(editPart);

-		req.setResizeDirection(direction);

-		req.setSizeDelta(deltaSize);

-		Command c = editPart.getCommand(req);

-		manageResizeCommnad(editPart, deltaSize, c);

-	}

-

-	private void manageResizeCommnad(IGraphicalEditPart ep, Dimension deltaSize, Command c) {

-		assertNotNull(STATE_MACHINE_RESIZE + COMMAND_NULL, c);

-		assertTrue(STATE_MACHINE_RESIZE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, c.canExecute());

-		Rectangle before = getAbsoluteBounds(ep);

-		getCommandStack().execute(new GEFtoEMFCommandWrapper(c));

-		Rectangle after = getAbsoluteBounds(ep);

-		assertTrue(STATE_MACHINE_RESIZE + TEST_THE_EXECUTION, after.width() - before.width() == deltaSize.width());

-		assertTrue(STATE_MACHINE_RESIZE + TEST_THE_EXECUTION, after.height() - before.height() == deltaSize.height());

-		getCommandStack().undo();

-		assertTrue(STATE_MACHINE_RESIZE + TEST_THE_UNDO, before.equals(getAbsoluteBounds(ep)));

-		getCommandStack().redo();

-		assertTrue(STATE_MACHINE_RESIZE + TEST_THE_REDO, after.equals(getAbsoluteBounds(ep)));

-	}

-

-	/**

-	 * Get the bounds of an edit part

-	 *

-	 * @param part

-	 *            edit part to find bounds

-	 * @return part's bounds in absolute coordinates

-	 */

-	private Rectangle getAbsoluteBounds(IGraphicalEditPart part) {

-		// take bounds from figure

-		Rectangle bounds = part.getFigure().getBounds().getCopy();

-		if (part.getNotationView() instanceof Node) {

-			// rather update with up to date model bounds

-			Node node = (Node) part.getNotationView();

-			LayoutConstraint cst = node.getLayoutConstraint();

-			if (cst instanceof Bounds) {

-				Bounds b = (Bounds) cst;

-				Point parentLoc = part.getFigure().getParent().getBounds().getLocation();

-				if (b.getX() > 0) {

-					bounds.x = b.getX() + parentLoc.x;

-				}

-				if (b.getY() > 0) {

-					bounds.y = b.getY() + parentLoc.y;

-				}

-				if (b.getHeight() != -1) {

-					bounds.height = b.getHeight();

-				}

-				if (b.getWidth() != -1) {

-					bounds.width = b.getWidth();

-				}

-			}

-		}

-		part.getFigure().getParent().translateToAbsolute(bounds);

-		return bounds;

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.statemachine.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+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.Rectangle;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.LayoutConstraint;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.junit.Test;
+
+/**
+ * TestStateMachineNode class
+ */
+public class TestStateMachineNode extends BaseTestCase {
+
+	private static final String STATE_MACHINE_RESIZE = "State machine Resize: ";
+
+	@Test
+	public void testStateMachineResizeWidth() {
+		IGraphicalEditPart sm = findChildBySemanticHint(getDiagramEditPart(), StateMachineEditPart.VISUAL_ID);
+		resizeEast(sm, new Dimension(100, 0));
+		resizeEast(sm, new Dimension(-20, 0));
+	}
+
+	@Test
+	public void testStateMachineResizeHeight() {
+		IGraphicalEditPart sm = findChildBySemanticHint(getDiagramEditPart(), StateMachineEditPart.VISUAL_ID);
+		resizeSouth(sm, new Dimension(50, 0));
+		resizeSouth(sm, new Dimension(-20, 0));
+	}
+
+	protected Point getRight(IGraphicalEditPart ep) {
+		IFigure f = ep.getFigure();
+		Rectangle b = f.getBounds().getCopy();
+		f.translateToAbsolute(b);
+		return b.getRight();
+	}
+
+	protected Point getBottom(IGraphicalEditPart ep) {
+		IFigure f = ep.getFigure();
+		Rectangle b = f.getBounds().getCopy();
+		f.translateToAbsolute(b);
+		return b.getBottom();
+	}
+
+	protected void resizeEast(IGraphicalEditPart editPart, Dimension deltaSize) {
+		resize(editPart, deltaSize, getRight(editPart), PositionConstants.EAST);
+	}
+
+	protected void resizeSouth(IGraphicalEditPart editPart, Dimension deltaSize) {
+		resize(editPart, deltaSize, getBottom(editPart), PositionConstants.SOUTH);
+	}
+
+	protected void resize(IGraphicalEditPart editPart, Dimension deltaSize, Point p, int direction) {
+		ChangeBoundsRequest req = new ChangeBoundsRequest(RequestConstants.REQ_RESIZE);
+		req.setLocation(p);
+		req.setEditParts(editPart);
+		req.setResizeDirection(direction);
+		req.setSizeDelta(deltaSize);
+		Command c = editPart.getCommand(req);
+		manageResizeCommnad(editPart, deltaSize, c);
+	}
+
+	private void manageResizeCommnad(IGraphicalEditPart ep, Dimension deltaSize, Command c) {
+		assertNotNull(STATE_MACHINE_RESIZE + COMMAND_NULL, c);
+		assertTrue(STATE_MACHINE_RESIZE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, c.canExecute());
+		Rectangle before = getAbsoluteBounds(ep);
+		getCommandStack().execute(new GEFtoEMFCommandWrapper(c));
+		Rectangle after = getAbsoluteBounds(ep);
+		assertTrue(STATE_MACHINE_RESIZE + TEST_THE_EXECUTION, after.width() - before.width() == deltaSize.width());
+		assertTrue(STATE_MACHINE_RESIZE + TEST_THE_EXECUTION, after.height() - before.height() == deltaSize.height());
+		getCommandStack().undo();
+		assertTrue(STATE_MACHINE_RESIZE + TEST_THE_UNDO, before.equals(getAbsoluteBounds(ep)));
+		getCommandStack().redo();
+		assertTrue(STATE_MACHINE_RESIZE + TEST_THE_REDO, after.equals(getAbsoluteBounds(ep)));
+	}
+
+	/**
+	 * Get the bounds of an edit part
+	 *
+	 * @param part
+	 *            edit part to find bounds
+	 * @return part's bounds in absolute coordinates
+	 */
+	private Rectangle getAbsoluteBounds(IGraphicalEditPart part) {
+		// take bounds from figure
+		Rectangle bounds = part.getFigure().getBounds().getCopy();
+		if (part.getNotationView() instanceof Node) {
+			// rather update with up to date model bounds
+			Node node = (Node) part.getNotationView();
+			LayoutConstraint cst = node.getLayoutConstraint();
+			if (cst instanceof Bounds) {
+				Bounds b = (Bounds) cst;
+				Point parentLoc = part.getFigure().getParent().getBounds().getLocation();
+				if (b.getX() > 0) {
+					bounds.x = b.getX() + parentLoc.x;
+				}
+				if (b.getY() > 0) {
+					bounds.y = b.getY() + parentLoc.y;
+				}
+				if (b.getHeight() != -1) {
+					bounds.height = b.getHeight();
+				}
+				if (b.getWidth() != -1) {
+					bounds.width = b.getWidth();
+				}
+			}
+		}
+		part.getFigure().getParent().translateToAbsolute(bounds);
+		return bounds;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.classpath
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.project b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.project
index c55d52ee379..feee71f01e4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.project
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
index b0a92b96582..8e193d1e124 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
@@ -1,35 +1,35 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.stereotypeproperty

-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.uml.diagram.stereotypeproperty.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.stereotypeproperty
+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.uml.diagram.stereotypeproperty.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/build.properties
index 3036be7431a..69edbf9c1ed 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               plugin.properties,\

-               resource/,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               resource/,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/org.eclipse.papyrus.diagram.stereotypeproperty.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/org.eclipse.papyrus.diagram.stereotypeproperty.tests.launch
index 7ff98d28a39..8fb8575e193 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/org.eclipse.papyrus.diagram.stereotypeproperty.tests.launch
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/org.eclipse.papyrus.diagram.stereotypeproperty.tests.launch
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<listAttribute key="StepOutExcludePkgsOrClasses"/>

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.stereotypeproperty.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx4086m"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<listAttribute key="StepOutExcludePkgsOrClasses"/>
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.stereotypeproperty.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx4086m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/plugin.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/plugin.xml
index 201bd272681..54d1b13b3e9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/plugin.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/plugin.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-  <extension

-         point="org.eclipse.emf.ecore.uri_mapping">

- 

-      <mapping

-            source="pathmap://Test_PROFILES/"

-            target="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/">

-      </mapping>

-   </extension>

-   

-   <extension

-         point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">

-      <profile

-            description="Test profile use to test papyrus"

-            name="StereotypePropertyTestProfile"

-            path="pathmap://Test_PROFILES/testProfile.profile.uml"

-            provider="Eclipse.org">

-      </profile>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+  <extension
+         point="org.eclipse.emf.ecore.uri_mapping">
+ 
+      <mapping
+            source="pathmap://Test_PROFILES/"
+            target="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/">
+      </mapping>
+   </extension>
+   
+   <extension
+         point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">
+      <profile
+            description="Test profile use to test papyrus"
+            name="StereotypePropertyTestProfile"
+            path="pathmap://Test_PROFILES/testProfile.profile.uml"
+            provider="Eclipse.org">
+      </profile>
+   </extension>
+</plugin>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.di
index d2249df8442..c5081f34d04 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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="BadUnapplyProfile.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="BadUnapplyProfile.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<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="BadUnapplyProfile.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="BadUnapplyProfile.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.notation
index 69e04510010..fdb84d1b1ad 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.notation
@@ -1,156 +1,156 @@
-<?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" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="2008">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J-WCoBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgBwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgRwgEeKYb8ts8yUAsw" key="StereotypeList" value="testProfile::Stereotype1"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZghwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testInt,testProfile::Stereotype1.testMultiString,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgxwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZhBwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Comment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5gkBwgEeKYb8ts8yUAsw" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVWMgBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVWMgRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5glRwgEeKYb8ts8yUAsw" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVWMghwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVWMgxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5gmhwgEeKYb8ts8yUAsw" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVf9gBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVf9gRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>

-    </children>

-    <element xmi:type="uml:Class" href="BadUnapplyProfile.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4YxwgEeKYb8ts8yUAsw" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4chwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4cxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4aBwgEeKYb8ts8yUAsw" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4dBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4dRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4bRwgEeKYb8ts8yUAsw" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4dhwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4dxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <element xmi:type="uml:Class" href="BadUnapplyProfile.uml#_EmOucBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="225" y="325"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="2012" fontName="Sylfaen">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="5038"/>

-    <element xmi:type="uml:Comment" href="BadUnapplyProfile.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="225" y="20" width="271" height="51"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_qx28ABwgEeKYb8ts8yUAsw" type="AppliedStereotypesComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zxUxYBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxaxwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbBwgEeKYb8ts8yUAsw" key="StereotypeList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbRwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbhwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testInt,testProfile::Stereotype1.testMultiString,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbxwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_qx28ARwgEeKYb8ts8yUAsw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qx28AxwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="BadUnapplyProfile.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_1fQ54BwgEeKYb8ts8yUAsw" type="AppliedStereotypesComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3xgpUBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpWxwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXBwgEeKYb8ts8yUAsw" key="StereotypeList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXRwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXhwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXxwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_1fQ54RwgEeKYb8ts8yUAsw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1fQ54xwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="BadUnapplyProfile.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="415" y="250"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>

-  <element xmi:type="uml:Model" href="BadUnapplyProfile.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>

-  <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="4008" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K93l8BwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcBwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcRwgEeKYb8ts8yUAsw" key="StereotypeList" value="testProfile::Stereotype1"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCchwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcxwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCdBwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Comment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="6026">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="6027">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>

-    <element xmi:type="uml:Dependency" href="BadUnapplyProfile.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.51,0.1)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(0.5333333333333333,0.8)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_qyAF8BwgEeKYb8ts8yUAsw" type="AppliedStereotypesCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_qx28ABwgEeKYb8ts8yUAsw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_qyAF8RwgEeKYb8ts8yUAsw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qyAF9RwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="BadUnapplyProfile.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qyAF8hwgEeKYb8ts8yUAsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyAF8xwgEeKYb8ts8yUAsw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyAF9BwgEeKYb8ts8yUAsw"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_1fQ55BwgEeKYb8ts8yUAsw" type="AppliedStereotypesCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_1fQ54BwgEeKYb8ts8yUAsw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_1fQ55RwgEeKYb8ts8yUAsw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1fQ56RwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="BadUnapplyProfile.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1fQ55hwgEeKYb8ts8yUAsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1fQ55xwgEeKYb8ts8yUAsw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1fQ56BwgEeKYb8ts8yUAsw"/>

-  </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" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="2008">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J-WCoBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgBwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgRwgEeKYb8ts8yUAsw" key="StereotypeList" value="testProfile::Stereotype1"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZghwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testInt,testProfile::Stereotype1.testMultiString,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgxwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZhBwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Comment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5gkBwgEeKYb8ts8yUAsw" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVWMgBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVWMgRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5glRwgEeKYb8ts8yUAsw" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVWMghwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVWMgxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5gmhwgEeKYb8ts8yUAsw" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVf9gBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVf9gRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>
+    </children>
+    <element xmi:type="uml:Class" href="BadUnapplyProfile.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4YxwgEeKYb8ts8yUAsw" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4chwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4cxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4aBwgEeKYb8ts8yUAsw" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4dBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4dRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4bRwgEeKYb8ts8yUAsw" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4dhwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4dxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <element xmi:type="uml:Class" href="BadUnapplyProfile.uml#_EmOucBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="225" y="325"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="2012" fontName="Sylfaen">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="5038"/>
+    <element xmi:type="uml:Comment" href="BadUnapplyProfile.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="225" y="20" width="271" height="51"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_qx28ABwgEeKYb8ts8yUAsw" type="AppliedStereotypesComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zxUxYBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxaxwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbBwgEeKYb8ts8yUAsw" key="StereotypeList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbRwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbhwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testInt,testProfile::Stereotype1.testMultiString,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbxwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_qx28ARwgEeKYb8ts8yUAsw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qx28AxwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="BadUnapplyProfile.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_1fQ54BwgEeKYb8ts8yUAsw" type="AppliedStereotypesComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3xgpUBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpWxwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXBwgEeKYb8ts8yUAsw" key="StereotypeList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXRwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXhwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXxwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_1fQ54RwgEeKYb8ts8yUAsw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1fQ54xwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="BadUnapplyProfile.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="415" y="250"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>
+  <element xmi:type="uml:Model" href="BadUnapplyProfile.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>
+  <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="4008" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K93l8BwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcBwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcRwgEeKYb8ts8yUAsw" key="StereotypeList" value="testProfile::Stereotype1"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCchwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcxwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCdBwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Comment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="6026">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="6027">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>
+    <element xmi:type="uml:Dependency" href="BadUnapplyProfile.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.51,0.1)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(0.5333333333333333,0.8)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_qyAF8BwgEeKYb8ts8yUAsw" type="AppliedStereotypesCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_qx28ABwgEeKYb8ts8yUAsw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_qyAF8RwgEeKYb8ts8yUAsw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qyAF9RwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="BadUnapplyProfile.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qyAF8hwgEeKYb8ts8yUAsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyAF8xwgEeKYb8ts8yUAsw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyAF9BwgEeKYb8ts8yUAsw"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_1fQ55BwgEeKYb8ts8yUAsw" type="AppliedStereotypesCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_1fQ54BwgEeKYb8ts8yUAsw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_1fQ55RwgEeKYb8ts8yUAsw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1fQ56RwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="BadUnapplyProfile.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1fQ55hwgEeKYb8ts8yUAsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1fQ55xwgEeKYb8ts8yUAsw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1fQ56BwgEeKYb8ts8yUAsw"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.uml
index 4e8821c8712..68b435413bc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/BadUnapplyProfile.uml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">

-  <ownedComment xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">

-    <body>The profile has been unapplied with the UML editor. The comments have to disappear.</body>

-  </ownedComment>

-  <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" clientDependency="_FcrOQBwgEeKYb8ts8yUAsw" name="Class1"/>

-  <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">
+  <ownedComment xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">
+    <body>The profile has been unapplied with the UML editor. The comments have to disappear.</body>
+  </ownedComment>
+  <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" clientDependency="_FcrOQBwgEeKYb8ts8yUAsw" name="Class1"/>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.di
index 82589e470a2..553a054c1a4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ReopenFileBrace.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ReopenFileBrace.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-        </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="ReopenFileBrace.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="ReopenFileBrace.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.notation
index f30d3487649..597e3abd652 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.notation
@@ -1,149 +1,149 @@
-<?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" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_j-WtIPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_saUz4PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_saUz4fqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_j-WtIfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-WtIvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-WtI_qAEeWGNbbFZQo3Jw"/>

-    </children>

-    <element xmi:type="uml:Class" href="ReopenFileBrace.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>

-    </children>

-    <element xmi:type="uml:Class" href="ReopenFileBrace.uml#_EmOucBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>

-    <element xmi:type="uml:Comment" href="ReopenFileBrace.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>

-    </children>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="ReopenFileBrace.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_Sla_EPsHEeWGNbbFZQo3Jw" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_Sla_EfsHEeWGNbbFZQo3Jw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Sla_E_sHEeWGNbbFZQo3Jw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileBrace.uml#_PGy8EPsHEeWGNbbFZQo3Jw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Sla_EvsHEeWGNbbFZQo3Jw" x="734" y="32"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>

-  <element xmi:type="uml:Model" href="ReopenFileBrace.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>

-  <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="ReopenFileBrace.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_PG1YUPsHEeWGNbbFZQo3Jw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">

-    <children xmi:type="notation:DecorationNode" xmi:id="_PG3NgPsHEeWGNbbFZQo3Jw" type="Dependency_NameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PG3NgfsHEeWGNbbFZQo3Jw" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_PG30kPsHEeWGNbbFZQo3Jw" type="Dependency_StereotypeLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PG30kfsHEeWGNbbFZQo3Jw" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_PG1YUfsHEeWGNbbFZQo3Jw"/>

-    <element xmi:type="uml:Dependency" href="ReopenFileBrace.uml#_PGy8EPsHEeWGNbbFZQo3Jw"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PG1YUvsHEeWGNbbFZQo3Jw" points="[534, 159, -643984, -643984]$[345, 159, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PHb1QPsHEeWGNbbFZQo3Jw" id="(0.0,0.27)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PHccUPsHEeWGNbbFZQo3Jw" id="(1.0,0.34108527131782945)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_SlbmIPsHEeWGNbbFZQo3Jw" type="StereotypeCommentLink" source="_PG1YUPsHEeWGNbbFZQo3Jw" target="_Sla_EPsHEeWGNbbFZQo3Jw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_SlbmIfsHEeWGNbbFZQo3Jw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SlcNMPsHEeWGNbbFZQo3Jw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileBrace.uml#_PGy8EPsHEeWGNbbFZQo3Jw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SlbmIvsHEeWGNbbFZQo3Jw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SlbmI_sHEeWGNbbFZQo3Jw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SlbmJPsHEeWGNbbFZQo3Jw"/>

-  </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" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_j-WtIPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_saUz4PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_saUz4fqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_j-WtIfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-WtIvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-WtI_qAEeWGNbbFZQo3Jw"/>
+    </children>
+    <element xmi:type="uml:Class" href="ReopenFileBrace.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>
+    </children>
+    <element xmi:type="uml:Class" href="ReopenFileBrace.uml#_EmOucBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>
+    <element xmi:type="uml:Comment" href="ReopenFileBrace.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>
+    </children>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="ReopenFileBrace.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Sla_EPsHEeWGNbbFZQo3Jw" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_Sla_EfsHEeWGNbbFZQo3Jw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Sla_E_sHEeWGNbbFZQo3Jw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileBrace.uml#_PGy8EPsHEeWGNbbFZQo3Jw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Sla_EvsHEeWGNbbFZQo3Jw" x="734" y="32"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <element xmi:type="uml:Model" href="ReopenFileBrace.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>
+  <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="ReopenFileBrace.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_PG1YUPsHEeWGNbbFZQo3Jw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_PG3NgPsHEeWGNbbFZQo3Jw" type="Dependency_NameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_PG3NgfsHEeWGNbbFZQo3Jw" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_PG30kPsHEeWGNbbFZQo3Jw" type="Dependency_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_PG30kfsHEeWGNbbFZQo3Jw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_PG1YUfsHEeWGNbbFZQo3Jw"/>
+    <element xmi:type="uml:Dependency" href="ReopenFileBrace.uml#_PGy8EPsHEeWGNbbFZQo3Jw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PG1YUvsHEeWGNbbFZQo3Jw" points="[534, 159, -643984, -643984]$[345, 159, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PHb1QPsHEeWGNbbFZQo3Jw" id="(0.0,0.27)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PHccUPsHEeWGNbbFZQo3Jw" id="(1.0,0.34108527131782945)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_SlbmIPsHEeWGNbbFZQo3Jw" type="StereotypeCommentLink" source="_PG1YUPsHEeWGNbbFZQo3Jw" target="_Sla_EPsHEeWGNbbFZQo3Jw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_SlbmIfsHEeWGNbbFZQo3Jw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SlcNMPsHEeWGNbbFZQo3Jw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileBrace.uml#_PGy8EPsHEeWGNbbFZQo3Jw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SlbmIvsHEeWGNbbFZQo3Jw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SlbmI_sHEeWGNbbFZQo3Jw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SlbmJPsHEeWGNbbFZQo3Jw"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.uml
index c7a3f1708bf..f2a769ddd71 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileBrace.uml
@@ -1,26 +1,26 @@
-<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">

-  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">

-    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">

-      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_PGy8EPsHEeWGNbbFZQo3Jw" name="StereotypeLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>

-    </profileApplication>

-  </uml:Model>

-  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>

-  <testProfile:Stereotype1 xmi:id="_SlM8oPsHEeWGNbbFZQo3Jw" base_Element="_PGy8EPsHEeWGNbbFZQo3Jw"/>

-</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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">
+  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">
+      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>
+    </ownedComment>
+    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_PGy8EPsHEeWGNbbFZQo3Jw" name="StereotypeLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>
+    </profileApplication>
+  </uml:Model>
+  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>
+  <testProfile:Stereotype1 xmi:id="_SlM8oPsHEeWGNbbFZQo3Jw" base_Element="_PGy8EPsHEeWGNbbFZQo3Jw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.di
index cd9edd7a7fb..8a802158a53 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ReopenFileComment.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ReopenFileComment.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-        </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="ReopenFileComment.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="ReopenFileComment.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.notation
index fb9e7e994d1..e2628370ea0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.notation
@@ -1,141 +1,141 @@
-<?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" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>

-    </children>

-    <element xmi:type="uml:Class" href="ReopenFileComment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>

-    </children>

-    <element xmi:type="uml:Class" href="ReopenFileComment.uml#_EmOucBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="225" y="325"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>

-    <element xmi:type="uml:Comment" href="ReopenFileComment.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" type="StereotypeComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>

-    </children>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="ReopenFileComment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" type="StereotypeComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>

-    </children>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileComment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>

-  <element xmi:type="uml:Model" href="ReopenFileComment.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>

-  <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>

-    <element xmi:type="uml:Dependency" href="ReopenFileComment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.51,0.1)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(0.5333333333333333,0.8)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="ReopenFileComment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileComment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>

-  </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" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>
+    </children>
+    <element xmi:type="uml:Class" href="ReopenFileComment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>
+    </children>
+    <element xmi:type="uml:Class" href="ReopenFileComment.uml#_EmOucBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="225" y="325"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>
+    <element xmi:type="uml:Comment" href="ReopenFileComment.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" type="StereotypeComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>
+    </children>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="ReopenFileComment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" type="StereotypeComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>
+    </children>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileComment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <element xmi:type="uml:Model" href="ReopenFileComment.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>
+  <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>
+    <element xmi:type="uml:Dependency" href="ReopenFileComment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.51,0.1)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(0.5333333333333333,0.8)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="ReopenFileComment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileComment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.uml
index 90558a87f31..19a2aa14124 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileComment.uml
@@ -1,26 +1,26 @@
-<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">

-  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">

-    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">

-      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>

-    </profileApplication>

-  </uml:Model>

-  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>

-  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>

-</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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">
+  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">
+      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>
+    </ownedComment>
+    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>
+    </profileApplication>
+  </uml:Model>
+  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>
+  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.di
index c4a116dd5f8..35ab67c3749 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ReopenFileCompartment.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ReopenFileCompartment.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-        </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="ReopenFileCompartment.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="ReopenFileCompartment.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.notation
index 7885d2a2b8a..fc8251051f0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.notation
@@ -1,174 +1,174 @@
-<?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" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_j-eo-PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mBgQoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mBgQofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_j-eo-fqAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-eo-vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-eo-_qAEeWGNbbFZQo3Jw"/>

-    </children>

-    <element xmi:type="uml:Class" href="ReopenFileCompartment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>

-    </children>

-    <element xmi:type="uml:Class" href="ReopenFileCompartment.uml#_EmOucBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>

-    <element xmi:type="uml:Comment" href="ReopenFileCompartment.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>

-    </children>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="ReopenFileCompartment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_j-pBAvqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_j-pBA_qAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-pBBPqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-pBBfqAEeWGNbbFZQo3Jw"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_j-t5gPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-t5gfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-t5gvqAEeWGNbbFZQo3Jw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>

-      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>

-    </children>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileCompartment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>

-  <element xmi:type="uml:Model" href="ReopenFileCompartment.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>

-  <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxKzAPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxb4wPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>

-    <element xmi:type="uml:Dependency" href="ReopenFileCompartment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.0,0.57)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(1.0,0.6329113924050633)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="ReopenFileCompartment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileCompartment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>

-  </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" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_j-eo-PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mBgQoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mBgQofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_j-eo-fqAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-eo-vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-eo-_qAEeWGNbbFZQo3Jw"/>
+    </children>
+    <element xmi:type="uml:Class" href="ReopenFileCompartment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>
+    </children>
+    <element xmi:type="uml:Class" href="ReopenFileCompartment.uml#_EmOucBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>
+    <element xmi:type="uml:Comment" href="ReopenFileCompartment.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>
+    </children>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="ReopenFileCompartment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_j-pBAvqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_j-pBA_qAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-pBBPqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-pBBfqAEeWGNbbFZQo3Jw"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_j-t5gPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_j-t5gfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-t5gvqAEeWGNbbFZQo3Jw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>
+      <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+      <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>
+    </children>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileCompartment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <element xmi:type="uml:Model" href="ReopenFileCompartment.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>
+  <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxKzAPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxb4wPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>
+    <element xmi:type="uml:Dependency" href="ReopenFileCompartment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.0,0.57)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(1.0,0.6329113924050633)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="ReopenFileCompartment.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="ReopenFileCompartment.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.uml
index 90558a87f31..19a2aa14124 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileCompartment.uml
@@ -1,26 +1,26 @@
-<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">

-  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">

-    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">

-      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>

-    </profileApplication>

-  </uml:Model>

-  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>

-  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>

-</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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">
+  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">
+      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>
+    </ownedComment>
+    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>
+    </profileApplication>
+  </uml:Model>
+  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>
+  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.di
index bc8edf081f3..91673d85a31 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ReopenFileWithCSS.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ReopenFileWithCSS.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-        </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="ReopenFileWithCSS.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="ReopenFileWithCSS.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.notation
index b5a7b0ce1a5..d8ef7e56b9b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.notation
@@ -1,179 +1,179 @@
-<?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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j-eo-PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mBgQoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mBgQofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j-eo-fqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-eo-vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-eo-_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <element xmi:type="uml:Class" href="ReopenFileWithCSS.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="93" y="115" width="252"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>

-      </children>

-      <element xmi:type="uml:Class" href="ReopenFileWithCSS.uml#_EmOucBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="ReopenFileWithCSS.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithCSS.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j-pBAvqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j-pBA_qAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-pBBPqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-pBBfqAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_j-t5gPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-t5gfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-t5gvqAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithCSS.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>

-    <element xmi:type="uml:Model" href="ReopenFileWithCSS.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>

-    <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxKzAPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxb4wPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>

-      <element xmi:type="uml:Dependency" href="ReopenFileWithCSS.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.0,0.57)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(1.0,0.6329113924050633)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithCSS.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithCSS.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>

-    </edges>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_20XEYPsxEeWGNbbFZQo3Jw">

-    <stylesheets xmi:type="css:EmbeddedStyleSheet" xmi:id="_20YSgPsxEeWGNbbFZQo3Jw" label="StereotypeCSS" content="Compartment[type=StereotypeCompartment]>[property=&quot;testString&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiString&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testInt&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMyPrimituveType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testReal&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiReal&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testBoolean&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiBoolean&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiEnumeration&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiInt&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiprimitiveType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiDataType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testDataType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testRefToEnumeration&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testUnaryReftoStereotype2&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testRefToMetaclass&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}"/>

-  </css:ModelStyleSheets>

-</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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_j-eo-PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mBgQoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mBgQofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j-eo-fqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-eo-vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-eo-_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <element xmi:type="uml:Class" href="ReopenFileWithCSS.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="93" y="115" width="252"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>
+      </children>
+      <element xmi:type="uml:Class" href="ReopenFileWithCSS.uml#_EmOucBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="ReopenFileWithCSS.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithCSS.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_j-pBAvqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j-pBA_qAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-pBBPqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-pBBfqAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_j-t5gPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-t5gfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-t5gvqAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithCSS.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <element xmi:type="uml:Model" href="ReopenFileWithCSS.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxKzAPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxb4wPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>
+      <element xmi:type="uml:Dependency" href="ReopenFileWithCSS.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.0,0.57)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(1.0,0.6329113924050633)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithCSS.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithCSS.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_20XEYPsxEeWGNbbFZQo3Jw">
+    <stylesheets xmi:type="css:EmbeddedStyleSheet" xmi:id="_20YSgPsxEeWGNbbFZQo3Jw" label="StereotypeCSS" content="Compartment[type=StereotypeCompartment]>[property=&quot;testString&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiString&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testInt&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMyPrimituveType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testReal&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiReal&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testBoolean&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiBoolean&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiEnumeration&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiInt&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiprimitiveType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiDataType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testDataType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testRefToEnumeration&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testUnaryReftoStereotype2&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testRefToMetaclass&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}"/>
+  </css:ModelStyleSheets>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.uml
index 90558a87f31..19a2aa14124 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithCSS.uml
@@ -1,26 +1,26 @@
-<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">

-  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">

-    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">

-      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>

-    </profileApplication>

-  </uml:Model>

-  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>

-  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>

-</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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">
+  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">
+      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>
+    </ownedComment>
+    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>
+    </profileApplication>
+  </uml:Model>
+  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>
+  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.di
index 850e8670724..e7b5d2beef8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ReopenFileWithPropertyView.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ReopenFileWithPropertyView.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-        </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="ReopenFileWithPropertyView.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="ReopenFileWithPropertyView.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.notation
index d8f11bcbd68..18aa0b43610 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.notation
@@ -1,241 +1,241 @@
-<?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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j-eo-PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mBgQoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mBgQofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_HkvFwvs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_meyzIGkdEeGGJOTenKBKAg"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkvFw_s8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_HkvFxPs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_wshLYGkdEeGGJOTenKBKAg"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkvFxfs8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_HkvFxvs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_1ta5cGkdEeGGJOTenKBKAg"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkvFx_s8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs0Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_71vikGkdEeGGJOTenKBKAg"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs0fs8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs0vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_BfRW4GkeEeGGJOTenKBKAg"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs0_s8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs1Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_Lb0QgGz4EeGEKeJyQaxg3g"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs1fs8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs1vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_jAiq8G38EeGag98Jn1kDVw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs1_s8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs2Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_Re-boM0eEeKwCqQbxnBb_w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs2fs8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_HkwT4Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_Y4YSIM0eEeKwCqQbxnBb_w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkwT4fs8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_HkwT4vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_Zu-i8M0eEeKwCqQbxnBb_w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkwT4_s8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_HkwT5Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_aEQPYM0eEeKwCqQbxnBb_w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkwT5fs8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_HkwT5vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_aXAMQM0eEeKwCqQbxnBb_w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkwT5_s8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Hkw68Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_vH4aMM0eEeKwCqQbxnBb_w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkw68fs8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Hkw68vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDBX4M0jEeKjW9KkdY00_w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkw68_s8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Hkw69Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_SivA4M0tEeKjW9KkdY00_w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkw69fs8EeWGNbbFZQo3Jw"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Hkw69vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDuW8M0tEeKjW9KkdY00_w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkw69_s8EeWGNbbFZQo3Jw"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j-eo-fqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-eo-vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-eo-_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <element xmi:type="uml:Class" href="ReopenFileWithPropertyView.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="93" y="115" width="252"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>

-      </children>

-      <element xmi:type="uml:Class" href="ReopenFileWithPropertyView.uml#_EmOucBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="ReopenFileWithPropertyView.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithPropertyView.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j-pBAvqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j-pBA_qAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-pBBPqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-pBBfqAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_j-t5gPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-t5gfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-t5gvqAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithPropertyView.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>

-    <element xmi:type="uml:Model" href="ReopenFileWithPropertyView.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>

-    <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxKzAPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxb4wPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>

-      <element xmi:type="uml:Dependency" href="ReopenFileWithPropertyView.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.0,0.57)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(1.0,0.6329113924050633)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithPropertyView.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithPropertyView.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>

-    </edges>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_20XEYPsxEeWGNbbFZQo3Jw"/>

-</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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_j-eo-PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mBgQoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mBgQofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_HkvFwvs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_meyzIGkdEeGGJOTenKBKAg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkvFw_s8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_HkvFxPs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_wshLYGkdEeGGJOTenKBKAg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkvFxfs8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_HkvFxvs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_1ta5cGkdEeGGJOTenKBKAg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkvFx_s8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs0Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_71vikGkdEeGGJOTenKBKAg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs0fs8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs0vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_BfRW4GkeEeGGJOTenKBKAg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs0_s8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs1Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_Lb0QgGz4EeGEKeJyQaxg3g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs1fs8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs1vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_jAiq8G38EeGag98Jn1kDVw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs1_s8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Hkvs2Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_Re-boM0eEeKwCqQbxnBb_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkvs2fs8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_HkwT4Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_Y4YSIM0eEeKwCqQbxnBb_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkwT4fs8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_HkwT4vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_Zu-i8M0eEeKwCqQbxnBb_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkwT4_s8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_HkwT5Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_aEQPYM0eEeKwCqQbxnBb_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkwT5fs8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_HkwT5vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_aXAMQM0eEeKwCqQbxnBb_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_HkwT5_s8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Hkw68Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_vH4aMM0eEeKwCqQbxnBb_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkw68fs8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Hkw68vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDBX4M0jEeKjW9KkdY00_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkw68_s8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Hkw69Ps8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_SivA4M0tEeKjW9KkdY00_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkw69fs8EeWGNbbFZQo3Jw"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Hkw69vs8EeWGNbbFZQo3Jw" visible="false" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDuW8M0tEeKjW9KkdY00_w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Hkw69_s8EeWGNbbFZQo3Jw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j-eo-fqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-eo-vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-eo-_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <element xmi:type="uml:Class" href="ReopenFileWithPropertyView.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="93" y="115" width="252"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>
+      </children>
+      <element xmi:type="uml:Class" href="ReopenFileWithPropertyView.uml#_EmOucBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="ReopenFileWithPropertyView.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithPropertyView.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_j-pBAvqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j-pBA_qAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-pBBPqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-pBBfqAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_j-t5gPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-t5gfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-t5gvqAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithPropertyView.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <element xmi:type="uml:Model" href="ReopenFileWithPropertyView.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxKzAPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxb4wPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>
+      <element xmi:type="uml:Dependency" href="ReopenFileWithPropertyView.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.0,0.57)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(1.0,0.6329113924050633)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithPropertyView.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithPropertyView.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_20XEYPsxEeWGNbbFZQo3Jw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.uml
index 90558a87f31..19a2aa14124 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithPropertyView.uml
@@ -1,26 +1,26 @@
-<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">

-  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">

-    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">

-      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>

-    </profileApplication>

-  </uml:Model>

-  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>

-  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>

-</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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">
+  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">
+      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>
+    </ownedComment>
+    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>
+    </profileApplication>
+  </uml:Model>
+  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>
+  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.di
index 14950f61565..dd58a08d80f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ReopenFileWithString.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ReopenFileWithString.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-        </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="ReopenFileWithString.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="ReopenFileWithString.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.notation
index 2a758c26f98..a52e6a4dcba 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.notation
@@ -1,179 +1,179 @@
-<?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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j-eo-PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mBgQoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mBgQofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j-eo-fqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-eo-vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-eo-_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <element xmi:type="uml:Class" href="ReopenFileWithString.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="93" y="115" width="252"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>

-      </children>

-      <element xmi:type="uml:Class" href="ReopenFileWithString.uml#_EmOucBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="ReopenFileWithString.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithString.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_j-pBAvqAEeWGNbbFZQo3Jw" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j-pBA_qAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-pBBPqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-pBBfqAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_j-t5gPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-t5gfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-t5gvqAEeWGNbbFZQo3Jw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>

-        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithString.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>

-    <element xmi:type="uml:Model" href="ReopenFileWithString.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>

-    <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxKzAPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">

-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxb4wPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>

-      <element xmi:type="uml:Dependency" href="ReopenFileWithString.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.0,0.57)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(1.0,0.6329113924050633)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithString.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithString.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>

-    </edges>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_20XEYPsxEeWGNbbFZQo3Jw">

-    <stylesheets xmi:type="css:EmbeddedStyleSheet" xmi:id="_20YSgPsxEeWGNbbFZQo3Jw" label="StereotypeCSS" content="Compartment[type=StereotypeCompartment]>[property=&quot;testMultiString&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testInt&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMyPrimituveType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testReal&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiReal&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testBoolean&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiBoolean&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiEnumeration&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiInt&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiprimitiveType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiDataType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testDataType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testRefToEnumeration&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testUnaryReftoStereotype2&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testRefToMetaclass&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testReftoStereotype2&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}"/>

-  </css:ModelStyleSheets>

-</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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0ApAvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQPiYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQfiYEeSxko_tWvdMlw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_j-eo-PqAEeWGNbbFZQo3Jw" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mBgQoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mBgQofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j-eo-fqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-eo-vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-eo-_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <element xmi:type="uml:Class" href="ReopenFileWithString.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="93" y="115" width="252"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEPqAEeWGNbbFZQo3Jw" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEfqAEeWGNbbFZQo3Jw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L0BQEvqAEeWGNbbFZQo3Jw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0YSNQviYEeSxko_tWvdMlw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0YSNQ_iYEeSxko_tWvdMlw" y="5"/>
+      </children>
+      <element xmi:type="uml:Class" href="ReopenFileWithString.uml#_EmOucBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="534" y="132"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="Comment_Shape" fontName="Sylfaen">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="ReopenFileWithString.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0aOG8PiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aZGEPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aZGEfiYEeSxko_tWvdMlw" key="visible" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_j-czxPqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j-czxfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-czxvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-czx_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_j-srYPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-srYfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-srYvqAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L3YGEPqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UXo28PqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UXpeAPqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L3YGEfqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3YGEvqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3YGE_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0aOG8fiYEeSxko_tWvdMlw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOG8_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithString.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0pQogPiYEeSxko_tWvdMlw" visible="false" type="StereotypeComment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0pbAkPiYEeSxko_tWvdMlw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0pbnoPiYEeSxko_tWvdMlw" key="visible" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_j-pBAvqAEeWGNbbFZQo3Jw" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j-pBA_qAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-pBBPqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-pBBfqAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_j-t5gPqAEeWGNbbFZQo3Jw" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_j-t5gfqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j-t5gvqAEeWGNbbFZQo3Jw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L3zj4PqAEeWGNbbFZQo3Jw" visible="false" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z-LBoPqAEeWGNbbFZQo3Jw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z-LBofqAEeWGNbbFZQo3Jw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L3zj4fqAEeWGNbbFZQo3Jw" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_L3zj4vqAEeWGNbbFZQo3Jw" name="stereotype" stringValue="testProfile::Stereotype1"/>
+        <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L3zj4_qAEeWGNbbFZQo3Jw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0pQogfiYEeSxko_tWvdMlw" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pQog_iYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithString.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="384" y="321"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_0YSNRPiYEeSxko_tWvdMlw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <element xmi:type="uml:Model" href="ReopenFileWithString.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="Dependency_Edge" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="Dependency_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxKzAPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="Dependency_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mxb4wPqAEeWGNbbFZQo3Jw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>
+      <element xmi:type="uml:Dependency" href="ReopenFileWithString.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.0,0.57)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(1.0,0.6329113924050633)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0aOG9PiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_0aOG8PiYEeSxko_tWvdMlw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_0aOG9fiYEeSxko_tWvdMlw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0aOuAPiYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ReopenFileWithString.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0aOG9viYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG9_iYEeSxko_tWvdMlw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0aOG-PiYEeSxko_tWvdMlw"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0pQohPiYEeSxko_tWvdMlw" type="StereotypeCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_0pQogPiYEeSxko_tWvdMlw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_0pQohfiYEeSxko_tWvdMlw"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0pRPkviYEeSxko_tWvdMlw" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Dependency" href="ReopenFileWithString.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pQohviYEeSxko_tWvdMlw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkPiYEeSxko_tWvdMlw"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pRPkfiYEeSxko_tWvdMlw" id="(0.0,0.16666666666666666)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_20XEYPsxEeWGNbbFZQo3Jw">
+    <stylesheets xmi:type="css:EmbeddedStyleSheet" xmi:id="_20YSgPsxEeWGNbbFZQo3Jw" label="StereotypeCSS" content="Compartment[type=StereotypeCompartment]>[property=&quot;testMultiString&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testInt&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMyPrimituveType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testReal&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiReal&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testBoolean&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiBoolean&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiEnumeration&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiInt&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiprimitiveType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testMultiDataType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testDataType&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testRefToEnumeration&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testUnaryReftoStereotype2&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testRefToMetaclass&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;Compartment[type=StereotypeCompartment]>[property=&quot;testReftoStereotype2&quot;]{&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}"/>
+  </css:ModelStyleSheets>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.uml
index 90558a87f31..19a2aa14124 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/ReopenFileWithString.uml
@@ -1,26 +1,26 @@
-<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">

-  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">

-    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">

-      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>

-    </profileApplication>

-  </uml:Model>

-  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>

-  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>

-</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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5 testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ">
+  <uml:Model xmi:id="_6wmGEBwfEeKYb8ts8yUAsw" name="model">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_Mfd7kBwgEeKYb8ts8yUAsw">
+      <body>Display stereotype directly as Sterotyped has been already displayed, normaly you have to see in &quot;comment shape&quot;</body>
+    </ownedComment>
+    <packagedElement xmi:type="uml:Class" xmi:id="_BPjGgBwgEeKYb8ts8yUAsw" name="StereotypedClass"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_EmOucBwgEeKYb8ts8yUAsw" name="Class1"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_FcrOQBwgEeKYb8ts8yUAsw" name="StereotypedLink" client="_EmOucBwgEeKYb8ts8yUAsw" supplier="_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QukngB5jEeWducbWdAMWHg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NFZ_cPqAEeWGNbbFZQo3Jw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cfqAEeWGNbbFZQo3Jw" key="Version" value="0.0.6"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_cvqAEeWGNbbFZQo3Jw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_c_qAEeWGNbbFZQo3Jw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dPqAEeWGNbbFZQo3Jw" key="Date" value="2016-03-08"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NFZ_dfqAEeWGNbbFZQo3Jw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QulOkB5jEeWducbWdAMWHg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="testProfile.profile.uml#_OvT8cOVLEeWFGvPgvi3rLQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>
+    </profileApplication>
+  </uml:Model>
+  <testProfile:Stereotype1 xmi:id="_J8_-0BwgEeKYb8ts8yUAsw" base_Element="_BPjGgBwgEeKYb8ts8yUAsw"/>
+  <testProfile:Stereotype1 xmi:id="_K9t08BwgEeKYb8ts8yUAsw" base_Element="_FcrOQBwgEeKYb8ts8yUAsw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyProfile.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyProfile.di
index e8ef6dcf466..6a092465a67 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyProfile.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyProfile.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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="UnapplyProfile.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="UnapplyProfile.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<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="UnapplyProfile.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="UnapplyProfile.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyProfileDiagramClosed.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyProfileDiagramClosed.notation
index 91d64548ca2..a20b419a22e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyProfileDiagramClosed.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyProfileDiagramClosed.notation
@@ -1,156 +1,156 @@
-<?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" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="2008">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J-WCoBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgBwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgRwgEeKYb8ts8yUAsw" key="StereotypeList" value="testProfile::Stereotype1"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZghwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testInt,testProfile::Stereotype1.testMultiString,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgxwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZhBwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Comment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5gkBwgEeKYb8ts8yUAsw" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVWMgBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVWMgRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5glRwgEeKYb8ts8yUAsw" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVWMghwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVWMgxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5gmhwgEeKYb8ts8yUAsw" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVf9gBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVf9gRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>

-    </children>

-    <element xmi:type="uml:Class" href="UnapplyProfileDiagramClosed.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4YxwgEeKYb8ts8yUAsw" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4chwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4cxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4aBwgEeKYb8ts8yUAsw" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4dBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4dRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4bRwgEeKYb8ts8yUAsw" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4dhwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4dxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>

-    </children>

-    <element xmi:type="uml:Class" href="UnapplyProfileDiagramClosed.uml#_EmOucBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="225" y="325"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="2012" fontName="Sylfaen">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="5038"/>

-    <element xmi:type="uml:Comment" href="UnapplyProfileDiagramClosed.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_qx28ABwgEeKYb8ts8yUAsw" type="AppliedStereotypesComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zxUxYBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxaxwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbBwgEeKYb8ts8yUAsw" key="StereotypeList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbRwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbhwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testInt,testProfile::Stereotype1.testMultiString,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbxwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_qx28ARwgEeKYb8ts8yUAsw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qx28AxwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="UnapplyProfileDiagramClosed.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_1fQ54BwgEeKYb8ts8yUAsw" type="AppliedStereotypesComment">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3xgpUBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpWxwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXBwgEeKYb8ts8yUAsw" key="StereotypeList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXRwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXhwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXxwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <styles xmi:type="notation:TitleStyle" xmi:id="_1fQ54RwgEeKYb8ts8yUAsw" showTitle="true"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1fQ54xwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="UnapplyProfileDiagramClosed.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="415" y="250"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>

-  <element xmi:type="uml:Model" href="UnapplyProfileDiagramClosed.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>

-  <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="4008" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K93l8BwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcBwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcRwgEeKYb8ts8yUAsw" key="StereotypeList" value="testProfile::Stereotype1"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCchwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcxwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCdBwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Comment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="6026">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="6027">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>

-    <element xmi:type="uml:Dependency" href="UnapplyProfileDiagramClosed.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.51,0.1)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(0.5333333333333333,0.8)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_qyAF8BwgEeKYb8ts8yUAsw" type="AppliedStereotypesCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_qx28ABwgEeKYb8ts8yUAsw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_qyAF8RwgEeKYb8ts8yUAsw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qyAF9RwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="UnapplyProfileDiagramClosed.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qyAF8hwgEeKYb8ts8yUAsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyAF8xwgEeKYb8ts8yUAsw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyAF9BwgEeKYb8ts8yUAsw"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_1fQ55BwgEeKYb8ts8yUAsw" type="AppliedStereotypesCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_1fQ54BwgEeKYb8ts8yUAsw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_1fQ55RwgEeKYb8ts8yUAsw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1fQ56RwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Dependency" href="UnapplyProfileDiagramClosed.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1fQ55hwgEeKYb8ts8yUAsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1fQ55xwgEeKYb8ts8yUAsw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1fQ56BwgEeKYb8ts8yUAsw"/>

-  </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" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_9fRS0BwfEeKYb8ts8yUAsw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_BUdbsBwgEeKYb8ts8yUAsw" type="2008">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J-WCoBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgBwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgRwgEeKYb8ts8yUAsw" key="StereotypeList" value="testProfile::Stereotype1"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZghwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testInt,testProfile::Stereotype1.testMultiString,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZgxwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zwbZhBwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Comment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_BUmloBwgEeKYb8ts8yUAsw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5gkBwgEeKYb8ts8yUAsw" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVWMgBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVWMgRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gkRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gkhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gkxwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5glBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5glRwgEeKYb8ts8yUAsw" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVWMghwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVWMgxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5glhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5glxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gmBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gmRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_BU5gmhwgEeKYb8ts8yUAsw" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BVf9gBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BVf9gRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BU5gmxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_BU5gnBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BU5gnRwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BU5gnhwgEeKYb8ts8yUAsw"/>
+    </children>
+    <element xmi:type="uml:Class" href="UnapplyProfileDiagramClosed.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BUdbsRwgEeKYb8ts8yUAsw" x="195" y="115" width="150"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_EmX4YBwgEeKYb8ts8yUAsw" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_EmX4YhwgEeKYb8ts8yUAsw" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4YxwgEeKYb8ts8yUAsw" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4chwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4cxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4ZBwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ZRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4ZhwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4ZxwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4aBwgEeKYb8ts8yUAsw" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4dBwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4dRwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4aRwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4ahwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4axwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4bBwgEeKYb8ts8yUAsw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_EmX4bRwgEeKYb8ts8yUAsw" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EmX4dhwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EmX4dxwgEeKYb8ts8yUAsw" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EmX4bhwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EmX4bxwgEeKYb8ts8yUAsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EmX4cBwgEeKYb8ts8yUAsw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4cRwgEeKYb8ts8yUAsw"/>
+    </children>
+    <element xmi:type="uml:Class" href="UnapplyProfileDiagramClosed.uml#_EmOucBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EmX4YRwgEeKYb8ts8yUAsw" x="225" y="325"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_MiI1EBwgEeKYb8ts8yUAsw" type="2012" fontName="Sylfaen">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V2bq8BwgEeKYb8ts8yUAsw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V2bq8RwgEeKYb8ts8yUAsw" key="bold" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XGxRcBwgEeKYb8ts8yUAsw" key="fontColor" value="true"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Fw-04BwhEeKYb8ts8yUAsw" key="fontHeight" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_MiI1EhwgEeKYb8ts8yUAsw" type="5038"/>
+    <element xmi:type="uml:Comment" href="UnapplyProfileDiagramClosed.uml#_Mfd7kBwgEeKYb8ts8yUAsw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiI1ERwgEeKYb8ts8yUAsw" x="195" y="20" width="271" height="51"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_qx28ABwgEeKYb8ts8yUAsw" type="AppliedStereotypesComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zxUxYBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxaxwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbBwgEeKYb8ts8yUAsw" key="StereotypeList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbRwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbhwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testInt,testProfile::Stereotype1.testMultiString,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zxUxbxwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_qx28ARwgEeKYb8ts8yUAsw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qx28AxwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="UnapplyProfileDiagramClosed.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qx28AhwgEeKYb8ts8yUAsw" x="685" y="115"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_1fQ54BwgEeKYb8ts8yUAsw" type="AppliedStereotypesComment">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3xgpUBwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpWxwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXBwgEeKYb8ts8yUAsw" key="StereotypeList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXRwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXhwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3xgpXxwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <styles xmi:type="notation:TitleStyle" xmi:id="_1fQ54RwgEeKYb8ts8yUAsw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1fQ54xwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="UnapplyProfileDiagramClosed.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fQ54hwgEeKYb8ts8yUAsw" x="415" y="250"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_9fRS0RwfEeKYb8ts8yUAsw"/>
+  <element xmi:type="uml:Model" href="UnapplyProfileDiagramClosed.uml#_6wmGEBwfEeKYb8ts8yUAsw"/>
+  <edges xmi:type="notation:Connector" xmi:id="_Fe6C4BwgEeKYb8ts8yUAsw" type="4008" source="_EmX4YBwgEeKYb8ts8yUAsw" target="_BUdbsBwgEeKYb8ts8yUAsw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K93l8BwgEeKYb8ts8yUAsw" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcBwgEeKYb8ts8yUAsw" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcRwgEeKYb8ts8yUAsw" key="StereotypeList" value="testProfile::Stereotype1"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCchwgEeKYb8ts8yUAsw" key="PropStereoDisplay" value="testProfile::Stereotype1.testReftoStereotype2,testProfile::Stereotype1.testUnaryReftoStereotype2,testProfile::Stereotype1.testDataType,testProfile::Stereotype1.testMyPrimituveType,testProfile::Stereotype1.testRefToMetaclass,testProfile::Stereotype1.testRefToEnumeration"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCcxwgEeKYb8ts8yUAsw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3wxCdBwgEeKYb8ts8yUAsw" key="StereotypePropertyLocation" value="Comment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C4xwgEeKYb8ts8yUAsw" type="6026">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5BwgEeKYb8ts8yUAsw" x="27" y="66"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Fe6C5RwgEeKYb8ts8yUAsw" type="6027">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Fe6C5hwgEeKYb8ts8yUAsw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Fe6C4RwgEeKYb8ts8yUAsw"/>
+    <element xmi:type="uml:Dependency" href="UnapplyProfileDiagramClosed.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fe6C4hwgEeKYb8ts8yUAsw" points="[-7, -10, 0, 150]$[-4, -140, 3, 20]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogBwgEeKYb8ts8yUAsw" id="(0.51,0.1)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FhSogRwgEeKYb8ts8yUAsw" id="(0.5333333333333333,0.8)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_qyAF8BwgEeKYb8ts8yUAsw" type="AppliedStereotypesCommentLink" source="_BUdbsBwgEeKYb8ts8yUAsw" target="_qx28ABwgEeKYb8ts8yUAsw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_qyAF8RwgEeKYb8ts8yUAsw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qyAF9RwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="UnapplyProfileDiagramClosed.uml#_BPjGgBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qyAF8hwgEeKYb8ts8yUAsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyAF8xwgEeKYb8ts8yUAsw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyAF9BwgEeKYb8ts8yUAsw"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_1fQ55BwgEeKYb8ts8yUAsw" type="AppliedStereotypesCommentLink" source="_Fe6C4BwgEeKYb8ts8yUAsw" target="_1fQ54BwgEeKYb8ts8yUAsw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_1fQ55RwgEeKYb8ts8yUAsw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1fQ56RwgEeKYb8ts8yUAsw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Dependency" href="UnapplyProfileDiagramClosed.uml#_FcrOQBwgEeKYb8ts8yUAsw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1fQ55hwgEeKYb8ts8yUAsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1fQ55xwgEeKYb8ts8yUAsw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1fQ56BwgEeKYb8ts8yUAsw"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyStereotype.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyStereotype.di
index 674a41d495c..424bd2cc6de 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyStereotype.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/UnapplyStereotype.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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="UnapplyStereotype.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="UnapplyStereotype.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<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="UnapplyStereotype.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="UnapplyStereotype.notation#_9fRS0BwfEeKYb8ts8yUAsw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.di
index 098618c9cbb..d513191d705 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="testProfile.profile.notation#_lN77kHc8EeGEMdTf3PnPPg"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="testProfile.profile.notation#_lN77kHc8EeGEMdTf3PnPPg"/>

-        </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="testProfile.profile.notation#_lN77kHc8EeGEMdTf3PnPPg"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="testProfile.profile.notation#_lN77kHc8EeGEMdTf3PnPPg"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.notation
index c7abc8fbf4f..298eb3e1560 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.notation
@@ -1,286 +1,286 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_lN77kHc8EeGEMdTf3PnPPg" type="PapyrusUMLProfileDiagram" name="ProfileDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_Ij0egM0eEeKwCqQbxnBb_w" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Ij9ocM0eEeKwCqQbxnBb_w" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_IkHZcM0eEeKwCqQbxnBb_w" type="1071">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IktPUM0eEeKwCqQbxnBb_w" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IktPUc0eEeKwCqQbxnBb_w" key="showTitle" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_KA8j0M0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_dcMxQGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KA8j0c0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KCliks0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_meyzIGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KClik80eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KCvTkM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_wshLYGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KCvTkc0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KCvTks0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_1ta5cGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KCvTk80eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KCvTlM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_71vikGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KCvTlc0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KC4dgM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_BfRW4GkeEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KC4dgc0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KC4dgs0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Lb0QgGz4EeGEKeJyQaxg3g"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KC4dg80eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KC4dhM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_jAiq8G38EeGag98Jn1kDVw"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KC4dhc0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_RfkRgM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Re-boM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_RfkRgc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Y4iDIM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Y4YSIM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y4iDIc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_ZvIT8M0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Zu-i8M0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZvIT8c0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_aEaAYM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_aEQPYM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_aEaAYc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_aXJWMM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_aXAMQM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_aXJWMc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_vILVIM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_vH4aMM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_vILVIc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_VEXbsM0jEeKjW9KkdY00_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDBX4M0jEeKjW9KkdY00_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VEXbsc0jEeKjW9KkdY00_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Si-4gM0tEeKjW9KkdY00_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_SivA4M0tEeKjW9KkdY00_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Si-4gc0tEeKjW9KkdY00_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_VD9AcM0tEeKjW9KkdY00_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDuW8M0tEeKjW9KkdY00_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VD9Acc0tEeKjW9KkdY00_w"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_IkHZcc0eEeKwCqQbxnBb_w"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_IkHZcs0eEeKwCqQbxnBb_w"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IkHZc80eEeKwCqQbxnBb_w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IkHZdM0eEeKwCqQbxnBb_w"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_IkHZdc0eEeKwCqQbxnBb_w" visible="false" type="1019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IktPUs0eEeKwCqQbxnBb_w" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IktPU80eEeKwCqQbxnBb_w" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_IkHZds0eEeKwCqQbxnBb_w"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_IkHZd80eEeKwCqQbxnBb_w"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IkHZeM0eEeKwCqQbxnBb_w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IkHZec0eEeKwCqQbxnBb_w"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_In1b0M0eEeKwCqQbxnBb_w" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_In1b080eEeKwCqQbxnBb_w" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_In1b1M0eEeKwCqQbxnBb_w" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_In1b0c0eEeKwCqQbxnBb_w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_In1b0s0eEeKwCqQbxnBb_w"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ij0egc0eEeKwCqQbxnBb_w" x="215" y="95"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_8_pcwOVKEeWFGvPgvi3rLQ" type="1026">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-9V4gOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-9V4geVKEeWFGvPgvi3rLQ" key="canonical" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_8_zNwOVKEeWFGvPgvi3rLQ" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_8_zNweVKEeWFGvPgvi3rLQ" type="1071">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_8gkOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HoOVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_--a2kOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9HoeVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HouVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575-8eVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--a2keVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--cEsOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9Ho-VKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HpOVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575-9OVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--cEseVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--cEsuVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9HpeVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HpuVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575-9eVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--cEs-VKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--crwOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9Hp-VKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HqOVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575--eVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--crweVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--dS0OVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9HqeVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HquVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575-_eVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--dS0eVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--d54OVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9Hq-VKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HrOVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_AeVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--d54eVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--d54uVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9usOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9useVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_BeVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--d54-VKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--eg8OVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9usuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9us-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_CeVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--eg8eVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--fIAOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9utOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uteVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_CuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--fIAeVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--fvEOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9utuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9ut-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_DuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--fvEeVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--gWIOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uuOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uueVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_EuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--gWIeVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--g9MOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uuuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uu-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_FuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--g9MeVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--hkQOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uvOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uveVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_GuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--hkQeVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--iLUOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uvuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uv-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_HuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--iLUeVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--iyYOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uwOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uweVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_IuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--iyYeVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--iyYuVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_-VwOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_-VweVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_JuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--iyY-VKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--jZcOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_-VwuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_-Vw-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_KuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--jZceVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_--kAgOVKEeWFGvPgvi3rLQ" type="3002">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_-VxOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_-VxeVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>

-        </eAnnotations>

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_LuVKEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_--kAgeVKEeWFGvPgvi3rLQ"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_8_zNwuVKEeWFGvPgvi3rLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_8_zNw-VKEeWFGvPgvi3rLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_8_zNxOVKEeWFGvPgvi3rLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8_zNxeVKEeWFGvPgvi3rLQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_8_zNxuVKEeWFGvPgvi3rLQ" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_8_zNx-VKEeWFGvPgvi3rLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_8_zNyOVKEeWFGvPgvi3rLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_8_zNyeVKEeWFGvPgvi3rLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8_zNyuVKEeWFGvPgvi3rLQ"/>

-    </children>

-    <styles xmi:type="notation:CanonicalStyle" xmi:id="_-9UDUOVKEeWFGvPgvi3rLQ" canonical="false"/>

-    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_575-8OVKEeWFGvPgvi3rLQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8_pcweVKEeWFGvPgvi3rLQ" x="736" y="175"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_C98AIOVLEeWFGvPgvi3rLQ" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_C98AIuVLEeWFGvPgvi3rLQ" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_C98AI-VLEeWFGvPgvi3rLQ" type="1071">

-      <children xmi:type="notation:Shape" xmi:id="_FL998OVLEeWFGvPgvi3rLQ" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_FLrDAOVLEeWFGvPgvi3rLQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FL998eVLEeWFGvPgvi3rLQ"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_C98AJOVLEeWFGvPgvi3rLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_C98AJeVLEeWFGvPgvi3rLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_C98AJuVLEeWFGvPgvi3rLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C98AJ-VLEeWFGvPgvi3rLQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_C98AKOVLEeWFGvPgvi3rLQ" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_C98AKeVLEeWFGvPgvi3rLQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_C98AKuVLEeWFGvPgvi3rLQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_C98AK-VLEeWFGvPgvi3rLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C98ALOVLEeWFGvPgvi3rLQ"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_CUPi4OVLEeWFGvPgvi3rLQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C98AIeVLEeWFGvPgvi3rLQ" x="793" y="38"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_lN77kXc8EeGEMdTf3PnPPg"/>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_2LvgAOVKEeWFGvPgvi3rLQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-  <element xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>

-  <edges xmi:type="notation:Connector" xmi:id="_Ipl7YOVLEeWFGvPgvi3rLQ" type="4002" source="_8_pcwOVKEeWFGvPgvi3rLQ" target="_C98AIOVLEeWFGvPgvi3rLQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Ipl7Y-VLEeWFGvPgvi3rLQ" type="6007">

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JIkWYOVLEeWFGvPgvi3rLQ" name="IS_UPDATED_POSITION" booleanValue="true"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ipl7ZOVLEeWFGvPgvi3rLQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ipl7YeVLEeWFGvPgvi3rLQ"/>

-    <element xmi:type="uml:Generalization" href="testProfile.profile.uml#_IpJ2gOVLEeWFGvPgvi3rLQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ipl7YuVLEeWFGvPgvi3rLQ" points="[848, 122, -643984, -643984]$[848, 110, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IrO6IOVLEeWFGvPgvi3rLQ" id="(0.4,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IrO6IeVLEeWFGvPgvi3rLQ" id="(0.6074766355140186,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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_lN77kHc8EeGEMdTf3PnPPg" type="PapyrusUMLProfileDiagram" name="ProfileDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_Ij0egM0eEeKwCqQbxnBb_w" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Ij9ocM0eEeKwCqQbxnBb_w" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_IkHZcM0eEeKwCqQbxnBb_w" type="1071">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IktPUM0eEeKwCqQbxnBb_w" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IktPUc0eEeKwCqQbxnBb_w" key="showTitle" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_KA8j0M0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_dcMxQGkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KA8j0c0eEeKwCqQbxnBb_w" x="44" y="24"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_KCliks0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_meyzIGkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KClik80eEeKwCqQbxnBb_w" x="44" y="24"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_KCvTkM0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_wshLYGkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KCvTkc0eEeKwCqQbxnBb_w" x="44" y="24"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_KCvTks0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_1ta5cGkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KCvTk80eEeKwCqQbxnBb_w" x="44" y="24"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_KCvTlM0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_71vikGkdEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KCvTlc0eEeKwCqQbxnBb_w" x="44" y="24"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_KC4dgM0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_BfRW4GkeEeGGJOTenKBKAg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KC4dgc0eEeKwCqQbxnBb_w" x="44" y="24"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_KC4dgs0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Lb0QgGz4EeGEKeJyQaxg3g"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KC4dg80eEeKwCqQbxnBb_w" x="44" y="24"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_KC4dhM0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_jAiq8G38EeGag98Jn1kDVw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KC4dhc0eEeKwCqQbxnBb_w" x="44" y="24"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_RfkRgM0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Re-boM0eEeKwCqQbxnBb_w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_RfkRgc0eEeKwCqQbxnBb_w"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Y4iDIM0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Y4YSIM0eEeKwCqQbxnBb_w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y4iDIc0eEeKwCqQbxnBb_w"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_ZvIT8M0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Zu-i8M0eEeKwCqQbxnBb_w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZvIT8c0eEeKwCqQbxnBb_w"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_aEaAYM0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_aEQPYM0eEeKwCqQbxnBb_w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_aEaAYc0eEeKwCqQbxnBb_w"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_aXJWMM0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_aXAMQM0eEeKwCqQbxnBb_w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_aXJWMc0eEeKwCqQbxnBb_w"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_vILVIM0eEeKwCqQbxnBb_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_vH4aMM0eEeKwCqQbxnBb_w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vILVIc0eEeKwCqQbxnBb_w"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_VEXbsM0jEeKjW9KkdY00_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDBX4M0jEeKjW9KkdY00_w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VEXbsc0jEeKjW9KkdY00_w"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Si-4gM0tEeKjW9KkdY00_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_SivA4M0tEeKjW9KkdY00_w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Si-4gc0tEeKjW9KkdY00_w"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_VD9AcM0tEeKjW9KkdY00_w" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDuW8M0tEeKjW9KkdY00_w"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VD9Acc0tEeKjW9KkdY00_w"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IkHZcc0eEeKwCqQbxnBb_w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_IkHZcs0eEeKwCqQbxnBb_w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_IkHZc80eEeKwCqQbxnBb_w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IkHZdM0eEeKwCqQbxnBb_w"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_IkHZdc0eEeKwCqQbxnBb_w" visible="false" type="1019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IktPUs0eEeKwCqQbxnBb_w" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IktPU80eEeKwCqQbxnBb_w" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IkHZds0eEeKwCqQbxnBb_w"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_IkHZd80eEeKwCqQbxnBb_w"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_IkHZeM0eEeKwCqQbxnBb_w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IkHZec0eEeKwCqQbxnBb_w"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_In1b0M0eEeKwCqQbxnBb_w" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_In1b080eEeKwCqQbxnBb_w" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_In1b1M0eEeKwCqQbxnBb_w" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_In1b0c0eEeKwCqQbxnBb_w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_In1b0s0eEeKwCqQbxnBb_w"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ij0egc0eEeKwCqQbxnBb_w" x="215" y="95"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_8_pcwOVKEeWFGvPgvi3rLQ" type="1026">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-9V4gOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-9V4geVKEeWFGvPgvi3rLQ" key="canonical" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8_zNwOVKEeWFGvPgvi3rLQ" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_8_zNweVKEeWFGvPgvi3rLQ" type="1071">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_8gkOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HoOVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_--a2kOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9HoeVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HouVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575-8eVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--a2keVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--cEsOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9Ho-VKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HpOVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575-9OVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--cEseVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--cEsuVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9HpeVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HpuVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575-9eVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--cEs-VKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--crwOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9Hp-VKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HqOVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575--eVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--crweVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--dS0OVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9HqeVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HquVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575-_eVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--dS0eVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--d54OVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9Hq-VKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9HrOVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_AeVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--d54eVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--d54uVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9usOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9useVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_BeVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--d54-VKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--eg8OVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9usuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9us-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_CeVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--eg8eVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--fIAOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9utOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uteVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_CuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--fIAeVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--fvEOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9utuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9ut-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_DuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--fvEeVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--gWIOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uuOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uueVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_EuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--gWIeVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--g9MOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uuuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uu-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_FuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--g9MeVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--hkQOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uvOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uveVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_GuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--hkQeVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--iLUOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uvuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uv-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_HuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--iLUeVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--iyYOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_9uwOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_9uweVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_IuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--iyYeVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--iyYuVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_-VwOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_-VweVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_JuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--iyY-VKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--jZcOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_-VwuVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_-Vw-VKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_KuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--jZceVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_--kAgOVKEeWFGvPgvi3rLQ" type="3002">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-_-VxOVKEeWFGvPgvi3rLQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-_-VxeVKEeWFGvPgvi3rLQ" key="mutable" value="true"/>
+        </eAnnotations>
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_575_LuVKEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_--kAgeVKEeWFGvPgvi3rLQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8_zNwuVKEeWFGvPgvi3rLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_8_zNw-VKEeWFGvPgvi3rLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8_zNxOVKEeWFGvPgvi3rLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8_zNxeVKEeWFGvPgvi3rLQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_8_zNxuVKEeWFGvPgvi3rLQ" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8_zNx-VKEeWFGvPgvi3rLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_8_zNyOVKEeWFGvPgvi3rLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8_zNyeVKEeWFGvPgvi3rLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8_zNyuVKEeWFGvPgvi3rLQ"/>
+    </children>
+    <styles xmi:type="notation:CanonicalStyle" xmi:id="_-9UDUOVKEeWFGvPgvi3rLQ" canonical="false"/>
+    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_575-8OVKEeWFGvPgvi3rLQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8_pcweVKEeWFGvPgvi3rLQ" x="736" y="175"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_C98AIOVLEeWFGvPgvi3rLQ" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_C98AIuVLEeWFGvPgvi3rLQ" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_C98AI-VLEeWFGvPgvi3rLQ" type="1071">
+      <children xmi:type="notation:Shape" xmi:id="_FL998OVLEeWFGvPgvi3rLQ" type="3002">
+        <element xmi:type="uml:Property" href="testProfile.profile.uml#_FLrDAOVLEeWFGvPgvi3rLQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FL998eVLEeWFGvPgvi3rLQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_C98AJOVLEeWFGvPgvi3rLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_C98AJeVLEeWFGvPgvi3rLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_C98AJuVLEeWFGvPgvi3rLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C98AJ-VLEeWFGvPgvi3rLQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_C98AKOVLEeWFGvPgvi3rLQ" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_C98AKeVLEeWFGvPgvi3rLQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_C98AKuVLEeWFGvPgvi3rLQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_C98AK-VLEeWFGvPgvi3rLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C98ALOVLEeWFGvPgvi3rLQ"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_CUPi4OVLEeWFGvPgvi3rLQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C98AIeVLEeWFGvPgvi3rLQ" x="793" y="38"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_lN77kXc8EeGEMdTf3PnPPg"/>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_2LvgAOVKEeWFGvPgvi3rLQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <element xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>
+  <edges xmi:type="notation:Connector" xmi:id="_Ipl7YOVLEeWFGvPgvi3rLQ" type="4002" source="_8_pcwOVKEeWFGvPgvi3rLQ" target="_C98AIOVLEeWFGvPgvi3rLQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Ipl7Y-VLEeWFGvPgvi3rLQ" type="6007">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JIkWYOVLEeWFGvPgvi3rLQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ipl7ZOVLEeWFGvPgvi3rLQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Ipl7YeVLEeWFGvPgvi3rLQ"/>
+    <element xmi:type="uml:Generalization" href="testProfile.profile.uml#_IpJ2gOVLEeWFGvPgvi3rLQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ipl7YuVLEeWFGvPgvi3rLQ" points="[848, 122, -643984, -643984]$[848, 110, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IrO6IOVLEeWFGvPgvi3rLQ" id="(0.4,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IrO6IeVLEeWFGvPgvi3rLQ" id="(0.6074766355140186,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.uml
index 3720888ee5b..b869c8ea9ab 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/testProfile.profile.uml
@@ -1,711 +1,711 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_UVrRoGkdEeGGJOTenKBKAg" name="testProfile" metaclassReference="_YcYBQGkdEeGGJOTenKBKAg">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CL6gEHc4EeGpWpXSc4xZww" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_OvT8cOVLEeWFGvPgvi3rLQ" name="testProfile" nsURI="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvdtoeVLEeWFGvPgvi3rLQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OvdtouVLEeWFGvPgvi3rLQ" key="Version" value="0.0.6"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ovdto-VLEeWFGvPgvi3rLQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OvdtpOVLEeWFGvPgvi3rLQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OvdtpeVLEeWFGvPgvi3rLQ" key="Date" value="2016-03-08"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OvdtpuVLEeWFGvPgvi3rLQ" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvT8ceVLEeWFGvPgvi3rLQ" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8cuVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8c-VLEeWFGvPgvi3rLQ" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_OvT8l-VLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8deVLEeWFGvPgvi3rLQ" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8d-VLEeWFGvPgvi3rLQ" name="testUnaryReftoStereotype2" ordered="false" eType="_OvT8l-VLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8eeVLEeWFGvPgvi3rLQ" name="testDataType" ordered="false" lowerBound="1" eType="_OvT8m-VLEeWFGvPgvi3rLQ" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8e-VLEeWFGvPgvi3rLQ" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_OvT8neVLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8feVLEeWFGvPgvi3rLQ" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8f-VLEeWFGvPgvi3rLQ" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8geVLEeWFGvPgvi3rLQ" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8g-VLEeWFGvPgvi3rLQ" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_OvT8n-VLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8heVLEeWFGvPgvi3rLQ" name="testMultiDataType" ordered="false" upperBound="-1" eType="_OvT8m-VLEeWFGvPgvi3rLQ" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8h-VLEeWFGvPgvi3rLQ" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_OvT8neVLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8ieVLEeWFGvPgvi3rLQ" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8i-VLEeWFGvPgvi3rLQ" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_OvT8n-VLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8jeVLEeWFGvPgvi3rLQ" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8j-VLEeWFGvPgvi3rLQ" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8keVLEeWFGvPgvi3rLQ" name="testString" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8k-VLEeWFGvPgvi3rLQ" name="testReal" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8leVLEeWFGvPgvi3rLQ" name="testMultiReal" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvT8l-VLEeWFGvPgvi3rLQ" name="Stereotype2">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8mOVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8meVLEeWFGvPgvi3rLQ" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvT8m-VLEeWFGvPgvi3rLQ" name="DataType1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8nOVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_OvT8neVLEeWFGvPgvi3rLQ" name="MyPrimitiveType" instanceClassName="java.lang.String">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8nuVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_OvT8n-VLEeWFGvPgvi3rLQ" name="Enumeration1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8oOVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_OvT8oeVLEeWFGvPgvi3rLQ" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_OvT8ouVLEeWFGvPgvi3rLQ" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_OvT8o-VLEeWFGvPgvi3rLQ" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvT8pOVLEeWFGvPgvi3rLQ" name="Stereotype3" eSuperTypes="_OvdtjuVLEeWFGvPgvi3rLQ">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8peVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_575-8OVKEeWFGvPgvi3rLQ"/>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8puVLEeWFGvPgvi3rLQ" source="duplicates">

-          <contents xmi:type="ecore:EReference" xmi:id="_OvT8p-VLEeWFGvPgvi3rLQ" name="base_Element" ordered="false" lowerBound="1">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8qOVLEeWFGvPgvi3rLQ" source="redefines" references="_OvdtkuVLEeWFGvPgvi3rLQ"/>

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-          </contents>

-        </eAnnotations>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8quVLEeWFGvPgvi3rLQ" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_OvT8l-VLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8rOVLEeWFGvPgvi3rLQ" name="testUnaryReftoStereotype2" ordered="false" eType="_OvT8l-VLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8ruVLEeWFGvPgvi3rLQ" name="testDataType" ordered="false" lowerBound="1" eType="_OvT8m-VLEeWFGvPgvi3rLQ" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtceVLEeWFGvPgvi3rLQ" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_OvT8neVLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdtc-VLEeWFGvPgvi3rLQ" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtdeVLEeWFGvPgvi3rLQ" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Ovdtd-VLEeWFGvPgvi3rLQ" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdteeVLEeWFGvPgvi3rLQ" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_OvT8n-VLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Ovdte-VLEeWFGvPgvi3rLQ" name="testMultiDataType" ordered="false" upperBound="-1" eType="_OvT8m-VLEeWFGvPgvi3rLQ" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtfeVLEeWFGvPgvi3rLQ" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_OvT8neVLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdtf-VLEeWFGvPgvi3rLQ" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtgeVLEeWFGvPgvi3rLQ" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_OvT8n-VLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdtg-VLEeWFGvPgvi3rLQ" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtheVLEeWFGvPgvi3rLQ" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdth-VLEeWFGvPgvi3rLQ" name="testString" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtieVLEeWFGvPgvi3rLQ" name="testReal" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdti-VLEeWFGvPgvi3rLQ" name="testMultiReal" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvdtjuVLEeWFGvPgvi3rLQ" name="SuperStereotype">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ovdtj-VLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_CUPi4OVLEeWFGvPgvi3rLQ"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtkOVLEeWFGvPgvi3rLQ" name="id" ordered="false" lowerBound="1" defaultValueLiteral="">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvdtkuVLEeWFGvPgvi3rLQ" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_dqAQQM0tEeKjW9KkdY00_w" name="testProfile" nsURI="http:///schemas/testProfile/_dg9pAM0tEeKjW9KkdY00_w/4" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dq95kM0tEeKjW9KkdY00_w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95kc0tEeKjW9KkdY00_w" key="Version" value="0.0.5"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95ks0tEeKjW9KkdY00_w" key="Comment" value="update profile for multi evaluation"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95k80tEeKjW9KkdY00_w" key="Copyright" value="CEA LIST"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95lM0tEeKjW9KkdY00_w" key="Date" value="2013-06-04"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95lc0tEeKjW9KkdY00_w" key="Author" value="P. Tessier"/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dqAQQc0tEeKjW9KkdY00_w" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQQs0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQQ80tEeKjW9KkdY00_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_dqAQZ80tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQRc0tEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQR80tEeKjW9KkdY00_w" name="testUnaryReftoStereotype2" ordered="false" eType="_dqAQZ80tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQSc0tEeKjW9KkdY00_w" name="testDataType" ordered="false" lowerBound="1" eType="_dqAQa80tEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQS80tEeKjW9KkdY00_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_dqAQbc0tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQTc0tEeKjW9KkdY00_w" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQT80tEeKjW9KkdY00_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQUc0tEeKjW9KkdY00_w" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQU80tEeKjW9KkdY00_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_dqAQb80tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQVc0tEeKjW9KkdY00_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_dqAQa80tEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQV80tEeKjW9KkdY00_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_dqAQbc0tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQWc0tEeKjW9KkdY00_w" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQW80tEeKjW9KkdY00_w" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_dqAQb80tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQXc0tEeKjW9KkdY00_w" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQX80tEeKjW9KkdY00_w" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQYc0tEeKjW9KkdY00_w" name="testString" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQY80tEeKjW9KkdY00_w" name="testReal" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQZc0tEeKjW9KkdY00_w" name="testMultiReal" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dqAQZ80tEeKjW9KkdY00_w" name="Stereotype2">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQaM0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQac0tEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dqAQa80tEeKjW9KkdY00_w" name="DataType1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQbM0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_dqAQbc0tEeKjW9KkdY00_w" name="MyPrimitiveType" instanceClassName="java.lang.String">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQbs0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_dqAQb80tEeKjW9KkdY00_w" name="Enumeration1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQcM0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dqAQcc0tEeKjW9KkdY00_w" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dqAQcs0tEeKjW9KkdY00_w" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dqAQc80tEeKjW9KkdY00_w" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_4y4JwM0nEeKjW9KkdY00_w" name="testProfile" nsURI="http:///schemas/testProfile/_4qj7QM0nEeKjW9KkdY00_w/3" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4zxhoM0nEeKjW9KkdY00_w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhoc0nEeKjW9KkdY00_w" key="Version" value="0.0.4"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhos0nEeKjW9KkdY00_w" key="Comment" value="update profile for multi evaluation"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxho80nEeKjW9KkdY00_w" key="Copyright" value="CEA LIST"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhpM0nEeKjW9KkdY00_w" key="Date" value="2013-06-04"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhpc0nEeKjW9KkdY00_w" key="Author" value="P. Tessier"/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4y4Jwc0nEeKjW9KkdY00_w" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4Jws0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jw80nEeKjW9KkdY00_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_4y4J480nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jxc0nEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jx80nEeKjW9KkdY00_w" name="testUnaryReftoStereotype2" ordered="false" eType="_4y4J480nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jyc0nEeKjW9KkdY00_w" name="testDataType" ordered="false" lowerBound="1" eType="_4y4J580nEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4Jy80nEeKjW9KkdY00_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_4y4J6c0nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4Jzc0nEeKjW9KkdY00_w" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4Jz80nEeKjW9KkdY00_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4J0c0nEeKjW9KkdY00_w" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J080nEeKjW9KkdY00_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_4y4J680nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4J1c0nEeKjW9KkdY00_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_4y4J580nEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J180nEeKjW9KkdY00_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_4y4J6c0nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J2c0nEeKjW9KkdY00_w" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J280nEeKjW9KkdY00_w" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_4y4J680nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J3c0nEeKjW9KkdY00_w" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J380nEeKjW9KkdY00_w" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J4c0nEeKjW9KkdY00_w" name="testString" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4y4J480nEeKjW9KkdY00_w" name="Stereotype2">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4J5M0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4J5c0nEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4y4J580nEeKjW9KkdY00_w" name="DataType1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4J6M0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_4y4J6c0nEeKjW9KkdY00_w" name="MyPrimitiveType" instanceClassName="java.lang.String">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4J6s0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_4y4J680nEeKjW9KkdY00_w" name="Enumeration1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4J7M0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4y4J7c0nEeKjW9KkdY00_w" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4y4J7s0nEeKjW9KkdY00_w" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4y4J780nEeKjW9KkdY00_w" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_bx4ckM0jEeKjW9KkdY00_w" name="testProfile" nsURI="http:///schemas/testProfile/_bs09cM0jEeKjW9KkdY00_w/2" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_by6-YM0jEeKjW9KkdY00_w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Yc0jEeKjW9KkdY00_w" key="Version" value="0.0.3"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Ys0jEeKjW9KkdY00_w" key="Comment" value="add test"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Y80jEeKjW9KkdY00_w" key="Copyright" value="CEA LIST"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-ZM0jEeKjW9KkdY00_w" key="Date" value="2013-06-04"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Zc0jEeKjW9KkdY00_w" key="Author" value="P. Tessier"/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_bx4ckc0jEeKjW9KkdY00_w" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4cks0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4ck80jEeKjW9KkdY00_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_bx4cs80jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4clc0jEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4cl80jEeKjW9KkdY00_w" name="testUnaryReftoStereotype2" ordered="false" eType="_bx4cs80jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4cmc0jEeKjW9KkdY00_w" name="testDataType" ordered="false" lowerBound="1" eType="_bx4ct80jEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cm80jEeKjW9KkdY00_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_bx4cuc0jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cnc0jEeKjW9KkdY00_w" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cn80jEeKjW9KkdY00_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4coc0jEeKjW9KkdY00_w" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4co80jEeKjW9KkdY00_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_bx4cu80jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4cpc0jEeKjW9KkdY00_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_bx4ct80jEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cp80jEeKjW9KkdY00_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_bx4cuc0jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cqc0jEeKjW9KkdY00_w" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cq80jEeKjW9KkdY00_w" name="testMultiEnumeration" ordered="false" upperBound="-1" eType="_bx4cu80jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4crc0jEeKjW9KkdY00_w" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cr80jEeKjW9KkdY00_w" name="testMultiBoolean" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4csc0jEeKjW9KkdY00_w" name="testString" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_bx4cs80jEeKjW9KkdY00_w" name="Stereotype2">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4ctM0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4ctc0jEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_bx4ct80jEeKjW9KkdY00_w" name="DataType1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4cuM0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_bx4cuc0jEeKjW9KkdY00_w" name="MyPrimitiveType" instanceClassName="java.lang.String">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4cus0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_bx4cu80jEeKjW9KkdY00_w" name="Enumeration1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4cvM0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_bx4cvc0jEeKjW9KkdY00_w" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_bx4cvs0jEeKjW9KkdY00_w" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_bx4cv80jEeKjW9KkdY00_w" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_4q5okM0eEeKwCqQbxnBb_w" name="testProfile" nsURI="http:///schemas/testProfile/_4lZdgM0eEeKwCqQbxnBb_w/1" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4r8xcM0eEeKwCqQbxnBb_w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xcc0eEeKwCqQbxnBb_w" key="Version" value="0.0.2"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xcs0eEeKwCqQbxnBb_w" key="Comment" value="Add new Test"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xc80eEeKwCqQbxnBb_w" key="Copyright" value="CEA LIST"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xdM0eEeKwCqQbxnBb_w" key="Date" value="2013-06-04"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xdc0eEeKwCqQbxnBb_w" key="Author" value="P. Tessier"/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4q5okc0eEeKwCqQbxnBb_w" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5oks0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5ok80eEeKwCqQbxnBb_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_4q5osc0eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5olc0eEeKwCqQbxnBb_w" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5ol80eEeKwCqQbxnBb_w" name="testUnaryReftoStereotype2" ordered="false" eType="_4q5osc0eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5omc0eEeKwCqQbxnBb_w" name="testDataType" ordered="false" lowerBound="1" eType="_4q5otc0eEeKwCqQbxnBb_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5om80eEeKwCqQbxnBb_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_4q5ot80eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5onc0eEeKwCqQbxnBb_w" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5on80eEeKwCqQbxnBb_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5ooc0eEeKwCqQbxnBb_w" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5oo80eEeKwCqQbxnBb_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_4q5ouc0eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5opc0eEeKwCqQbxnBb_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_4q5otc0eEeKwCqQbxnBb_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5op80eEeKwCqQbxnBb_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_4q5ot80eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5oqc0eEeKwCqQbxnBb_w" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5oq80eEeKwCqQbxnBb_w" name="testMultiEnumeration" ordered="false" upperBound="-1" eType="_4q5ouc0eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5orc0eEeKwCqQbxnBb_w" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5or80eEeKwCqQbxnBb_w" name="testMultiBoolean" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4q5osc0eEeKwCqQbxnBb_w" name="Stereotype2">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5oss0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5os80eEeKwCqQbxnBb_w" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4q5otc0eEeKwCqQbxnBb_w" name="DataType1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5ots0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_4q5ot80eEeKwCqQbxnBb_w" name="MyPrimitiveType" instanceClassName="java.lang.String">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5ouM0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_4q5ouc0eEeKwCqQbxnBb_w" name="Enumeration1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5ous0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4q5ou80eEeKwCqQbxnBb_w" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4q5ovM0eEeKwCqQbxnBb_w" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4q5ovc0eEeKwCqQbxnBb_w" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_sVoXAHc8EeGEMdTf3PnPPg" name="testProfile" nsURI="http:///schemas/testProfile/_rNfDMHc8EeGEMdTf3PnPPg/0" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v37ZEXc8EeGEMdTf3PnPPg" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZEnc8EeGEMdTf3PnPPg" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZE3c8EeGEMdTf3PnPPg" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZFHc8EeGEMdTf3PnPPg" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZFXc8EeGEMdTf3PnPPg" key="Date" value="2012-03-26"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZFnc8EeGEMdTf3PnPPg" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_sVoXAXc8EeGEMdTf3PnPPg" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sVoXAnc8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVo-EHc8EeGEMdTf3PnPPg" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_sVqMMnc8EeGEMdTf3PnPPg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVo-Enc8EeGEMdTf3PnPPg" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVo-FHc8EeGEMdTf3PnPPg" name="testUnaryReftoStereotype2" ordered="false" eType="_sVqMMnc8EeGEMdTf3PnPPg"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVplIHc8EeGEMdTf3PnPPg" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_sVqzQHc8EeGEMdTf3PnPPg"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVplInc8EeGEMdTf3PnPPg" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVplJHc8EeGEMdTf3PnPPg" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVplJnc8EeGEMdTf3PnPPg" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVqMMHc8EeGEMdTf3PnPPg" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_sVqzQnc8EeGEMdTf3PnPPg"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_v33HoHc8EeGEMdTf3PnPPg" name="testDataType" ordered="false" lowerBound="1" eType="_v33usHc8EeGEMdTf3PnPPg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_sVqMMnc8EeGEMdTf3PnPPg" name="Stereotype2">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sVqMM3c8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVqMNHc8EeGEMdTf3PnPPg" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_sVqzQHc8EeGEMdTf3PnPPg" name="MyPrimitiveType" instanceClassName="java.lang.String">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sVqzQXc8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_sVqzQnc8EeGEMdTf3PnPPg" name="Enumeration1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sVqzQ3c8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_sVqzRHc8EeGEMdTf3PnPPg" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_sVqzRXc8EeGEMdTf3PnPPg" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_sVqzRnc8EeGEMdTf3PnPPg" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_v33usHc8EeGEMdTf3PnPPg" name="DataType1" instanceClassName="java.lang.String">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v33usXc8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_YcYBQGkdEeGGJOTenKBKAg" alias="Element">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-  </elementImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_UVrRomkdEeGGJOTenKBKAg">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_WJYD4GkdEeGGJOTenKBKAg" name="Stereotype1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_dcMxQGkdEeGGJOTenKBKAg" name="testReftoStereotype2" type="_WxelsGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jnpm4GkdEeGGJOTenKBKAg"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jnpm4WkdEeGGJOTenKBKAg" value="*"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_erNiEGkdEeGGJOTenKBKAg" name="base_Element" association="_erNiEWkdEeGGJOTenKBKAg">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_meyzIGkdEeGGJOTenKBKAg" name="testUnaryReftoStereotype2" visibility="public" type="_WxelsGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vekKgGkdEeGGJOTenKBKAg"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vekKgWkdEeGGJOTenKBKAg" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_vetUcGkdEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_wshLYGkdEeGGJOTenKBKAg" name="testDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1DBRkGkdEeGGJOTenKBKAg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1DBRkWkdEeGGJOTenKBKAg" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_1DBRkmkdEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_1ta5cGkdEeGGJOTenKBKAg" name="testMyPrimituveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7KKO8GkdEeGGJOTenKBKAg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7KKO8WkdEeGGJOTenKBKAg" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_7KTY4GkdEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_71vikGkdEeGGJOTenKBKAg" name="testInt" visibility="public" isUnique="false">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AhPBUGkeEeGGJOTenKBKAg"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AhPBUWkeEeGGJOTenKBKAg" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_AhPBUmkeEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_BfRW4GkeEeGGJOTenKBKAg" name="testMultiString" visibility="public" isUnique="false">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HnmnEGkeEeGGJOTenKBKAg"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HnmnEWkeEeGGJOTenKBKAg" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_HnmnEmkeEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Lb0QgGz4EeGEKeJyQaxg3g" name="testRefToMetaclass">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_jAiq8G38EeGag98Jn1kDVw" name="testRefToEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jQ6CMG38EeGag98Jn1kDVw" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jQ6CMW38EeGag98Jn1kDVw" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_jQ6CMm38EeGag98Jn1kDVw">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Re-boM0eEeKwCqQbxnBb_w" name="testMultiDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XjIWcM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XjSHcM0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_XjlCYM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Y4YSIM0eEeKwCqQbxnBb_w" name="testMultiprimitiveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e4YFsM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e4hPoM0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_e40KkM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Zu-i8M0eEeKwCqQbxnBb_w" name="testMultiInt" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jNivIM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jNivIc0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_jN1qEM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_aEQPYM0eEeKwCqQbxnBb_w" name="testMultiEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg" isUnique="false">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_or6cUM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_or6cUc0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_osNXQM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_aXAMQM0eEeKwCqQbxnBb_w" name="testBoolean" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ujbpUM0eEeKwCqQbxnBb_w" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ujkzQM0eEeKwCqQbxnBb_w" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_uj3uMM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_vH4aMM0eEeKwCqQbxnBb_w" name="testMultiBoolean" visibility="public" isUnique="false">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0qj_oM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0qtwoM0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0rArkM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_VDBX4M0jEeKjW9KkdY00_w" name="testString" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YNNb8M0jEeKjW9KkdY00_w" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YNg98M0jEeKjW9KkdY00_w" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_YOGz0M0jEeKjW9KkdY00_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_SivA4M0tEeKjW9KkdY00_w" name="testReal" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UppDAM0tEeKjW9KkdY00_w" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Upxl4M0tEeKjW9KkdY00_w" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_UqG9EM0tEeKjW9KkdY00_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_VDuW8M0tEeKjW9KkdY00_w" name="testMultiReal" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z-yiwM0tEeKjW9KkdY00_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z-53gM0tEeKjW9KkdY00_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_Z_MLYM0tEeKjW9KkdY00_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_WxelsGkdEeGGJOTenKBKAg" name="Stereotype2">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_fTFaYGkdEeGGJOTenKBKAg" name="base_Element" association="_fTFaYWkdEeGGJOTenKBKAg">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_Zym0YGkdEeGGJOTenKBKAg" name="Enumeration1">

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_fc4W8G38EeGag98Jn1kDVw" name="EnumerationLiteral1"/>

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_f6NMIG38EeGag98Jn1kDVw" name="EnumerationLiteral2"/>

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gPCzsG38EeGag98Jn1kDVw" name="EnumerationLiteral3"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_aNRXIGkdEeGGJOTenKBKAg" name="DataType1"/>

-  <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_apMeIGkdEeGGJOTenKBKAg" name="MyPrimitiveType"/>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_erNiEWkdEeGGJOTenKBKAg" name="E_Stereotype1_Element1" memberEnd="_erNiEmkdEeGGJOTenKBKAg _erNiEGkdEeGGJOTenKBKAg">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_erNiEmkdEeGGJOTenKBKAg" name="extension_Stereotype1" type="_WJYD4GkdEeGGJOTenKBKAg" aggregation="composite" association="_erNiEWkdEeGGJOTenKBKAg"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_fTFaYWkdEeGGJOTenKBKAg" name="E_Stereotype2_Element1" memberEnd="_fTFaYmkdEeGGJOTenKBKAg _fTFaYGkdEeGGJOTenKBKAg">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_fTFaYmkdEeGGJOTenKBKAg" name="extension_Stereotype2" type="_WxelsGkdEeGGJOTenKBKAg" aggregation="composite" association="_fTFaYWkdEeGGJOTenKBKAg"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_575-8OVKEeWFGvPgvi3rLQ" name="Stereotype3">

-    <generalization xmi:type="uml:Generalization" xmi:id="_IpJ2gOVLEeWFGvPgvi3rLQ" general="_CUPi4OVLEeWFGvPgvi3rLQ"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575-8eVKEeWFGvPgvi3rLQ" name="testReftoStereotype2" type="_WxelsGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575-8uVKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575-8-VKEeWFGvPgvi3rLQ" value="*"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575-9OVKEeWFGvPgvi3rLQ" name="base_Element">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575-9eVKEeWFGvPgvi3rLQ" name="testUnaryReftoStereotype2" visibility="public" type="_WxelsGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575-9uVKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575-9-VKEeWFGvPgvi3rLQ" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575--OVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575--eVKEeWFGvPgvi3rLQ" name="testDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575--uVKEeWFGvPgvi3rLQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575---VKEeWFGvPgvi3rLQ" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575-_OVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575-_eVKEeWFGvPgvi3rLQ" name="testMyPrimituveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575-_uVKEeWFGvPgvi3rLQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575-_-VKEeWFGvPgvi3rLQ" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_AOVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_AeVKEeWFGvPgvi3rLQ" name="testInt" visibility="public" isUnique="false">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_AuVKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_A-VKEeWFGvPgvi3rLQ" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_BOVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_BeVKEeWFGvPgvi3rLQ" name="testMultiString" visibility="public" isUnique="false">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_BuVKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_B-VKEeWFGvPgvi3rLQ" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_COVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_CeVKEeWFGvPgvi3rLQ" name="testRefToMetaclass">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_CuVKEeWFGvPgvi3rLQ" name="testRefToEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_C-VKEeWFGvPgvi3rLQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_DOVKEeWFGvPgvi3rLQ" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_DeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_DuVKEeWFGvPgvi3rLQ" name="testMultiDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_D-VKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_EOVKEeWFGvPgvi3rLQ" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_EeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_EuVKEeWFGvPgvi3rLQ" name="testMultiprimitiveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_E-VKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_FOVKEeWFGvPgvi3rLQ" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_FeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_FuVKEeWFGvPgvi3rLQ" name="testMultiInt" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_F-VKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_GOVKEeWFGvPgvi3rLQ" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_GeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_GuVKEeWFGvPgvi3rLQ" name="testMultiEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg" isUnique="false">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_G-VKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_HOVKEeWFGvPgvi3rLQ" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_HeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_HuVKEeWFGvPgvi3rLQ" name="testBoolean" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_H-VKEeWFGvPgvi3rLQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_IOVKEeWFGvPgvi3rLQ" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_IeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_IuVKEeWFGvPgvi3rLQ" name="testMultiBoolean" visibility="public" isUnique="false">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_I-VKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_JOVKEeWFGvPgvi3rLQ" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_JeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_JuVKEeWFGvPgvi3rLQ" name="testString" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_J-VKEeWFGvPgvi3rLQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_KOVKEeWFGvPgvi3rLQ" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_KeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_KuVKEeWFGvPgvi3rLQ" name="testReal" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_K-VKEeWFGvPgvi3rLQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_LOVKEeWFGvPgvi3rLQ" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_LeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_LuVKEeWFGvPgvi3rLQ" name="testMultiReal" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_L-VKEeWFGvPgvi3rLQ"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_MOVKEeWFGvPgvi3rLQ" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_MeVKEeWFGvPgvi3rLQ">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_CUPi4OVLEeWFGvPgvi3rLQ" name="SuperStereotype">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_FLrDAOVLEeWFGvPgvi3rLQ" name="id">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hf36QOVLEeWFGvPgvi3rLQ" value=""/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_MLmCgeVLEeWFGvPgvi3rLQ" name="base_Element" association="_MLc4kOVLEeWFGvPgvi3rLQ">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_MLc4kOVLEeWFGvPgvi3rLQ" name="E_SuperStereotype_Element1" memberEnd="_MLmCgOVLEeWFGvPgvi3rLQ _MLmCgeVLEeWFGvPgvi3rLQ">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_MLmCgOVLEeWFGvPgvi3rLQ" name="extension_SuperStereotype" type="_CUPi4OVLEeWFGvPgvi3rLQ" aggregation="composite" association="_MLc4kOVLEeWFGvPgvi3rLQ"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_UVrRoGkdEeGGJOTenKBKAg" name="testProfile" metaclassReference="_YcYBQGkdEeGGJOTenKBKAg">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CL6gEHc4EeGpWpXSc4xZww" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_OvT8cOVLEeWFGvPgvi3rLQ" name="testProfile" nsURI="http:///schemas/testProfile/_OihdoOVLEeWFGvPgvi3rLQ/5" nsPrefix="testProfile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvdtoeVLEeWFGvPgvi3rLQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OvdtouVLEeWFGvPgvi3rLQ" key="Version" value="0.0.6"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ovdto-VLEeWFGvPgvi3rLQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OvdtpOVLEeWFGvPgvi3rLQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OvdtpeVLEeWFGvPgvi3rLQ" key="Date" value="2016-03-08"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OvdtpuVLEeWFGvPgvi3rLQ" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvT8ceVLEeWFGvPgvi3rLQ" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8cuVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8c-VLEeWFGvPgvi3rLQ" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_OvT8l-VLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8deVLEeWFGvPgvi3rLQ" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8d-VLEeWFGvPgvi3rLQ" name="testUnaryReftoStereotype2" ordered="false" eType="_OvT8l-VLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8eeVLEeWFGvPgvi3rLQ" name="testDataType" ordered="false" lowerBound="1" eType="_OvT8m-VLEeWFGvPgvi3rLQ" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8e-VLEeWFGvPgvi3rLQ" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_OvT8neVLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8feVLEeWFGvPgvi3rLQ" name="testInt" ordered="false" unique="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8f-VLEeWFGvPgvi3rLQ" name="testMultiString" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8geVLEeWFGvPgvi3rLQ" name="testRefToMetaclass" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8g-VLEeWFGvPgvi3rLQ" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_OvT8n-VLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8heVLEeWFGvPgvi3rLQ" name="testMultiDataType" ordered="false" upperBound="-1" eType="_OvT8m-VLEeWFGvPgvi3rLQ" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8h-VLEeWFGvPgvi3rLQ" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_OvT8neVLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8ieVLEeWFGvPgvi3rLQ" name="testMultiInt" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8i-VLEeWFGvPgvi3rLQ" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_OvT8n-VLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8jeVLEeWFGvPgvi3rLQ" name="testBoolean" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8j-VLEeWFGvPgvi3rLQ" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8keVLEeWFGvPgvi3rLQ" name="testString" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8k-VLEeWFGvPgvi3rLQ" name="testReal" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvT8leVLEeWFGvPgvi3rLQ" name="testMultiReal" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvT8l-VLEeWFGvPgvi3rLQ" name="Stereotype2">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8mOVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8meVLEeWFGvPgvi3rLQ" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvT8m-VLEeWFGvPgvi3rLQ" name="DataType1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8nOVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_OvT8neVLEeWFGvPgvi3rLQ" name="MyPrimitiveType" instanceClassName="java.lang.String">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8nuVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_OvT8n-VLEeWFGvPgvi3rLQ" name="Enumeration1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8oOVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_OvT8oeVLEeWFGvPgvi3rLQ" name="EnumerationLiteral1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_OvT8ouVLEeWFGvPgvi3rLQ" name="EnumerationLiteral2" value="1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_OvT8o-VLEeWFGvPgvi3rLQ" name="EnumerationLiteral3" value="2"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvT8pOVLEeWFGvPgvi3rLQ" name="Stereotype3" eSuperTypes="_OvdtjuVLEeWFGvPgvi3rLQ">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8peVLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_575-8OVKEeWFGvPgvi3rLQ"/>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8puVLEeWFGvPgvi3rLQ" source="duplicates">
+          <contents xmi:type="ecore:EReference" xmi:id="_OvT8p-VLEeWFGvPgvi3rLQ" name="base_Element" ordered="false" lowerBound="1">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OvT8qOVLEeWFGvPgvi3rLQ" source="redefines" references="_OvdtkuVLEeWFGvPgvi3rLQ"/>
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+          </contents>
+        </eAnnotations>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8quVLEeWFGvPgvi3rLQ" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_OvT8l-VLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8rOVLEeWFGvPgvi3rLQ" name="testUnaryReftoStereotype2" ordered="false" eType="_OvT8l-VLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvT8ruVLEeWFGvPgvi3rLQ" name="testDataType" ordered="false" lowerBound="1" eType="_OvT8m-VLEeWFGvPgvi3rLQ" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtceVLEeWFGvPgvi3rLQ" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_OvT8neVLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdtc-VLEeWFGvPgvi3rLQ" name="testInt" ordered="false" unique="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtdeVLEeWFGvPgvi3rLQ" name="testMultiString" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Ovdtd-VLEeWFGvPgvi3rLQ" name="testRefToMetaclass" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdteeVLEeWFGvPgvi3rLQ" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_OvT8n-VLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_Ovdte-VLEeWFGvPgvi3rLQ" name="testMultiDataType" ordered="false" upperBound="-1" eType="_OvT8m-VLEeWFGvPgvi3rLQ" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtfeVLEeWFGvPgvi3rLQ" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_OvT8neVLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdtf-VLEeWFGvPgvi3rLQ" name="testMultiInt" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtgeVLEeWFGvPgvi3rLQ" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_OvT8n-VLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdtg-VLEeWFGvPgvi3rLQ" name="testBoolean" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtheVLEeWFGvPgvi3rLQ" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdth-VLEeWFGvPgvi3rLQ" name="testString" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtieVLEeWFGvPgvi3rLQ" name="testReal" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_Ovdti-VLEeWFGvPgvi3rLQ" name="testMultiReal" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_OvdtjuVLEeWFGvPgvi3rLQ" name="SuperStereotype">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ovdtj-VLEeWFGvPgvi3rLQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_CUPi4OVLEeWFGvPgvi3rLQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_OvdtkOVLEeWFGvPgvi3rLQ" name="id" ordered="false" lowerBound="1" defaultValueLiteral="">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_OvdtkuVLEeWFGvPgvi3rLQ" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_dqAQQM0tEeKjW9KkdY00_w" name="testProfile" nsURI="http:///schemas/testProfile/_dg9pAM0tEeKjW9KkdY00_w/4" nsPrefix="testProfile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dq95kM0tEeKjW9KkdY00_w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95kc0tEeKjW9KkdY00_w" key="Version" value="0.0.5"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95ks0tEeKjW9KkdY00_w" key="Comment" value="update profile for multi evaluation"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95k80tEeKjW9KkdY00_w" key="Copyright" value="CEA LIST"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95lM0tEeKjW9KkdY00_w" key="Date" value="2013-06-04"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95lc0tEeKjW9KkdY00_w" key="Author" value="P. Tessier"/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dqAQQc0tEeKjW9KkdY00_w" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQQs0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQQ80tEeKjW9KkdY00_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_dqAQZ80tEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQRc0tEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQR80tEeKjW9KkdY00_w" name="testUnaryReftoStereotype2" ordered="false" eType="_dqAQZ80tEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQSc0tEeKjW9KkdY00_w" name="testDataType" ordered="false" lowerBound="1" eType="_dqAQa80tEeKjW9KkdY00_w" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQS80tEeKjW9KkdY00_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_dqAQbc0tEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQTc0tEeKjW9KkdY00_w" name="testInt" ordered="false" unique="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQT80tEeKjW9KkdY00_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQUc0tEeKjW9KkdY00_w" name="testRefToMetaclass" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQU80tEeKjW9KkdY00_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_dqAQb80tEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQVc0tEeKjW9KkdY00_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_dqAQa80tEeKjW9KkdY00_w" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQV80tEeKjW9KkdY00_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_dqAQbc0tEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQWc0tEeKjW9KkdY00_w" name="testMultiInt" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQW80tEeKjW9KkdY00_w" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_dqAQb80tEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQXc0tEeKjW9KkdY00_w" name="testBoolean" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQX80tEeKjW9KkdY00_w" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQYc0tEeKjW9KkdY00_w" name="testString" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQY80tEeKjW9KkdY00_w" name="testReal" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQZc0tEeKjW9KkdY00_w" name="testMultiReal" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dqAQZ80tEeKjW9KkdY00_w" name="Stereotype2">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQaM0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQac0tEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dqAQa80tEeKjW9KkdY00_w" name="DataType1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQbM0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_dqAQbc0tEeKjW9KkdY00_w" name="MyPrimitiveType" instanceClassName="java.lang.String">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQbs0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_dqAQb80tEeKjW9KkdY00_w" name="Enumeration1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dqAQcM0tEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dqAQcc0tEeKjW9KkdY00_w" name="EnumerationLiteral1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dqAQcs0tEeKjW9KkdY00_w" name="EnumerationLiteral2" value="1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dqAQc80tEeKjW9KkdY00_w" name="EnumerationLiteral3" value="2"/>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_4y4JwM0nEeKjW9KkdY00_w" name="testProfile" nsURI="http:///schemas/testProfile/_4qj7QM0nEeKjW9KkdY00_w/3" nsPrefix="testProfile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4zxhoM0nEeKjW9KkdY00_w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhoc0nEeKjW9KkdY00_w" key="Version" value="0.0.4"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhos0nEeKjW9KkdY00_w" key="Comment" value="update profile for multi evaluation"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxho80nEeKjW9KkdY00_w" key="Copyright" value="CEA LIST"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhpM0nEeKjW9KkdY00_w" key="Date" value="2013-06-04"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhpc0nEeKjW9KkdY00_w" key="Author" value="P. Tessier"/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4y4Jwc0nEeKjW9KkdY00_w" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4Jws0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jw80nEeKjW9KkdY00_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_4y4J480nEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jxc0nEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jx80nEeKjW9KkdY00_w" name="testUnaryReftoStereotype2" ordered="false" eType="_4y4J480nEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jyc0nEeKjW9KkdY00_w" name="testDataType" ordered="false" lowerBound="1" eType="_4y4J580nEeKjW9KkdY00_w" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4Jy80nEeKjW9KkdY00_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_4y4J6c0nEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4Jzc0nEeKjW9KkdY00_w" name="testInt" ordered="false" unique="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4Jz80nEeKjW9KkdY00_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4J0c0nEeKjW9KkdY00_w" name="testRefToMetaclass" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J080nEeKjW9KkdY00_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_4y4J680nEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4J1c0nEeKjW9KkdY00_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_4y4J580nEeKjW9KkdY00_w" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J180nEeKjW9KkdY00_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_4y4J6c0nEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J2c0nEeKjW9KkdY00_w" name="testMultiInt" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J280nEeKjW9KkdY00_w" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_4y4J680nEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J3c0nEeKjW9KkdY00_w" name="testBoolean" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J380nEeKjW9KkdY00_w" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J4c0nEeKjW9KkdY00_w" name="testString" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4y4J480nEeKjW9KkdY00_w" name="Stereotype2">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4J5M0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4J5c0nEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4y4J580nEeKjW9KkdY00_w" name="DataType1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4J6M0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_4y4J6c0nEeKjW9KkdY00_w" name="MyPrimitiveType" instanceClassName="java.lang.String">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4J6s0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_4y4J680nEeKjW9KkdY00_w" name="Enumeration1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4y4J7M0nEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4y4J7c0nEeKjW9KkdY00_w" name="EnumerationLiteral1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4y4J7s0nEeKjW9KkdY00_w" name="EnumerationLiteral2" value="1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4y4J780nEeKjW9KkdY00_w" name="EnumerationLiteral3" value="2"/>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_bx4ckM0jEeKjW9KkdY00_w" name="testProfile" nsURI="http:///schemas/testProfile/_bs09cM0jEeKjW9KkdY00_w/2" nsPrefix="testProfile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_by6-YM0jEeKjW9KkdY00_w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Yc0jEeKjW9KkdY00_w" key="Version" value="0.0.3"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Ys0jEeKjW9KkdY00_w" key="Comment" value="add test"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Y80jEeKjW9KkdY00_w" key="Copyright" value="CEA LIST"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-ZM0jEeKjW9KkdY00_w" key="Date" value="2013-06-04"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Zc0jEeKjW9KkdY00_w" key="Author" value="P. Tessier"/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_bx4ckc0jEeKjW9KkdY00_w" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4cks0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4ck80jEeKjW9KkdY00_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_bx4cs80jEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4clc0jEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4cl80jEeKjW9KkdY00_w" name="testUnaryReftoStereotype2" ordered="false" eType="_bx4cs80jEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4cmc0jEeKjW9KkdY00_w" name="testDataType" ordered="false" lowerBound="1" eType="_bx4ct80jEeKjW9KkdY00_w" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cm80jEeKjW9KkdY00_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_bx4cuc0jEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cnc0jEeKjW9KkdY00_w" name="testInt" ordered="false" unique="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cn80jEeKjW9KkdY00_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4coc0jEeKjW9KkdY00_w" name="testRefToMetaclass" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4co80jEeKjW9KkdY00_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_bx4cu80jEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4cpc0jEeKjW9KkdY00_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_bx4ct80jEeKjW9KkdY00_w" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cp80jEeKjW9KkdY00_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_bx4cuc0jEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cqc0jEeKjW9KkdY00_w" name="testMultiInt" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cq80jEeKjW9KkdY00_w" name="testMultiEnumeration" ordered="false" upperBound="-1" eType="_bx4cu80jEeKjW9KkdY00_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4crc0jEeKjW9KkdY00_w" name="testBoolean" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cr80jEeKjW9KkdY00_w" name="testMultiBoolean" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4csc0jEeKjW9KkdY00_w" name="testString" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_bx4cs80jEeKjW9KkdY00_w" name="Stereotype2">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4ctM0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4ctc0jEeKjW9KkdY00_w" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_bx4ct80jEeKjW9KkdY00_w" name="DataType1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4cuM0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_bx4cuc0jEeKjW9KkdY00_w" name="MyPrimitiveType" instanceClassName="java.lang.String">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4cus0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_bx4cu80jEeKjW9KkdY00_w" name="Enumeration1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bx4cvM0jEeKjW9KkdY00_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_bx4cvc0jEeKjW9KkdY00_w" name="EnumerationLiteral1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_bx4cvs0jEeKjW9KkdY00_w" name="EnumerationLiteral2" value="1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_bx4cv80jEeKjW9KkdY00_w" name="EnumerationLiteral3" value="2"/>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_4q5okM0eEeKwCqQbxnBb_w" name="testProfile" nsURI="http:///schemas/testProfile/_4lZdgM0eEeKwCqQbxnBb_w/1" nsPrefix="testProfile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4r8xcM0eEeKwCqQbxnBb_w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xcc0eEeKwCqQbxnBb_w" key="Version" value="0.0.2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xcs0eEeKwCqQbxnBb_w" key="Comment" value="Add new Test"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xc80eEeKwCqQbxnBb_w" key="Copyright" value="CEA LIST"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xdM0eEeKwCqQbxnBb_w" key="Date" value="2013-06-04"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xdc0eEeKwCqQbxnBb_w" key="Author" value="P. Tessier"/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4q5okc0eEeKwCqQbxnBb_w" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5oks0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5ok80eEeKwCqQbxnBb_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_4q5osc0eEeKwCqQbxnBb_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5olc0eEeKwCqQbxnBb_w" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5ol80eEeKwCqQbxnBb_w" name="testUnaryReftoStereotype2" ordered="false" eType="_4q5osc0eEeKwCqQbxnBb_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5omc0eEeKwCqQbxnBb_w" name="testDataType" ordered="false" lowerBound="1" eType="_4q5otc0eEeKwCqQbxnBb_w" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5om80eEeKwCqQbxnBb_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_4q5ot80eEeKwCqQbxnBb_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5onc0eEeKwCqQbxnBb_w" name="testInt" ordered="false" unique="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5on80eEeKwCqQbxnBb_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5ooc0eEeKwCqQbxnBb_w" name="testRefToMetaclass" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5oo80eEeKwCqQbxnBb_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_4q5ouc0eEeKwCqQbxnBb_w"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5opc0eEeKwCqQbxnBb_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_4q5otc0eEeKwCqQbxnBb_w" containment="true"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5op80eEeKwCqQbxnBb_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_4q5ot80eEeKwCqQbxnBb_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5oqc0eEeKwCqQbxnBb_w" name="testMultiInt" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5oq80eEeKwCqQbxnBb_w" name="testMultiEnumeration" ordered="false" upperBound="-1" eType="_4q5ouc0eEeKwCqQbxnBb_w"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5orc0eEeKwCqQbxnBb_w" name="testBoolean" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5or80eEeKwCqQbxnBb_w" name="testMultiBoolean" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4q5osc0eEeKwCqQbxnBb_w" name="Stereotype2">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5oss0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5os80eEeKwCqQbxnBb_w" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4q5otc0eEeKwCqQbxnBb_w" name="DataType1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5ots0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_4q5ot80eEeKwCqQbxnBb_w" name="MyPrimitiveType" instanceClassName="java.lang.String">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5ouM0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_4q5ouc0eEeKwCqQbxnBb_w" name="Enumeration1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4q5ous0eEeKwCqQbxnBb_w" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4q5ou80eEeKwCqQbxnBb_w" name="EnumerationLiteral1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4q5ovM0eEeKwCqQbxnBb_w" name="EnumerationLiteral2" value="1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4q5ovc0eEeKwCqQbxnBb_w" name="EnumerationLiteral3" value="2"/>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_sVoXAHc8EeGEMdTf3PnPPg" name="testProfile" nsURI="http:///schemas/testProfile/_rNfDMHc8EeGEMdTf3PnPPg/0" nsPrefix="testProfile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v37ZEXc8EeGEMdTf3PnPPg" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZEnc8EeGEMdTf3PnPPg" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZE3c8EeGEMdTf3PnPPg" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZFHc8EeGEMdTf3PnPPg" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZFXc8EeGEMdTf3PnPPg" key="Date" value="2012-03-26"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZFnc8EeGEMdTf3PnPPg" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_sVoXAXc8EeGEMdTf3PnPPg" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sVoXAnc8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WJYD4GkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVo-EHc8EeGEMdTf3PnPPg" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_sVqMMnc8EeGEMdTf3PnPPg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVo-Enc8EeGEMdTf3PnPPg" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVo-FHc8EeGEMdTf3PnPPg" name="testUnaryReftoStereotype2" ordered="false" eType="_sVqMMnc8EeGEMdTf3PnPPg"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVplIHc8EeGEMdTf3PnPPg" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_sVqzQHc8EeGEMdTf3PnPPg"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVplInc8EeGEMdTf3PnPPg" name="testInt" ordered="false" unique="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVplJHc8EeGEMdTf3PnPPg" name="testMultiString" ordered="false" unique="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVplJnc8EeGEMdTf3PnPPg" name="testRefToMetaclass" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVqMMHc8EeGEMdTf3PnPPg" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_sVqzQnc8EeGEMdTf3PnPPg"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_v33HoHc8EeGEMdTf3PnPPg" name="testDataType" ordered="false" lowerBound="1" eType="_v33usHc8EeGEMdTf3PnPPg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_sVqMMnc8EeGEMdTf3PnPPg" name="Stereotype2">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sVqMM3c8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WxelsGkdEeGGJOTenKBKAg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVqMNHc8EeGEMdTf3PnPPg" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_sVqzQHc8EeGEMdTf3PnPPg" name="MyPrimitiveType" instanceClassName="java.lang.String">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sVqzQXc8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_apMeIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_sVqzQnc8EeGEMdTf3PnPPg" name="Enumeration1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sVqzQ3c8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Zym0YGkdEeGGJOTenKBKAg"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_sVqzRHc8EeGEMdTf3PnPPg" name="EnumerationLiteral1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_sVqzRXc8EeGEMdTf3PnPPg" name="EnumerationLiteral2" value="1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_sVqzRnc8EeGEMdTf3PnPPg" name="EnumerationLiteral3" value="2"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_v33usHc8EeGEMdTf3PnPPg" name="DataType1" instanceClassName="java.lang.String">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v33usXc8EeGEMdTf3PnPPg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aNRXIGkdEeGGJOTenKBKAg"/>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_YcYBQGkdEeGGJOTenKBKAg" alias="Element">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+  </elementImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_UVrRomkdEeGGJOTenKBKAg">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_WJYD4GkdEeGGJOTenKBKAg" name="Stereotype1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_dcMxQGkdEeGGJOTenKBKAg" name="testReftoStereotype2" type="_WxelsGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jnpm4GkdEeGGJOTenKBKAg"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jnpm4WkdEeGGJOTenKBKAg" value="*"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_erNiEGkdEeGGJOTenKBKAg" name="base_Element" association="_erNiEWkdEeGGJOTenKBKAg">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_meyzIGkdEeGGJOTenKBKAg" name="testUnaryReftoStereotype2" visibility="public" type="_WxelsGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vekKgGkdEeGGJOTenKBKAg"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vekKgWkdEeGGJOTenKBKAg" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_vetUcGkdEeGGJOTenKBKAg">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_wshLYGkdEeGGJOTenKBKAg" name="testDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1DBRkGkdEeGGJOTenKBKAg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1DBRkWkdEeGGJOTenKBKAg" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_1DBRkmkdEeGGJOTenKBKAg">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_1ta5cGkdEeGGJOTenKBKAg" name="testMyPrimituveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7KKO8GkdEeGGJOTenKBKAg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7KKO8WkdEeGGJOTenKBKAg" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_7KTY4GkdEeGGJOTenKBKAg">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_71vikGkdEeGGJOTenKBKAg" name="testInt" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AhPBUGkeEeGGJOTenKBKAg"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AhPBUWkeEeGGJOTenKBKAg" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_AhPBUmkeEeGGJOTenKBKAg">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_BfRW4GkeEeGGJOTenKBKAg" name="testMultiString" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HnmnEGkeEeGGJOTenKBKAg"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HnmnEWkeEeGGJOTenKBKAg" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_HnmnEmkeEeGGJOTenKBKAg">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Lb0QgGz4EeGEKeJyQaxg3g" name="testRefToMetaclass">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_jAiq8G38EeGag98Jn1kDVw" name="testRefToEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jQ6CMG38EeGag98Jn1kDVw" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jQ6CMW38EeGag98Jn1kDVw" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_jQ6CMm38EeGag98Jn1kDVw">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Re-boM0eEeKwCqQbxnBb_w" name="testMultiDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XjIWcM0eEeKwCqQbxnBb_w"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XjSHcM0eEeKwCqQbxnBb_w" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_XjlCYM0eEeKwCqQbxnBb_w">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Y4YSIM0eEeKwCqQbxnBb_w" name="testMultiprimitiveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e4YFsM0eEeKwCqQbxnBb_w"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e4hPoM0eEeKwCqQbxnBb_w" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_e40KkM0eEeKwCqQbxnBb_w">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Zu-i8M0eEeKwCqQbxnBb_w" name="testMultiInt" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jNivIM0eEeKwCqQbxnBb_w"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jNivIc0eEeKwCqQbxnBb_w" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_jN1qEM0eEeKwCqQbxnBb_w">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_aEQPYM0eEeKwCqQbxnBb_w" name="testMultiEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg" isUnique="false">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_or6cUM0eEeKwCqQbxnBb_w"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_or6cUc0eEeKwCqQbxnBb_w" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_osNXQM0eEeKwCqQbxnBb_w">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_aXAMQM0eEeKwCqQbxnBb_w" name="testBoolean" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ujbpUM0eEeKwCqQbxnBb_w" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ujkzQM0eEeKwCqQbxnBb_w" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_uj3uMM0eEeKwCqQbxnBb_w">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_vH4aMM0eEeKwCqQbxnBb_w" name="testMultiBoolean" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0qj_oM0eEeKwCqQbxnBb_w"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0qtwoM0eEeKwCqQbxnBb_w" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0rArkM0eEeKwCqQbxnBb_w">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_VDBX4M0jEeKjW9KkdY00_w" name="testString" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YNNb8M0jEeKjW9KkdY00_w" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YNg98M0jEeKjW9KkdY00_w" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_YOGz0M0jEeKjW9KkdY00_w">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_SivA4M0tEeKjW9KkdY00_w" name="testReal" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UppDAM0tEeKjW9KkdY00_w" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Upxl4M0tEeKjW9KkdY00_w" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_UqG9EM0tEeKjW9KkdY00_w">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_VDuW8M0tEeKjW9KkdY00_w" name="testMultiReal" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z-yiwM0tEeKjW9KkdY00_w"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z-53gM0tEeKjW9KkdY00_w" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_Z_MLYM0tEeKjW9KkdY00_w">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_WxelsGkdEeGGJOTenKBKAg" name="Stereotype2">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_fTFaYGkdEeGGJOTenKBKAg" name="base_Element" association="_fTFaYWkdEeGGJOTenKBKAg">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_Zym0YGkdEeGGJOTenKBKAg" name="Enumeration1">
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_fc4W8G38EeGag98Jn1kDVw" name="EnumerationLiteral1"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_f6NMIG38EeGag98Jn1kDVw" name="EnumerationLiteral2"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gPCzsG38EeGag98Jn1kDVw" name="EnumerationLiteral3"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_aNRXIGkdEeGGJOTenKBKAg" name="DataType1"/>
+  <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_apMeIGkdEeGGJOTenKBKAg" name="MyPrimitiveType"/>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_erNiEWkdEeGGJOTenKBKAg" name="E_Stereotype1_Element1" memberEnd="_erNiEmkdEeGGJOTenKBKAg _erNiEGkdEeGGJOTenKBKAg">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_erNiEmkdEeGGJOTenKBKAg" name="extension_Stereotype1" type="_WJYD4GkdEeGGJOTenKBKAg" aggregation="composite" association="_erNiEWkdEeGGJOTenKBKAg"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_fTFaYWkdEeGGJOTenKBKAg" name="E_Stereotype2_Element1" memberEnd="_fTFaYmkdEeGGJOTenKBKAg _fTFaYGkdEeGGJOTenKBKAg">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_fTFaYmkdEeGGJOTenKBKAg" name="extension_Stereotype2" type="_WxelsGkdEeGGJOTenKBKAg" aggregation="composite" association="_fTFaYWkdEeGGJOTenKBKAg"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_575-8OVKEeWFGvPgvi3rLQ" name="Stereotype3">
+    <generalization xmi:type="uml:Generalization" xmi:id="_IpJ2gOVLEeWFGvPgvi3rLQ" general="_CUPi4OVLEeWFGvPgvi3rLQ"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575-8eVKEeWFGvPgvi3rLQ" name="testReftoStereotype2" type="_WxelsGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575-8uVKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575-8-VKEeWFGvPgvi3rLQ" value="*"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575-9OVKEeWFGvPgvi3rLQ" name="base_Element">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575-9eVKEeWFGvPgvi3rLQ" name="testUnaryReftoStereotype2" visibility="public" type="_WxelsGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575-9uVKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575-9-VKEeWFGvPgvi3rLQ" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575--OVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575--eVKEeWFGvPgvi3rLQ" name="testDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575--uVKEeWFGvPgvi3rLQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575---VKEeWFGvPgvi3rLQ" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575-_OVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575-_eVKEeWFGvPgvi3rLQ" name="testMyPrimituveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575-_uVKEeWFGvPgvi3rLQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575-_-VKEeWFGvPgvi3rLQ" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_AOVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_AeVKEeWFGvPgvi3rLQ" name="testInt" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_AuVKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_A-VKEeWFGvPgvi3rLQ" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_BOVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_BeVKEeWFGvPgvi3rLQ" name="testMultiString" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_BuVKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_B-VKEeWFGvPgvi3rLQ" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_COVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_CeVKEeWFGvPgvi3rLQ" name="testRefToMetaclass">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_CuVKEeWFGvPgvi3rLQ" name="testRefToEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_C-VKEeWFGvPgvi3rLQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_DOVKEeWFGvPgvi3rLQ" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_DeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_DuVKEeWFGvPgvi3rLQ" name="testMultiDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_D-VKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_EOVKEeWFGvPgvi3rLQ" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_EeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_EuVKEeWFGvPgvi3rLQ" name="testMultiprimitiveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_E-VKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_FOVKEeWFGvPgvi3rLQ" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_FeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_FuVKEeWFGvPgvi3rLQ" name="testMultiInt" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_F-VKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_GOVKEeWFGvPgvi3rLQ" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_GeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_GuVKEeWFGvPgvi3rLQ" name="testMultiEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg" isUnique="false">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_G-VKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_HOVKEeWFGvPgvi3rLQ" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_HeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_HuVKEeWFGvPgvi3rLQ" name="testBoolean" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_H-VKEeWFGvPgvi3rLQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_IOVKEeWFGvPgvi3rLQ" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_IeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_IuVKEeWFGvPgvi3rLQ" name="testMultiBoolean" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_I-VKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_JOVKEeWFGvPgvi3rLQ" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_JeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_JuVKEeWFGvPgvi3rLQ" name="testString" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_J-VKEeWFGvPgvi3rLQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_KOVKEeWFGvPgvi3rLQ" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_KeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_KuVKEeWFGvPgvi3rLQ" name="testReal" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_K-VKEeWFGvPgvi3rLQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_LOVKEeWFGvPgvi3rLQ" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_LeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_575_LuVKEeWFGvPgvi3rLQ" name="testMultiReal" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_575_L-VKEeWFGvPgvi3rLQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_575_MOVKEeWFGvPgvi3rLQ" value="*"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_575_MeVKEeWFGvPgvi3rLQ">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_CUPi4OVLEeWFGvPgvi3rLQ" name="SuperStereotype">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_FLrDAOVLEeWFGvPgvi3rLQ" name="id">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hf36QOVLEeWFGvPgvi3rLQ" value=""/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_MLmCgeVLEeWFGvPgvi3rLQ" name="base_Element" association="_MLc4kOVLEeWFGvPgvi3rLQ">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_MLc4kOVLEeWFGvPgvi3rLQ" name="E_SuperStereotype_Element1" memberEnd="_MLmCgOVLEeWFGvPgvi3rLQ _MLmCgeVLEeWFGvPgvi3rLQ">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_MLmCgOVLEeWFGvPgvi3rLQ" name="extension_SuperStereotype" type="_CUPi4OVLEeWFGvPgvi3rLQ" aggregation="composite" association="_MLc4kOVLEeWFGvPgvi3rLQ"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/Activator.java
index 0ceff47b51e..575b05d68e2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/Activator.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests"; //$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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AppliedProfileCommand.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AppliedProfileCommand.java
index 0c7d908e204..5053dbd41c9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AppliedProfileCommand.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AppliedProfileCommand.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.uml.diagram.stereotypeproperty;

-

-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.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Profile;

-

-

-public class AppliedProfileCommand extends AbstractTransactionalCommand {

-

-	private Profile profile;

-

-	private Package model;

-

-	public AppliedProfileCommand(TransactionalEditingDomain domain, Package model, Profile profile) {

-		super(domain, "Apply profile", Collections.EMPTY_LIST);

-		this.model = model;

-		this.profile = profile;

-

-	}

-

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		PackageUtil.applyProfile(model, profile, false);

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty;
+
+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.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Profile;
+
+
+public class AppliedProfileCommand extends AbstractTransactionalCommand {
+
+	private Profile profile;
+
+	private Package model;
+
+	public AppliedProfileCommand(TransactionalEditingDomain domain, Package model, Profile profile) {
+		super(domain, "Apply profile", Collections.EMPTY_LIST);
+		this.model = model;
+		this.profile = profile;
+
+	}
+
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		PackageUtil.applyProfile(model, profile, false);
+		return null;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestDropStereotypedClass.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestDropStereotypedClass.java
index 70cd1eec401..fd431ef842a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestDropStereotypedClass.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestDropStereotypedClass.java
@@ -1,267 +1,267 @@
-/*****************************************************************************

- * 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:

- * Patrick Tessier CEA LIST (patrick.tessier@cea;fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-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.figures.BorderedNodeFigure;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Create a class in the model explorer, stereotype it by "stereotype1", drop it into the class diagram.

- * Test if the label of the applied stereotype name is displayed.

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0022

- * - When a element is dropped form the model explorer to the diagram, the shape of the element must display the name of the applied stereotype in the label of stereotype

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0023

- * - Each applied stereotype can be either displayed with a short name or with the Qualified Name in the label of stereotype

- *

- */

-public class TestDropStereotypedClass extends AbstractPapyrusTestCase {

-

-

-	protected static final String ST_LEFT = String.valueOf("\u00AB");

-

-	protected static final String ST_RIGHT = String.valueOf("\u00BB");

-	/** name of the test project */

-	public final String PROJECT_NAME = "StereotypeTestProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "StereotypeTest.di";

-

-	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";

-

-	@Test

-	public void testStereotypeApplicationOnClass() {

-		testToDropAStereotypedClass(UMLElementTypes.Class_Shape);

-	}

-

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testToDropAStereotypedClass(IElementType type) {

-

-		// VARIABLES

-		org.eclipse.uml2.uml.Class class1 = null;

-		// view of the class

-		View notationClass1 = null;

-		// editpart of class1

-		GraphicalEditPart classEditPart = null;

-		// compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeBraceNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeLabelNotation = null;

-

-		// compartment Shape

-		View shapeCompartmentView = null;

-

-		// CREATION of the class in class diagram

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		// 1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{// execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			executeOnUIThread(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		// get the created Class

-		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");

-		assertNotNull("created class must be not null", class1);

-		// look for the editpart that the class

-		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);

-		// test if stereotype can be applied

-		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-		// delete the class form the diagram

-		{

-			Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-			Command command = ((IGraphicalEditPart) getDiagramEditPart().getChildren().get(getDiagramEditPart().getChildren().size() - 1)).getCommand(deleteViewRequest);

-			assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-			assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-			// execute hide the view

-			executeOnUIThread(command);

-			assertEquals(VIEW_DELETION + TEST_THE_EXECUTION, 0, getDiagramEditPart().getChildren().size());

-		}

-

-		{// Drop from the model explorer

-			classEditPart = null;

-			assertEquals(DROP + INITIALIZATION_TEST, 0, getRootView().getChildren().size());

-			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-			ArrayList<Element> list = new ArrayList<Element>();

-			list.add(class1);

-			dropObjectsRequest.setObjects(list);

-			dropObjectsRequest.setLocation(new Point(40, 40));

-			Command command = getDiagramEditPart().getCommand(dropObjectsRequest);

-			assertNotNull(DROP + COMMAND_NULL, command);

-			assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-			// execute the drop

-			executeOnUIThread(command);

-			assertEquals("The class1 must be dropped form the model explorer", 1, getDiagramEditPart().getChildren().size());

-		}

-		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);

-		classEditPart.refresh();

-		// look for the applied stereotype compartment

-		notationClass1 = classEditPart.getNotationView();

-

-		for (int i = 0; i < notationClass1.getTransientChildren().size(); i++) {

-			View view = (View) notationClass1.getTransientChildren().get(i);

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {

-				appliedStereotypeBraceNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {

-				appliedStereotypeLabelNotation = view;

-			}

-			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		// the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);

-		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-		assertTrue("No stereotype Label in the notation must be visible", appliedStereotypeLabelNotation.isVisible());

-

-		{// Test display stereotype1

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);

-

-			// get the label

-			PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();

-			assertTrue("stereotype label must be not null", stereotypeLabel != null);

-			assertTrue("text of stereotype label be equals to" + ST_LEFT + "Stereotype1" + ST_RIGHT, stereotypeLabel.getText().equals(ST_LEFT + "Stereotype1" + ST_RIGHT));

-		}

-

-	}

-

-

-

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");

-		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		final Profile profile = (Profile) modelResource.getContents().get(0);

-		// PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return PROJECT_NAME;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return FILE_NAME;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ * Patrick Tessier CEA LIST (patrick.tessier@cea;fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+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.figures.BorderedNodeFigure;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Create a class in the model explorer, stereotype it by "stereotype1", drop it into the class diagram.
+ * Test if the label of the applied stereotype name is displayed.
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0022
+ * - When a element is dropped form the model explorer to the diagram, the shape of the element must display the name of the applied stereotype in the label of stereotype
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0023
+ * - Each applied stereotype can be either displayed with a short name or with the Qualified Name in the label of stereotype
+ *
+ */
+public class TestDropStereotypedClass extends AbstractPapyrusTestCase {
+
+
+	protected static final String ST_LEFT = String.valueOf("\u00AB");
+
+	protected static final String ST_RIGHT = String.valueOf("\u00BB");
+	/** name of the test project */
+	public final String PROJECT_NAME = "StereotypeTestProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "StereotypeTest.di";
+
+	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";
+
+	@Test
+	public void testStereotypeApplicationOnClass() {
+		testToDropAStereotypedClass(UMLElementTypes.Class_Shape);
+	}
+
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testToDropAStereotypedClass(IElementType type) {
+
+		// VARIABLES
+		org.eclipse.uml2.uml.Class class1 = null;
+		// view of the class
+		View notationClass1 = null;
+		// editpart of class1
+		GraphicalEditPart classEditPart = null;
+		// compartment of stereotype
+		View appliedStereotypeCompartmentNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeBraceNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeLabelNotation = null;
+
+		// compartment Shape
+		View shapeCompartmentView = null;
+
+		// CREATION of the class in class diagram
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+		// 1 element element due to the reference to the profile
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
+
+
+		{// execution of the command
+			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CREATION + COMMAND_NULL, command);
+			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+			executeOnUIThread(command);
+			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		}
+
+		// get the created Class
+		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
+		assertNotNull("created class must be not null", class1);
+		// look for the editpart that the class
+		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
+		// test if stereotype can be applied
+		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);
+
+		{// execution of the application of the stereotype
+			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
+			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));
+			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
+			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
+			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);
+		}
+
+		// delete the class form the diagram
+		{
+			Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+			Command command = ((IGraphicalEditPart) getDiagramEditPart().getChildren().get(getDiagramEditPart().getChildren().size() - 1)).getCommand(deleteViewRequest);
+			assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+			assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+			// execute hide the view
+			executeOnUIThread(command);
+			assertEquals(VIEW_DELETION + TEST_THE_EXECUTION, 0, getDiagramEditPart().getChildren().size());
+		}
+
+		{// Drop from the model explorer
+			classEditPart = null;
+			assertEquals(DROP + INITIALIZATION_TEST, 0, getRootView().getChildren().size());
+			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+			ArrayList<Element> list = new ArrayList<Element>();
+			list.add(class1);
+			dropObjectsRequest.setObjects(list);
+			dropObjectsRequest.setLocation(new Point(40, 40));
+			Command command = getDiagramEditPart().getCommand(dropObjectsRequest);
+			assertNotNull(DROP + COMMAND_NULL, command);
+			assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+			// execute the drop
+			executeOnUIThread(command);
+			assertEquals("The class1 must be dropped form the model explorer", 1, getDiagramEditPart().getChildren().size());
+		}
+		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
+		classEditPart.refresh();
+		// look for the applied stereotype compartment
+		notationClass1 = classEditPart.getNotationView();
+
+		for (int i = 0; i < notationClass1.getTransientChildren().size(); i++) {
+			View view = (View) notationClass1.getTransientChildren().get(i);
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {
+				appliedStereotypeCompartmentNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {
+				appliedStereotypeBraceNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {
+				appliedStereotypeLabelNotation = view;
+			}
+			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {
+				shapeCompartmentView = view;
+			}
+		}
+		// the mechanism of stereotype display is running.
+		// the thread is synchronous
+		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);
+		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);
+		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);
+		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);
+
+		assertTrue("No stereotype Label in the notation must be visible", appliedStereotypeLabelNotation.isVisible());
+
+		{// Test display stereotype1
+			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
+
+			// get the label
+			PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();
+			assertTrue("stereotype label must be not null", stereotypeLabel != null);
+			assertTrue("text of stereotype label be equals to" + ST_LEFT + "Stereotype1" + ST_RIGHT, stereotypeLabel.getText().equals(ST_LEFT + "Stereotype1" + ST_RIGHT));
+		}
+
+	}
+
+
+
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");
+		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
+		URI modelUri = registeredProfile.getUri();
+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
+		final Profile profile = (Profile) modelResource.getContents().get(0);
+		// PackageUtil.applyProfile(root,profile, false);
+		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
+		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return PROJECT_NAME;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return FILE_NAME;
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java
index 4677b9f19fc..e80c2d1d552 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java
@@ -1,95 +1,95 @@
-/*****************************************************************************

- * 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:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.junit.Test;

-

-

-public class TestProfileApplication extends AbstractPapyrusTestCase {

-

-	/** name of the test project */

-	public final String PROJECT_NAME = "StereotypeTestProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "StereotypeTest.di";

-

-	@Test

-	public void testProfileApplicationOnModel() throws ServiceException {

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");

-		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());

-		assertTrue("Registered profile not found", registeredProfile != null);

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		assertTrue("the registered profile is not a profile", (modelResource.getContents().get(0) instanceof Profile));

-		assertTrue("strange profile", ("".equals(registeredProfile.getQualifiedNames())));

-		final Profile profile = (Profile) modelResource.getContents().get(0);

-		// PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-

-		assertTrue("Profile not applied", root.getAllAppliedProfiles().size() == 1);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return PROJECT_NAME;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return FILE_NAME;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *  Christian W. Damus (CEA) - bug 434594
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty;
+
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.junit.Test;
+
+
+public class TestProfileApplication extends AbstractPapyrusTestCase {
+
+	/** name of the test project */
+	public final String PROJECT_NAME = "StereotypeTestProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "StereotypeTest.di";
+
+	@Test
+	public void testProfileApplicationOnModel() throws ServiceException {
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");
+		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
+		assertTrue("Registered profile not found", registeredProfile != null);
+		URI modelUri = registeredProfile.getUri();
+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
+		assertTrue("the registered profile is not a profile", (modelResource.getContents().get(0) instanceof Profile));
+		assertTrue("strange profile", ("".equals(registeredProfile.getQualifiedNames())));
+		final Profile profile = (Profile) modelResource.getContents().get(0);
+		// PackageUtil.applyProfile(root,profile, false);
+		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
+		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
+
+		assertTrue("Profile not applied", root.getAllAppliedProfiles().size() == 1);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return PROJECT_NAME;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return FILE_NAME;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestDisplayAsBrace.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestDisplayAsBrace.java
index 124cd191cda..1f0348394a5 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestDisplayAsBrace.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestDisplayAsBrace.java
@@ -1,255 +1,255 @@
-/*****************************************************************************

- * 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:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.asbrace;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

-import org.eclipse.papyrus.junit.utils.DisplayUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Create a class on the class diagram, apply "stereotype3" on this class. Display property of sterotype as brace.

- * Verify that the label is created and verify its content.

- *

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_001

- * - Stereotype application properties could be displayed as "comment" inside a compartment, or as brace label

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_013

- * - When the applied stereotype properties are displayed as brace, all this data is display in a label under the name label.

- *

- */

-public class TestDisplayAsBrace extends AbstractPapyrusTestCase {

-	/** name of the test project */

-	public final String PROJECT_NAME = "TestDisplayAsBraceProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "TestDisplayAsBrace.di";

-

-

-

-	protected static final String ST_LEFT = String.valueOf("\u00AB");

-

-	protected static final String ST_RIGHT = String.valueOf("\u00BB");

-

-	private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3";

-

-	@Test

-	public void testBrace() {

-		testBrace(UMLElementTypes.Class_Shape);

-

-	}

-

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testBrace(IElementType type) {

-

-		// VARIABLES

-		org.eclipse.uml2.uml.Class class1 = null;

-		// stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		// view of the class

-		View NotationClass1 = null;

-		// editpart of class1

-		GraphicalEditPart classEditPart = null;

-		// compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeBraceNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeLabelNotation = null;

-

-		// compartment Shape

-		View shapeCompartmentView = null;

-		// the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeClassLabelEditPart = null;

-

-

-		// CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		// 1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{// execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		// get the created Class

-		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");

-		assertNotNull("created class must be not null", class1);

-		// look for the editpart that the class

-		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);

-		// test if stereotype can be applied

-		assertTrue("stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-		// look for the applied stereotype compartment

-		NotationClass1 = classEditPart.getNotationView();

-

-		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {

-			View view = (View) NotationClass1.getTransientChildren().get(i);

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {

-				appliedStereotypeBraceNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {

-				appliedStereotypeLabelNotation = view;

-			}

-			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		// the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);

-		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-

-		// verify that there are not visible

-		assertFalse("stereotype Compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible());

-		assertFalse("stereotype brace must not be visible", appliedStereotypeBraceNotation.isVisible());

-		// verify that stereotype label is visible

-		assertTrue("stereotype name label must be visible", appliedStereotypeLabelNotation.isVisible());

-

-		// now display stereotypes

-		stereotypeTest = class1.getAppliedStereotypes().get(0);

-

-		{

-			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeBraceNotation, true, true);

-			DisplayUtils.flushEventLoop();

-			// look for the the editpart for the comment

-			assertTrue("stereotype brace must not be visible", appliedStereotypeBraceNotation.isVisible());

-			classEditPart.refresh();

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);

-			// now verify position of each subfigure

-			ClassifierFigure class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0));

-			assertTrue("the subFigure [1] of the classifier must be a PapyrusWrappingLabel", class1figure.getChildren().get(1) instanceof PapyrusWrappingLabel);

-			PapyrusWrappingLabel braceLable = (PapyrusWrappingLabel) class1figure.getChildren().get(1);

-			assertEquals("The display of the brace label must be correct",

-					"{testReftoStereotype2=[] , testUnaryReftoStereotype2=null , testDataType , testMyPrimituveType , testInt=0 , testMultiString=[] , testRefToMetaclass=null , testRefToEnumeration=EnumerationLiteral1 , testMultiDataType=[] , testMultiprimitiveType=[] , testMultiInt=[] , testMultiEnumeration=[] , testBoolean=false , testMultiBoolean=[] , testString , testReal=0.0 , testMultiReal=[] , id= }",

-					braceLable.getText());

-		}

-

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");

-		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		final Profile profile = (Profile) modelResource.getContents().get(0);

-		// PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return FILE_NAME;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *  Christian W. Damus (CEA) - bug 434594
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.asbrace;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.junit.utils.DisplayUtils;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
+import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Create a class on the class diagram, apply "stereotype3" on this class. Display property of sterotype as brace.
+ * Verify that the label is created and verify its content.
+ *
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_001
+ * - Stereotype application properties could be displayed as "comment" inside a compartment, or as brace label
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_013
+ * - When the applied stereotype properties are displayed as brace, all this data is display in a label under the name label.
+ *
+ */
+public class TestDisplayAsBrace extends AbstractPapyrusTestCase {
+	/** name of the test project */
+	public final String PROJECT_NAME = "TestDisplayAsBraceProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "TestDisplayAsBrace.di";
+
+
+
+	protected static final String ST_LEFT = String.valueOf("\u00AB");
+
+	protected static final String ST_RIGHT = String.valueOf("\u00BB");
+
+	private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3";
+
+	@Test
+	public void testBrace() {
+		testBrace(UMLElementTypes.Class_Shape);
+
+	}
+
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testBrace(IElementType type) {
+
+		// VARIABLES
+		org.eclipse.uml2.uml.Class class1 = null;
+		// stereotype that is applied on class1
+		Stereotype stereotypeTest = null;
+		// view of the class
+		View NotationClass1 = null;
+		// editpart of class1
+		GraphicalEditPart classEditPart = null;
+		// compartment of stereotype
+		View appliedStereotypeCompartmentNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeBraceNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeLabelNotation = null;
+
+		// compartment Shape
+		View shapeCompartmentView = null;
+		// the view of the applied stereotype property
+		View stereotypePropertyView = null;
+		GraphicalEditPart stereotypeClassLabelEditPart = null;
+
+
+		// CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+		// 1 element element due to the reference to the profile
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
+
+
+		{// execution of the command
+			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CREATION + COMMAND_NULL, command);
+			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		}
+
+		// get the created Class
+		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
+		assertNotNull("created class must be not null", class1);
+		// look for the editpart that the class
+		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
+		// test if stereotype can be applied
+		assertTrue("stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);
+
+		{// execution of the application of the stereotype
+			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
+			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3));
+			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
+			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
+			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);
+		}
+
+		// look for the applied stereotype compartment
+		NotationClass1 = classEditPart.getNotationView();
+
+		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {
+			View view = (View) NotationClass1.getTransientChildren().get(i);
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {
+				appliedStereotypeCompartmentNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {
+				appliedStereotypeBraceNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {
+				appliedStereotypeLabelNotation = view;
+			}
+			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {
+				shapeCompartmentView = view;
+			}
+		}
+		// the mechanism of stereotype display is running.
+		// the thread is synchronous
+		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);
+		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);
+		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);
+		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);
+
+
+		// verify that there are not visible
+		assertFalse("stereotype Compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible());
+		assertFalse("stereotype brace must not be visible", appliedStereotypeBraceNotation.isVisible());
+		// verify that stereotype label is visible
+		assertTrue("stereotype name label must be visible", appliedStereotypeLabelNotation.isVisible());
+
+		// now display stereotypes
+		stereotypeTest = class1.getAppliedStereotypes().get(0);
+
+		{
+			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeBraceNotation, true, true);
+			DisplayUtils.flushEventLoop();
+			// look for the the editpart for the comment
+			assertTrue("stereotype brace must not be visible", appliedStereotypeBraceNotation.isVisible());
+			classEditPart.refresh();
+			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
+			// now verify position of each subfigure
+			ClassifierFigure class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0));
+			assertTrue("the subFigure [1] of the classifier must be a PapyrusWrappingLabel", class1figure.getChildren().get(1) instanceof PapyrusWrappingLabel);
+			PapyrusWrappingLabel braceLable = (PapyrusWrappingLabel) class1figure.getChildren().get(1);
+			assertEquals("The display of the brace label must be correct",
+					"{testReftoStereotype2=[] , testUnaryReftoStereotype2=null , testDataType , testMyPrimituveType , testInt=0 , testMultiString=[] , testRefToMetaclass=null , testRefToEnumeration=EnumerationLiteral1 , testMultiDataType=[] , testMultiprimitiveType=[] , testMultiInt=[] , testMultiEnumeration=[] , testBoolean=false , testMultiBoolean=[] , testString , testReal=0.0 , testMultiReal=[] , id= }",
+					braceLable.getText());
+		}
+
+	}
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");
+		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
+		URI modelUri = registeredProfile.getUri();
+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
+		final Profile profile = (Profile) modelResource.getContents().get(0);
+		// PackageUtil.applyProfile(root,profile, false);
+		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
+		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return FILE_NAME;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestDisplayAsComment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestDisplayAsComment.java
index 3c6f792073f..cf48b962047 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestDisplayAsComment.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestDisplayAsComment.java
@@ -1,278 +1,278 @@
-/*****************************************************************************

- * 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:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.ascomment;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayUtil;

-import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCommentEditPart;

-import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Create a class on the class diagram, apply "stereotype3" on this class. Display property of sterotype as comment.

- * Verify that all properties fo the applied stereotype are displayed.

- *

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_001

- * - Stereotype application properties could be displayed as "comment" inside a compartment, or as brace label

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_011

- * - When the applied stereotype properties are displayed as a comment, a shape " comment " is created with a dashed line form the comment to the representation of the stereotyped element. The comment contains the a label with the name of the stereotype, and

- * contain as a stack list all wanted properties of applied stereotype that the user want to display.

- *

- */

-public class TestDisplayAsComment extends AbstractPapyrusTestCase {

-	/** name of the test project */

-	public final String PROJECT_NAME = "TestDisplayAsCommentProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "TestDisplayAsComment.di";

-

-

-

-	protected static final String ST_LEFT = String.valueOf("\u00AB");

-

-	protected static final String ST_RIGHT = String.valueOf("\u00BB");

-

-	private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3";

-

-	@Test

-	public void testStereotypeApplicationOnClass() {

-		testToCreateANode(UMLElementTypes.Class_Shape);

-

-	}

-

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testToCreateANode(IElementType type) {

-

-		// VARIABLES

-		org.eclipse.uml2.uml.Class class1 = null;

-		// stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		// view of the class

-		View NotationClass1 = null;

-		// editpart of class1

-		GraphicalEditPart classEditPart = null;

-		// compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeBraceNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeLabelNotation = null;

-

-		// compartment Shape

-		View shapeCompartmentView = null;

-		// the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeClassLabelEditPart = null;

-

-

-		// CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		// 1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{// execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-

-			executeOnUIThread(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		// get the created Class

-		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");

-		assertNotNull("created class must be not null", class1);

-		// look for the editpart that the class

-		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);

-		// test if stereotype can be applied

-		assertTrue("stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-		// look for the applied stereotype compartment

-		NotationClass1 = classEditPart.getNotationView();

-

-		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {

-			View view = (View) NotationClass1.getTransientChildren().get(i);

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {

-				appliedStereotypeBraceNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {

-				appliedStereotypeLabelNotation = view;

-			}

-			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		// the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);

-		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-

-		// verify that there are not visible

-		assertFalse("stereotype Compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible());

-		assertFalse("stereotype brace must not be visible", appliedStereotypeBraceNotation.isVisible());

-		// verify that stereotype label is visible

-		assertTrue("stereotype name label must be visible", appliedStereotypeLabelNotation.isVisible());

-

-		// now display stereotypes

-		stereotypeTest = class1.getAppliedStereotypes().get(0);

-

-

-		{// display Stereotype3 as comment

-			View CommentNotation = StereotypeDisplayUtil.getInstance().getStereotypeComment(classEditPart.getNotationView());

-			for (int i = 0; i < CommentNotation.getTransientChildren().size(); i++) {

-				View view = (View) CommentNotation.getTransientChildren().get(i);

-				if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {

-					appliedStereotypeCompartmentNotation = view;

-				}

-				if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {

-					appliedStereotypeBraceNotation = view;

-				}

-			}

-

-

-

-			assertFalse("stereotype comment must not be visible", CommentNotation.isVisible());

-			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), CommentNotation, true, true);

-			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeCompartmentNotation, true, true);

-			// DisplayUtils.flushEventLoop();

-			// look for the the editpart for the comment

-			AppliedStereotypeCommentEditPart commentEditPart = null;

-			for (Iterator<?> iterator = getDiagramEditPart().getChildren().iterator(); iterator.hasNext();) {

-				Object child = iterator.next();

-				if (child instanceof AppliedStereotypeCommentEditPart) {

-					commentEditPart = (AppliedStereotypeCommentEditPart) child;

-				}

-			}

-			assertNotNull("The applied Stereotype as Comment must be alive", commentEditPart);

-			commentEditPart.refresh();

-

-			assertEquals("Stererotype comment must 2 childreen", 2, commentEditPart.getChildren().size());

-			assertTrue("Stereotype comment must have a child that is AppliedStereotypeCompartment", commentEditPart.getChildren().get(0) instanceof AppliedStereotypeCompartmentEditPart);

-			AppliedStereotypeCompartmentEditPart appliedStereotypeCompartmentEditPart = (AppliedStereotypeCompartmentEditPart) commentEditPart.getChildren().get(0);

-			assertEquals(" 19 Stererotype  properties must be displayed in the comment ", 18, appliedStereotypeCompartmentEditPart.getChildren().size());

-

-		}

-

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");

-		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		final Profile profile = (Profile) modelResource.getContents().get(0);

-		// PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return FILE_NAME;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *  Christian W. Damus (CEA) - bug 434594
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.ascomment;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayUtil;
+import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCommentEditPart;
+import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Create a class on the class diagram, apply "stereotype3" on this class. Display property of sterotype as comment.
+ * Verify that all properties fo the applied stereotype are displayed.
+ *
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_001
+ * - Stereotype application properties could be displayed as "comment" inside a compartment, or as brace label
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_011
+ * - When the applied stereotype properties are displayed as a comment, a shape " comment " is created with a dashed line form the comment to the representation of the stereotyped element. The comment contains the a label with the name of the stereotype, and
+ * contain as a stack list all wanted properties of applied stereotype that the user want to display.
+ *
+ */
+public class TestDisplayAsComment extends AbstractPapyrusTestCase {
+	/** name of the test project */
+	public final String PROJECT_NAME = "TestDisplayAsCommentProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "TestDisplayAsComment.di";
+
+
+
+	protected static final String ST_LEFT = String.valueOf("\u00AB");
+
+	protected static final String ST_RIGHT = String.valueOf("\u00BB");
+
+	private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3";
+
+	@Test
+	public void testStereotypeApplicationOnClass() {
+		testToCreateANode(UMLElementTypes.Class_Shape);
+
+	}
+
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testToCreateANode(IElementType type) {
+
+		// VARIABLES
+		org.eclipse.uml2.uml.Class class1 = null;
+		// stereotype that is applied on class1
+		Stereotype stereotypeTest = null;
+		// view of the class
+		View NotationClass1 = null;
+		// editpart of class1
+		GraphicalEditPart classEditPart = null;
+		// compartment of stereotype
+		View appliedStereotypeCompartmentNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeBraceNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeLabelNotation = null;
+
+		// compartment Shape
+		View shapeCompartmentView = null;
+		// the view of the applied stereotype property
+		View stereotypePropertyView = null;
+		GraphicalEditPart stereotypeClassLabelEditPart = null;
+
+
+		// CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+		// 1 element element due to the reference to the profile
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
+
+
+		{// execution of the command
+			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CREATION + COMMAND_NULL, command);
+			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+
+			executeOnUIThread(command);
+			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		}
+
+		// get the created Class
+		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
+		assertNotNull("created class must be not null", class1);
+		// look for the editpart that the class
+		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
+		// test if stereotype can be applied
+		assertTrue("stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);
+
+		{// execution of the application of the stereotype
+			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
+			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3));
+			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
+			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
+			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);
+		}
+
+		// look for the applied stereotype compartment
+		NotationClass1 = classEditPart.getNotationView();
+
+		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {
+			View view = (View) NotationClass1.getTransientChildren().get(i);
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {
+				appliedStereotypeCompartmentNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {
+				appliedStereotypeBraceNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {
+				appliedStereotypeLabelNotation = view;
+			}
+			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {
+				shapeCompartmentView = view;
+			}
+		}
+		// the mechanism of stereotype display is running.
+		// the thread is synchronous
+		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);
+		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);
+		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);
+		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);
+
+
+		// verify that there are not visible
+		assertFalse("stereotype Compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible());
+		assertFalse("stereotype brace must not be visible", appliedStereotypeBraceNotation.isVisible());
+		// verify that stereotype label is visible
+		assertTrue("stereotype name label must be visible", appliedStereotypeLabelNotation.isVisible());
+
+		// now display stereotypes
+		stereotypeTest = class1.getAppliedStereotypes().get(0);
+
+
+		{// display Stereotype3 as comment
+			View CommentNotation = StereotypeDisplayUtil.getInstance().getStereotypeComment(classEditPart.getNotationView());
+			for (int i = 0; i < CommentNotation.getTransientChildren().size(); i++) {
+				View view = (View) CommentNotation.getTransientChildren().get(i);
+				if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {
+					appliedStereotypeCompartmentNotation = view;
+				}
+				if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {
+					appliedStereotypeBraceNotation = view;
+				}
+			}
+
+
+
+			assertFalse("stereotype comment must not be visible", CommentNotation.isVisible());
+			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), CommentNotation, true, true);
+			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeCompartmentNotation, true, true);
+			// DisplayUtils.flushEventLoop();
+			// look for the the editpart for the comment
+			AppliedStereotypeCommentEditPart commentEditPart = null;
+			for (Iterator<?> iterator = getDiagramEditPart().getChildren().iterator(); iterator.hasNext();) {
+				Object child = iterator.next();
+				if (child instanceof AppliedStereotypeCommentEditPart) {
+					commentEditPart = (AppliedStereotypeCommentEditPart) child;
+				}
+			}
+			assertNotNull("The applied Stereotype as Comment must be alive", commentEditPart);
+			commentEditPart.refresh();
+
+			assertEquals("Stererotype comment must 2 childreen", 2, commentEditPart.getChildren().size());
+			assertTrue("Stereotype comment must have a child that is AppliedStereotypeCompartment", commentEditPart.getChildren().get(0) instanceof AppliedStereotypeCompartmentEditPart);
+			AppliedStereotypeCompartmentEditPart appliedStereotypeCompartmentEditPart = (AppliedStereotypeCompartmentEditPart) commentEditPart.getChildren().get(0);
+			assertEquals(" 19 Stererotype  properties must be displayed in the comment ", 18, appliedStereotypeCompartmentEditPart.getChildren().size());
+
+		}
+
+	}
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");
+		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
+		URI modelUri = registeredProfile.getUri();
+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
+		final Profile profile = (Profile) modelResource.getContents().get(0);
+		// PackageUtil.applyProfile(root,profile, false);
+		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
+		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return FILE_NAME;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestDisplayAsCompartment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestDisplayAsCompartment.java
index 47d94618b80..100e86a96bf 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestDisplayAsCompartment.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestDisplayAsCompartment.java
@@ -1,257 +1,257 @@
-/*****************************************************************************

- * 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:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.ascompartment;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.junit.utils.DisplayUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Create a class on the class diagram, apply "stereotype3" on this class. Display property of sterotype as compartment

- * Verify that the compartment is created and verify that all properties of stereotype are displayed.

- *

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_001

- * - Stereotype application properties could be displayed as "comment" inside a compartment, or as brace label

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0012

- * - When the applied stereotype properties are displayed as a compartment, a compartment is created inside the representation of the stereotyped element , under the label of the name. The comment contains the a label with the name of the stereotype, and

- * contain as a stack list all wanted properties of applied stereotype that the user want to display.

- *

- */

-public class TestDisplayAsCompartment extends AbstractPapyrusTestCase {

-	/** name of the test project */

-	public final String PROJECT_NAME = "TestDisplayAsCompartmentProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "TestDisplayAsCompartment.di";

-

-

-

-	protected static final String ST_LEFT = String.valueOf("\u00AB");

-

-	protected static final String ST_RIGHT = String.valueOf("\u00BB");

-

-	private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3";

-

-	@Test

-	public void testStereotypeApplicationOnClass() {

-		testToCreateANode(UMLElementTypes.Class_Shape);

-

-	}

-

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testToCreateANode(IElementType type) {

-

-		// VARIABLES

-		org.eclipse.uml2.uml.Class class1 = null;

-		// stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		// view of the class

-		View NotationClass1 = null;

-		// editpart of class1

-		GraphicalEditPart classEditPart = null;

-		// compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeBraceNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeLabelNotation = null;

-

-		// compartment Shape

-		View shapeCompartmentView = null;

-		// the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeClassLabelEditPart = null;

-

-

-		// CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		// 1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{// execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		// get the created Class

-		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");

-		assertNotNull("created class must be not null", class1);

-		// look for the editpart that the class

-		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);

-		// test if stereotype can be applied

-		assertTrue("stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-		// look for the applied stereotype compartment

-		NotationClass1 = classEditPart.getNotationView();

-

-		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {

-			View view = (View) NotationClass1.getTransientChildren().get(i);

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {

-				appliedStereotypeBraceNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {

-				appliedStereotypeLabelNotation = view;

-			}

-			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		// the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);

-		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-

-		// verify that there are not visible

-		assertFalse("stereotype Compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible());

-		assertFalse("stereotype brace must not be visible", appliedStereotypeBraceNotation.isVisible());

-		// verify that stereotype label is visible

-		assertTrue("stereotype name label must be visible", appliedStereotypeLabelNotation.isVisible());

-

-		// now display stereotypes

-		stereotypeTest = class1.getAppliedStereotypes().get(0);

-

-		{

-			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeCompartmentNotation, true, true);

-			DisplayUtils.flushEventLoop();

-			// look for the the editpart for the comment

-			AppliedStereotypeCompartmentEditPart appliedStereotypeCompartmentEditPart = null;

-			for (Iterator<?> iterator = classEditPart.getChildren().iterator(); iterator.hasNext();) {

-				Object child = iterator.next();

-				if (child instanceof AppliedStereotypeCompartmentEditPart) {

-					appliedStereotypeCompartmentEditPart = (AppliedStereotypeCompartmentEditPart) child;

-				}

-			}

-			assertNotNull("The applied Stereotype as Compartment must be alive", appliedStereotypeCompartmentEditPart);

-			classEditPart.refresh();

-

-			assertEquals(" 18 Stererotype  properties must be displayed in the comment ", 18, appliedStereotypeCompartmentEditPart.getChildren().size());

-

-		}

-

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");

-		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		final Profile profile = (Profile) modelResource.getContents().get(0);

-		// PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return FILE_NAME;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *  Christian W. Damus (CEA) - bug 434594
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.ascompartment;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.junit.utils.DisplayUtils;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
+import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Create a class on the class diagram, apply "stereotype3" on this class. Display property of sterotype as compartment
+ * Verify that the compartment is created and verify that all properties of stereotype are displayed.
+ *
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_001
+ * - Stereotype application properties could be displayed as "comment" inside a compartment, or as brace label
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0012
+ * - When the applied stereotype properties are displayed as a compartment, a compartment is created inside the representation of the stereotyped element , under the label of the name. The comment contains the a label with the name of the stereotype, and
+ * contain as a stack list all wanted properties of applied stereotype that the user want to display.
+ *
+ */
+public class TestDisplayAsCompartment extends AbstractPapyrusTestCase {
+	/** name of the test project */
+	public final String PROJECT_NAME = "TestDisplayAsCompartmentProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "TestDisplayAsCompartment.di";
+
+
+
+	protected static final String ST_LEFT = String.valueOf("\u00AB");
+
+	protected static final String ST_RIGHT = String.valueOf("\u00BB");
+
+	private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3";
+
+	@Test
+	public void testStereotypeApplicationOnClass() {
+		testToCreateANode(UMLElementTypes.Class_Shape);
+
+	}
+
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testToCreateANode(IElementType type) {
+
+		// VARIABLES
+		org.eclipse.uml2.uml.Class class1 = null;
+		// stereotype that is applied on class1
+		Stereotype stereotypeTest = null;
+		// view of the class
+		View NotationClass1 = null;
+		// editpart of class1
+		GraphicalEditPart classEditPart = null;
+		// compartment of stereotype
+		View appliedStereotypeCompartmentNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeBraceNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeLabelNotation = null;
+
+		// compartment Shape
+		View shapeCompartmentView = null;
+		// the view of the applied stereotype property
+		View stereotypePropertyView = null;
+		GraphicalEditPart stereotypeClassLabelEditPart = null;
+
+
+		// CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+		// 1 element element due to the reference to the profile
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
+
+
+		{// execution of the command
+			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CREATION + COMMAND_NULL, command);
+			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		}
+
+		// get the created Class
+		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
+		assertNotNull("created class must be not null", class1);
+		// look for the editpart that the class
+		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
+		// test if stereotype can be applied
+		assertTrue("stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);
+
+		{// execution of the application of the stereotype
+			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
+			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3));
+			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
+			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
+			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);
+		}
+
+		// look for the applied stereotype compartment
+		NotationClass1 = classEditPart.getNotationView();
+
+		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {
+			View view = (View) NotationClass1.getTransientChildren().get(i);
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {
+				appliedStereotypeCompartmentNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {
+				appliedStereotypeBraceNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {
+				appliedStereotypeLabelNotation = view;
+			}
+			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {
+				shapeCompartmentView = view;
+			}
+		}
+		// the mechanism of stereotype display is running.
+		// the thread is synchronous
+		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);
+		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);
+		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);
+		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);
+
+
+		// verify that there are not visible
+		assertFalse("stereotype Compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible());
+		assertFalse("stereotype brace must not be visible", appliedStereotypeBraceNotation.isVisible());
+		// verify that stereotype label is visible
+		assertTrue("stereotype name label must be visible", appliedStereotypeLabelNotation.isVisible());
+
+		// now display stereotypes
+		stereotypeTest = class1.getAppliedStereotypes().get(0);
+
+		{
+			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeCompartmentNotation, true, true);
+			DisplayUtils.flushEventLoop();
+			// look for the the editpart for the comment
+			AppliedStereotypeCompartmentEditPart appliedStereotypeCompartmentEditPart = null;
+			for (Iterator<?> iterator = classEditPart.getChildren().iterator(); iterator.hasNext();) {
+				Object child = iterator.next();
+				if (child instanceof AppliedStereotypeCompartmentEditPart) {
+					appliedStereotypeCompartmentEditPart = (AppliedStereotypeCompartmentEditPart) child;
+				}
+			}
+			assertNotNull("The applied Stereotype as Compartment must be alive", appliedStereotypeCompartmentEditPart);
+			classEditPart.refresh();
+
+			assertEquals(" 18 Stererotype  properties must be displayed in the comment ", 18, appliedStereotypeCompartmentEditPart.getChildren().size());
+
+		}
+
+	}
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");
+		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
+		URI modelUri = registeredProfile.getUri();
+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
+		final Profile profile = (Profile) modelResource.getContents().get(0);
+		// PackageUtil.applyProfile(root,profile, false);
+		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
+		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return FILE_NAME;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/Test2StereotypeApplications.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/Test2StereotypeApplications.java
index f2e926b5bf1..6cd70bb0c87 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/Test2StereotypeApplications.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/Test2StereotypeApplications.java
@@ -1,251 +1,251 @@
-/*****************************************************************************

- * 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:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.displayname;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Create a class on the class diagram, apply "stereotype1" on this class. Test if the "stereotype1" is displayed under the name.

- *

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0021

- * - When the stereotype is applied, the shape displays automatically the name of the stereotype in the label of stereotype

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0023

- * - Each applied stereotype can be either displayed with a short name or with the Qualified Name in the label of stereotype

- *

- */

-public class Test2StereotypeApplications extends AbstractPapyrusTestCase {

-	/** name of the test project */

-	public final String PROJECT_NAME = "Test2StereotypeApplicationsProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "Test2StereotypeApplications.di";

-

-

-

-	protected static final String ST_LEFT = String.valueOf("\u00AB");

-

-	protected static final String ST_RIGHT = String.valueOf("\u00BB");

-

-	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";

-	private static final String TEST_PROFILE_STEREOTYPE2 = "testProfile::Stereotype2";

-

-	@Test

-	public void test2StereotypeApplicationsOnClass() {

-		test2StereotypeApplications(UMLElementTypes.Class_Shape);

-

-	}

-

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void test2StereotypeApplications(IElementType type) {

-

-		// VARIABLES

-		org.eclipse.uml2.uml.Class class1 = null;

-		// stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		// view of the class

-		View NotationClass1 = null;

-		// editpart of class1

-		GraphicalEditPart classEditPart = null;

-		// compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeBraceNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeLabelNotation = null;

-

-		// compartment Shape

-		View shapeCompartmentView = null;

-		// the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeClassLabelEditPart = null;

-

-

-		// CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		// 1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{// execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		// get the created Class

-		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");

-		assertNotNull("created class must be not null", class1);

-		// look for the editpart that the class

-		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);

-		// test if stereotype can be applied

-		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE2) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE2));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-		// look for the applied stereotype compartment

-		NotationClass1 = classEditPart.getNotationView();

-

-		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {

-			View view = (View) NotationClass1.getTransientChildren().get(i);

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {

-				appliedStereotypeBraceNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {

-				appliedStereotypeLabelNotation = view;

-			}

-			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		// the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);

-		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-		// now display stereotypes

-		stereotypeTest = class1.getAppliedStereotypes().get(0);

-

-		{// display stereotype1

-			classEditPart.refresh();

-

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);

-

-			// get the label

-			PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();

-			assertTrue("stereotype label must be not null", stereotypeLabel != null);

-			assertEquals("The display of applied stereotype name is not correct", ST_LEFT + "Stereotype1, Stereotype2" + ST_RIGHT, stereotypeLabel.getText());

-		}

-

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");

-		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		final Profile profile = (Profile) modelResource.getContents().get(0);

-		// PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-	}

-

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return FILE_NAME;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *  Christian W. Damus (CEA) - bug 434594
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.displayname;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
+import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Create a class on the class diagram, apply "stereotype1" on this class. Test if the "stereotype1" is displayed under the name.
+ *
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0021
+ * - When the stereotype is applied, the shape displays automatically the name of the stereotype in the label of stereotype
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0023
+ * - Each applied stereotype can be either displayed with a short name or with the Qualified Name in the label of stereotype
+ *
+ */
+public class Test2StereotypeApplications extends AbstractPapyrusTestCase {
+	/** name of the test project */
+	public final String PROJECT_NAME = "Test2StereotypeApplicationsProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "Test2StereotypeApplications.di";
+
+
+
+	protected static final String ST_LEFT = String.valueOf("\u00AB");
+
+	protected static final String ST_RIGHT = String.valueOf("\u00BB");
+
+	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";
+	private static final String TEST_PROFILE_STEREOTYPE2 = "testProfile::Stereotype2";
+
+	@Test
+	public void test2StereotypeApplicationsOnClass() {
+		test2StereotypeApplications(UMLElementTypes.Class_Shape);
+
+	}
+
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void test2StereotypeApplications(IElementType type) {
+
+		// VARIABLES
+		org.eclipse.uml2.uml.Class class1 = null;
+		// stereotype that is applied on class1
+		Stereotype stereotypeTest = null;
+		// view of the class
+		View NotationClass1 = null;
+		// editpart of class1
+		GraphicalEditPart classEditPart = null;
+		// compartment of stereotype
+		View appliedStereotypeCompartmentNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeBraceNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeLabelNotation = null;
+
+		// compartment Shape
+		View shapeCompartmentView = null;
+		// the view of the applied stereotype property
+		View stereotypePropertyView = null;
+		GraphicalEditPart stereotypeClassLabelEditPart = null;
+
+
+		// CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+		// 1 element element due to the reference to the profile
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
+
+
+		{// execution of the command
+			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CREATION + COMMAND_NULL, command);
+			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		}
+
+		// get the created Class
+		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
+		assertNotNull("created class must be not null", class1);
+		// look for the editpart that the class
+		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
+		// test if stereotype can be applied
+		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);
+
+		{// execution of the application of the stereotype
+			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
+			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));
+			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
+			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
+			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);
+		}
+
+		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE2) != null);
+
+		{// execution of the application of the stereotype
+			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
+			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE2));
+			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
+			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
+			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);
+		}
+
+		// look for the applied stereotype compartment
+		NotationClass1 = classEditPart.getNotationView();
+
+		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {
+			View view = (View) NotationClass1.getTransientChildren().get(i);
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {
+				appliedStereotypeCompartmentNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {
+				appliedStereotypeBraceNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {
+				appliedStereotypeLabelNotation = view;
+			}
+			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {
+				shapeCompartmentView = view;
+			}
+		}
+		// the mechanism of stereotype display is running.
+		// the thread is synchronous
+		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);
+		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);
+		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);
+		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);
+
+		// now display stereotypes
+		stereotypeTest = class1.getAppliedStereotypes().get(0);
+
+		{// display stereotype1
+			classEditPart.refresh();
+
+			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
+
+			// get the label
+			PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();
+			assertTrue("stereotype label must be not null", stereotypeLabel != null);
+			assertEquals("The display of applied stereotype name is not correct", ST_LEFT + "Stereotype1, Stereotype2" + ST_RIGHT, stereotypeLabel.getText());
+		}
+
+	}
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");
+		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
+		URI modelUri = registeredProfile.getUri();
+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
+		final Profile profile = (Profile) modelResource.getContents().get(0);
+		// PackageUtil.applyProfile(root,profile, false);
+		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
+		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
+	}
+
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return FILE_NAME;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplication.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplication.java
index 865fc2cc36b..eaa1e9f0a7e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplication.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplication.java
@@ -1,380 +1,380 @@
-/*****************************************************************************

- * 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:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.displayname;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

-import org.eclipse.papyrus.junit.utils.DisplayUtils;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeUserActionHelper;

-import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeEmptyEditPart;

-import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Create a class on the class diagram, apply "stereotype1" on this class. Test if the "stereotype1" is displayed under the name.

- *

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0021

- * - When the stereotype is applied, the shape displays automatically the name of the stereotype in the label of stereotype

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0023

- * - Each applied stereotype can be either displayed with a short name or with the Qualified Name in the label of stereotype

- *

- */

-public class TestStereotypeApplication extends AbstractPapyrusTestCase {

-	/** name of the test project */

-	public final String PROJECT_NAME = "TestStereotypeApplicationProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "TestStereotypeApplication.di";

-

-

-

-	protected static final String ST_LEFT = String.valueOf("\u00AB");

-

-	protected static final String ST_RIGHT = String.valueOf("\u00BB");

-

-	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";

-

-	@Test

-	public void testStereotypeApplicationOnClass() {

-		testToCreateANode(UMLElementTypes.Class_Shape);

-

-	}

-

-	@Test

-	public void testStereotypeApplicationOnPackage() {

-		testToCreateAPackage(UMLElementTypes.Package_Shape);

-

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testToCreateANode(IElementType type) {

-

-		// VARIABLES

-		org.eclipse.uml2.uml.Class class1 = null;

-		// stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		// view of the class

-		View NotationClass1 = null;

-		// editpart of class1

-		GraphicalEditPart classEditPart = null;

-		// compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeBraceNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeLabelNotation = null;

-

-		// compartment Shape

-		View shapeCompartmentView = null;

-		// the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeClassLabelEditPart = null;

-

-

-		// CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		// 1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{// execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		// get the created Class

-		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");

-		assertNotNull("created class must be not null", class1);

-		// look for the editpart that the class

-		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);

-		// test if stereotype can be applied

-		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-		// look for the applied stereotype compartment

-		NotationClass1 = classEditPart.getNotationView();

-

-		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {

-			View view = (View) NotationClass1.getTransientChildren().get(i);

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {

-				appliedStereotypeBraceNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {

-				appliedStereotypeLabelNotation = view;

-			}

-			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		// the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);

-		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-		// now display stereotypes

-		stereotypeTest = class1.getAppliedStereotypes().get(0);

-

-		{// display stereotype1

-			RecordingCommand displayStereotypeCommand = StereotypeUserActionHelper.getAddAppliedStereotypeCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest.getName());

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayStereotypeCommand);

-

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);

-

-			// get the label

-			PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();

-			assertTrue("stereotype label must be not null", stereotypeLabel != null);

-			assertTrue("text of stereotype label be equals to" + ST_LEFT + "Stereotype1" + ST_RIGHT, stereotypeLabel.getText().equals(ST_LEFT + "Stereotype1" + ST_RIGHT));

-		}

-

-		// {// test display of property of stereotype in compartment

-		// RecordingCommand displayPropertyStereotypeCommand = StereotypeUserActionHelper.getAddAppliedStereotypeCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest.getQualifiedName() + ".testInt");

-		// diagramEditor.getEditingDomain().getCommandStack().execute(displayPropertyStereotypeCommand);

-		//

-		// // the compartment must be visible

-		// assertTrue("the compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible() == false);

-		// assertTrue("the Brace compartment must not be visible", appliedStereotypeBraceNotation.isVisible() == false);

-		// assertTrue("the Label must be visible", appliedStereotypeLabelNotation.isVisible() == true);

-		// stereotypeClassLabelEditPart = (GraphicalEditPart) classEditPart.getChildBySemanticHint("StereotypeLabel");

-		// assertTrue("The StereotypeLabel must not be an Empty EditPart", stereotypeClassLabelEditPart instanceof AppliedStereotypeEmptyEditPart);

-		//

-		//

-		//

-		// // look for view that represents the property of the applied stereotype

-		// stereotypePropertyView = (View) appliedStereotypeCompartmentNotation.getChildren().get(0);

-		// assertNotNull("the view of the applied stereotype property must be created", stereotypePropertyView);

-		// }

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");

-		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		final Profile profile = (Profile) modelResource.getContents().get(0);

-		// PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testToCreateAPackage(IElementType type) {

-

-		// VARIABLES

-		org.eclipse.uml2.uml.Package package1 = null;

-		// stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		// view of the class

-		View Notationpackage1 = null;

-		// editpart of class1

-		GraphicalEditPart package1EditPart = null;

-		// compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeBraceNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeLabelNotation = null;

-		// compartment Shape

-		View shapeCompartmentView = null;

-		// the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypePackageLabelEditPart = null;

-

-		// CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		// 1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{// execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		// get the created Class

-		package1 = (org.eclipse.uml2.uml.Package) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Package1");

-		assertNotNull("created class must be not null", package1);

-		// look for the editpart that the class

-		package1EditPart = (PackageEditPart) getDiagramEditPart().getChildren().get(0);

-		// test if stereotype can be applied

-		assertTrue("stereotype1 must be applicable on class1", package1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(package1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) package1EditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", package1.getAppliedStereotypes().size() != 0);

-		}

-

-		// look for the applied stereotype compartment

-		Notationpackage1 = package1EditPart.getNotationView();

-

-		for (int i = 0; i < Notationpackage1.getTransientChildren().size(); i++) {

-			View view = (View) Notationpackage1.getTransientChildren().get(i);

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {

-				appliedStereotypeBraceNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {

-				appliedStereotypeLabelNotation = view;

-			}

-			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		// the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);

-		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);

-		assertTrue("No stereotype shape Compartment found in the notation", shapeCompartmentView != null);

-

-		// now display stereotypes

-		stereotypeTest = package1.getAppliedStereotypes().get(0);

-

-		{// display stereotype1

-			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeLabelNotation, true, true);

-

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) package1EditPart.getFigure()).getChildren().get(0);

-			DisplayUtils.flushEventLoop();

-			// get the label

-			PapyrusWrappingLabel stereotypeLabel = ((PackageFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();

-			assertTrue("stereotype label must be not null", stereotypeLabel != null);

-			assertTrue("text of stereotype label be equals to " + ST_LEFT + "Stereotype1" + ST_RIGHT, stereotypeLabel.getText().equals(ST_LEFT + "Stereotype1" + ST_RIGHT));

-		}

-

-		// the compartment must be visible

-		assertTrue("the compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible() == false);

-		assertTrue("the Brace compartment must not be visible", appliedStereotypeBraceNotation.isVisible() == false);

-		assertTrue("the Label must be visible", appliedStereotypeLabelNotation.isVisible() == true);

-		stereotypePackageLabelEditPart = (GraphicalEditPart) package1EditPart.getChildBySemanticHint("StereotypeLabel");

-		assertTrue("The StereotypeLabel must not be an Empty EditPart", stereotypePackageLabelEditPart instanceof AppliedStereotypeEmptyEditPart);

-

-		// look for view that represents the property of the applied stereotype

-		stereotypePropertyView = (View) appliedStereotypeCompartmentNotation.getChildren().get(0);

-		assertNotNull("the view of the applied stereotype property must be created", stereotypePropertyView);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return FILE_NAME;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *  Christian W. Damus (CEA) - bug 434594
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.displayname;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.junit.utils.DisplayUtils;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeUserActionHelper;
+import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeEmptyEditPart;
+import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Create a class on the class diagram, apply "stereotype1" on this class. Test if the "stereotype1" is displayed under the name.
+ *
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0021
+ * - When the stereotype is applied, the shape displays automatically the name of the stereotype in the label of stereotype
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_0023
+ * - Each applied stereotype can be either displayed with a short name or with the Qualified Name in the label of stereotype
+ *
+ */
+public class TestStereotypeApplication extends AbstractPapyrusTestCase {
+	/** name of the test project */
+	public final String PROJECT_NAME = "TestStereotypeApplicationProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "TestStereotypeApplication.di";
+
+
+
+	protected static final String ST_LEFT = String.valueOf("\u00AB");
+
+	protected static final String ST_RIGHT = String.valueOf("\u00BB");
+
+	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";
+
+	@Test
+	public void testStereotypeApplicationOnClass() {
+		testToCreateANode(UMLElementTypes.Class_Shape);
+
+	}
+
+	@Test
+	public void testStereotypeApplicationOnPackage() {
+		testToCreateAPackage(UMLElementTypes.Package_Shape);
+
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testToCreateANode(IElementType type) {
+
+		// VARIABLES
+		org.eclipse.uml2.uml.Class class1 = null;
+		// stereotype that is applied on class1
+		Stereotype stereotypeTest = null;
+		// view of the class
+		View NotationClass1 = null;
+		// editpart of class1
+		GraphicalEditPart classEditPart = null;
+		// compartment of stereotype
+		View appliedStereotypeCompartmentNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeBraceNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeLabelNotation = null;
+
+		// compartment Shape
+		View shapeCompartmentView = null;
+		// the view of the applied stereotype property
+		View stereotypePropertyView = null;
+		GraphicalEditPart stereotypeClassLabelEditPart = null;
+
+
+		// CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+		// 1 element element due to the reference to the profile
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
+
+
+		{// execution of the command
+			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CREATION + COMMAND_NULL, command);
+			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		}
+
+		// get the created Class
+		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
+		assertNotNull("created class must be not null", class1);
+		// look for the editpart that the class
+		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
+		// test if stereotype can be applied
+		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);
+
+		{// execution of the application of the stereotype
+			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
+			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));
+			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
+			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
+			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);
+		}
+
+		// look for the applied stereotype compartment
+		NotationClass1 = classEditPart.getNotationView();
+
+		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {
+			View view = (View) NotationClass1.getTransientChildren().get(i);
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {
+				appliedStereotypeCompartmentNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {
+				appliedStereotypeBraceNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {
+				appliedStereotypeLabelNotation = view;
+			}
+			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {
+				shapeCompartmentView = view;
+			}
+		}
+		// the mechanism of stereotype display is running.
+		// the thread is synchronous
+		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);
+		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);
+		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);
+		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);
+
+		// now display stereotypes
+		stereotypeTest = class1.getAppliedStereotypes().get(0);
+
+		{// display stereotype1
+			RecordingCommand displayStereotypeCommand = StereotypeUserActionHelper.getAddAppliedStereotypeCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest.getName());
+			diagramEditor.getEditingDomain().getCommandStack().execute(displayStereotypeCommand);
+
+			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
+
+			// get the label
+			PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();
+			assertTrue("stereotype label must be not null", stereotypeLabel != null);
+			assertTrue("text of stereotype label be equals to" + ST_LEFT + "Stereotype1" + ST_RIGHT, stereotypeLabel.getText().equals(ST_LEFT + "Stereotype1" + ST_RIGHT));
+		}
+
+		// {// test display of property of stereotype in compartment
+		// RecordingCommand displayPropertyStereotypeCommand = StereotypeUserActionHelper.getAddAppliedStereotypeCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest.getQualifiedName() + ".testInt");
+		// diagramEditor.getEditingDomain().getCommandStack().execute(displayPropertyStereotypeCommand);
+		//
+		// // the compartment must be visible
+		// assertTrue("the compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible() == false);
+		// assertTrue("the Brace compartment must not be visible", appliedStereotypeBraceNotation.isVisible() == false);
+		// assertTrue("the Label must be visible", appliedStereotypeLabelNotation.isVisible() == true);
+		// stereotypeClassLabelEditPart = (GraphicalEditPart) classEditPart.getChildBySemanticHint("StereotypeLabel");
+		// assertTrue("The StereotypeLabel must not be an Empty EditPart", stereotypeClassLabelEditPart instanceof AppliedStereotypeEmptyEditPart);
+		//
+		//
+		//
+		// // look for view that represents the property of the applied stereotype
+		// stereotypePropertyView = (View) appliedStereotypeCompartmentNotation.getChildren().get(0);
+		// assertNotNull("the view of the applied stereotype property must be created", stereotypePropertyView);
+		// }
+	}
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");
+		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
+		URI modelUri = registeredProfile.getUri();
+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
+		final Profile profile = (Profile) modelResource.getContents().get(0);
+		// PackageUtil.applyProfile(root,profile, false);
+		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
+		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testToCreateAPackage(IElementType type) {
+
+		// VARIABLES
+		org.eclipse.uml2.uml.Package package1 = null;
+		// stereotype that is applied on class1
+		Stereotype stereotypeTest = null;
+		// view of the class
+		View Notationpackage1 = null;
+		// editpart of class1
+		GraphicalEditPart package1EditPart = null;
+		// compartment of stereotype
+		View appliedStereotypeCompartmentNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeBraceNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeLabelNotation = null;
+		// compartment Shape
+		View shapeCompartmentView = null;
+		// the view of the applied stereotype property
+		View stereotypePropertyView = null;
+		GraphicalEditPart stereotypePackageLabelEditPart = null;
+
+		// CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+		// 1 element element due to the reference to the profile
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
+
+
+		{// execution of the command
+			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CREATION + COMMAND_NULL, command);
+			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		}
+
+		// get the created Class
+		package1 = (org.eclipse.uml2.uml.Package) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Package1");
+		assertNotNull("created class must be not null", package1);
+		// look for the editpart that the class
+		package1EditPart = (PackageEditPart) getDiagramEditPart().getChildren().get(0);
+		// test if stereotype can be applied
+		assertTrue("stereotype1 must be applicable on class1", package1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);
+
+		{// execution of the application of the stereotype
+			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
+			stereotypeslist.add(package1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));
+			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) package1EditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
+			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
+			assertTrue("No applied stereotype found on the element ", package1.getAppliedStereotypes().size() != 0);
+		}
+
+		// look for the applied stereotype compartment
+		Notationpackage1 = package1EditPart.getNotationView();
+
+		for (int i = 0; i < Notationpackage1.getTransientChildren().size(); i++) {
+			View view = (View) Notationpackage1.getTransientChildren().get(i);
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {
+				appliedStereotypeCompartmentNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {
+				appliedStereotypeBraceNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {
+				appliedStereotypeLabelNotation = view;
+			}
+			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {
+				shapeCompartmentView = view;
+			}
+		}
+		// the mechanism of stereotype display is running.
+		// the thread is synchronous
+		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);
+		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);
+		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);
+		assertTrue("No stereotype shape Compartment found in the notation", shapeCompartmentView != null);
+
+		// now display stereotypes
+		stereotypeTest = package1.getAppliedStereotypes().get(0);
+
+		{// display stereotype1
+			StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeLabelNotation, true, true);
+
+			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) package1EditPart.getFigure()).getChildren().get(0);
+			DisplayUtils.flushEventLoop();
+			// get the label
+			PapyrusWrappingLabel stereotypeLabel = ((PackageFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();
+			assertTrue("stereotype label must be not null", stereotypeLabel != null);
+			assertTrue("text of stereotype label be equals to " + ST_LEFT + "Stereotype1" + ST_RIGHT, stereotypeLabel.getText().equals(ST_LEFT + "Stereotype1" + ST_RIGHT));
+		}
+
+		// the compartment must be visible
+		assertTrue("the compartment must not be visible", appliedStereotypeCompartmentNotation.isVisible() == false);
+		assertTrue("the Brace compartment must not be visible", appliedStereotypeBraceNotation.isVisible() == false);
+		assertTrue("the Label must be visible", appliedStereotypeLabelNotation.isVisible() == true);
+		stereotypePackageLabelEditPart = (GraphicalEditPart) package1EditPart.getChildBySemanticHint("StereotypeLabel");
+		assertTrue("The StereotypeLabel must not be an Empty EditPart", stereotypePackageLabelEditPart instanceof AppliedStereotypeEmptyEditPart);
+
+		// look for view that represents the property of the applied stereotype
+		stereotypePropertyView = (View) appliedStereotypeCompartmentNotation.getChildren().get(0);
+		assertNotNull("the view of the applied stereotype property must be created", stereotypePropertyView);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return FILE_NAME;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplicationQualifiedName.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplicationQualifiedName.java
index 11f52506007..e64e8f28e46 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplicationQualifiedName.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplicationQualifiedName.java
@@ -1,246 +1,246 @@
-/*****************************************************************************

- * 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:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.displayname;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeUserActionHelper;

-import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Create a class.

- * Apply stereotype1.

- * Set the depth to full, the name of the profile must be display in the label of applied stereotype

- *

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_002

- * - The shape can display the name of the stereotypes that are applied on the UML element

- * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_003

- * - The user must be able to chose the depth of the QN to be displayed

- *

- */

-public class TestStereotypeApplicationQualifiedName extends AbstractPapyrusTestCase {

-	/** name of the test project */

-	public final String PROJECT_NAME = "TestStereotypeApplicationQualifiedNameProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "TestStereotypeApplicationQualifiedName.di";

-

-

-

-	protected static final String ST_LEFT = String.valueOf("\u00AB");

-

-	protected static final String ST_RIGHT = String.valueOf("\u00BB");

-

-	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";

-

-	@Test

-	public void testQNStereotypeApplicationOnClass() {

-		testToCreateANode(UMLElementTypes.Class_Shape);

-

-	}

-

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testToCreateANode(IElementType type) {

-

-		// VARIABLES

-		org.eclipse.uml2.uml.Class class1 = null;

-		// stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		// view of the class

-		View NotationClass1 = null;

-		// editpart of class1

-		GraphicalEditPart classEditPart = null;

-		// compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeBraceNotation = null;

-		// compartment of stereotype

-		View appliedStereotypeLabelNotation = null;

-

-		// compartment Shape

-		View shapeCompartmentView = null;

-		// the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeClassLabelEditPart = null;

-

-

-		// CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		// 1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{// execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		// get the created Class

-		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");

-		assertNotNull("created class must be not null", class1);

-		// look for the editpart that the class

-		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);

-		// test if stereotype can be applied

-		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-		// look for the applied stereotype compartment

-		NotationClass1 = classEditPart.getNotationView();

-

-		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {

-			View view = (View) NotationClass1.getTransientChildren().get(i);

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {

-				appliedStereotypeBraceNotation = view;

-			}

-			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {

-				appliedStereotypeLabelNotation = view;

-			}

-			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		// the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);

-		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-		// now display stereotypes

-		stereotypeTest = class1.getAppliedStereotypes().get(0);

-

-		{// display stereotype1

-

-

-			RecordingCommand displayStereotypeCommand = StereotypeUserActionHelper.getAddAppliedStereotypeToDisplayWithQNCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest, "full");

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayStereotypeCommand);

-			classEditPart.refresh();

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);

-

-			// get the label

-			PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();

-			assertTrue("stereotype label must be not null", stereotypeLabel != null);

-			assertEquals("the text of the applied stereotype must be conform with the depht", ST_LEFT + "testProfile::Stereotype1" + ST_RIGHT, stereotypeLabel.getText());

-		}

-

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");

-		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		final Profile profile = (Profile) modelResource.getContents().get(0);

-		// PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateClassDiagramCommand();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getProjectName() {

-		return PROJECT_NAME;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getFileName() {

-		return FILE_NAME;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *  Christian W. Damus (CEA) - bug 434594
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.displayname;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeUserActionHelper;
+import org.eclipse.papyrus.uml.diagram.stereotypeproperty.AppliedProfileCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Create a class.
+ * Apply stereotype1.
+ * Set the depth to full, the name of the profile must be display in the label of applied stereotype
+ *
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_002
+ * - The shape can display the name of the stereotypes that are applied on the UML element
+ * Verify requirements org.eclipse.papyrus.uml.diagram.stereotype.edition.REQ_003
+ * - The user must be able to chose the depth of the QN to be displayed
+ *
+ */
+public class TestStereotypeApplicationQualifiedName extends AbstractPapyrusTestCase {
+	/** name of the test project */
+	public final String PROJECT_NAME = "TestStereotypeApplicationQualifiedNameProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "TestStereotypeApplicationQualifiedName.di";
+
+
+
+	protected static final String ST_LEFT = String.valueOf("\u00AB");
+
+	protected static final String ST_RIGHT = String.valueOf("\u00BB");
+
+	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";
+
+	@Test
+	public void testQNStereotypeApplicationOnClass() {
+		testToCreateANode(UMLElementTypes.Class_Shape);
+
+	}
+
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testToCreateANode(IElementType type) {
+
+		// VARIABLES
+		org.eclipse.uml2.uml.Class class1 = null;
+		// stereotype that is applied on class1
+		Stereotype stereotypeTest = null;
+		// view of the class
+		View NotationClass1 = null;
+		// editpart of class1
+		GraphicalEditPart classEditPart = null;
+		// compartment of stereotype
+		View appliedStereotypeCompartmentNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeBraceNotation = null;
+		// compartment of stereotype
+		View appliedStereotypeLabelNotation = null;
+
+		// compartment Shape
+		View shapeCompartmentView = null;
+		// the view of the applied stereotype property
+		View stereotypePropertyView = null;
+		GraphicalEditPart stereotypeClassLabelEditPart = null;
+
+
+		// CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+		// 1 element element due to the reference to the profile
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
+
+
+		{// execution of the command
+			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CREATION + COMMAND_NULL, command);
+			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		}
+
+		// get the created Class
+		class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
+		assertNotNull("created class must be not null", class1);
+		// look for the editpart that the class
+		classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
+		// test if stereotype can be applied
+		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);
+
+		{// execution of the application of the stereotype
+			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
+			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));
+			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
+			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
+			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);
+		}
+
+		// look for the applied stereotype compartment
+		NotationClass1 = classEditPart.getNotationView();
+
+		for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {
+			View view = (View) NotationClass1.getTransientChildren().get(i);
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) {
+				appliedStereotypeCompartmentNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) {
+				appliedStereotypeBraceNotation = view;
+			}
+			if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_LABEL_TYPE)) {
+				appliedStereotypeLabelNotation = view;
+			}
+			if (view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {
+				shapeCompartmentView = view;
+			}
+		}
+		// the mechanism of stereotype display is running.
+		// the thread is synchronous
+		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);
+		assertTrue("No stereotype Brace Compartment found in the notation", appliedStereotypeBraceNotation != null);
+		assertTrue("No stereotype Label found in the notation", appliedStereotypeLabelNotation != null);
+		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);
+
+		// now display stereotypes
+		stereotypeTest = class1.getAppliedStereotypes().get(0);
+
+		{// display stereotype1
+
+
+			RecordingCommand displayStereotypeCommand = StereotypeUserActionHelper.getAddAppliedStereotypeToDisplayWithQNCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest, "full");
+			diagramEditor.getEditingDomain().getCommandStack().execute(displayStereotypeCommand);
+			classEditPart.refresh();
+			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
+
+			// get the label
+			PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();
+			assertTrue("stereotype label must be not null", stereotypeLabel != null);
+			assertEquals("the text of the applied stereotype must be conform with the depht", ST_LEFT + "testProfile::Stereotype1" + ST_RIGHT, stereotypeLabel.getText());
+		}
+
+	}
+
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("StereotypePropertyTestProfile");
+		final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
+		URI modelUri = registeredProfile.getUri();
+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
+		final Profile profile = (Profile) modelResource.getContents().get(0);
+		// PackageUtil.applyProfile(root,profile, false);
+		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
+		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateClassDiagramCommand();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getProjectName() {
+		return PROJECT_NAME;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getFileName() {
+		return FILE_NAME;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF
index 4a85a9a7f6d..e282e6a273e 100755
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.suite.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.suite.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)"

+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 0.0.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.suite.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.suite.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)"
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.settings/org.eclipse.jdt.core.prefs
index e6d053cf5eb..eb9bfba9949 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.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.7

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.7

-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.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.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+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.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
index 8e9b3374f11..7da68b5178d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
@@ -1,57 +1,57 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;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;bundle-version="[3.0.0,4.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.common.core,

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.xtend.lib,

- org.eclipse.xtend.lib.macro,

- org.eclipse.xtext.xbase.lib,

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.core.expressions;bundle-version="3.5.0",

- org.eclipse.papyrus.infra.gmfdiag.dnd;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.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.tests.appearance,

- org.eclipse.papyrus.uml.diagram.tests.canonical,

- org.eclipse.papyrus.uml.diagram.tests.createFromPalette,

- org.eclipse.papyrus.uml.diagram.tests.delete,

- org.eclipse.papyrus.uml.diagram.tests.drop,

- org.eclipse.papyrus.uml.diagram.tests.edition,

- org.eclipse.papyrus.uml.diagram.tests.rules,

- org.eclipse.papyrus.uml.diagram.tests.synchronization

-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.uml.diagram.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;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;bundle-version="[3.0.0,4.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.common.core,
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.expressions;bundle-version="3.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;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.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.tests.appearance,
+ org.eclipse.papyrus.uml.diagram.tests.canonical,
+ org.eclipse.papyrus.uml.diagram.tests.createFromPalette,
+ org.eclipse.papyrus.uml.diagram.tests.delete,
+ org.eclipse.papyrus.uml.diagram.tests.drop,
+ org.eclipse.papyrus.uml.diagram.tests.edition,
+ org.eclipse.papyrus.uml.diagram.tests.rules,
+ org.eclipse.papyrus.uml.diagram.tests.synchronization
+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.uml.diagram.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/build.properties
index 0b7de0cb874..9de44fbc9f5 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               about.html,\

-               resources/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               about.html,\
+               resources/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/Activator.java
index 7d55e837aec..61238bf6760 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/Activator.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:

- * (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.tests;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.tests"; //$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;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/appearance/AppearanceElementTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/appearance/AppearanceElementTest.java
index 21440d628ac..5dbc92b4c9f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/appearance/AppearanceElementTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/appearance/AppearanceElementTest.java
@@ -1,28 +1,28 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.tests.appearance;

-

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-

-

-public abstract class AppearanceElementTest  extends AbstractPapyrusTestCase{

-	

-	

-	public abstract void testAppearance(IElementType type);

-	public abstract GraphicalEditPart getContainerEditPart();

-	

-	

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.tests.appearance;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+
+
+public abstract class AppearanceElementTest  extends AbstractPapyrusTestCase{
+	
+	
+	public abstract void testAppearance(IElementType type);
+	public abstract GraphicalEditPart getContainerEditPart();
+	
+	
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractTestMultiLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractTestMultiLink.java
index 406b56dde3a..581a6251a2f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractTestMultiLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/AbstractTestMultiLink.java
@@ -1,434 +1,434 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.ConnectionAnchor;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.NodeEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gef.requests.ReconnectRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Relationship;

-import org.junit.Before;

-

-/**

- * The Class MultiLink.

- */

-public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase {

-

-	protected static final String THE_BRANCH_TO_RECONNECT_EXISTS = "the branch to reconnect exists"; //$NON-NLS-1$

-

-	protected static final String BRANCH_EXISTS_RECONNECTION_ON_TARGET = "branch exists reconnection on target "; //$NON-NLS-1$

-

-	protected static final String RECONNECTION_TARGET = "Reconnection target "; //$NON-NLS-1$

-

-	protected static final String BRANCH_EXISTS_RECONNECTION_ON_SOURCE = "branch exists reconnection on Source "; //$NON-NLS-1$

-

-	protected static final String RECONNECTION_SOURCE = "Reconnection Source "; //$NON-NLS-1$

-

-	GraphicalEditPart source = null;

-

-	GraphicalEditPart target = null;

-

-	GraphicalEditPart thirdPlayer = null;

-

-	GraphicalEditPart fourthPlayer = null;

-

-	GraphicalEditPart guestPlayer = null;

-

-	ConnectionEditPart binaryLink = null;

-

-	ShapeNodeEditPart linkNode = null;

-

-	/** The Constant CREATION. */

-	protected static final String CREATION = "CREATION:"; //$NON-NLS-1$

-

-	/** The Constant CONTAINER_CREATION. */

-	protected static final String CONTAINER_CREATION = "CONTAINER CREATION: "; //$NON-NLS-1$

-

-	/** The Constant DROP. */

-	protected static final String DROP = "DROP: "; //$NON-NLS-1$

-

-	/** The Constant DESTROY_DELETION. */

-	protected static final String DESTROY_DELETION = "DESTROY DELETION: "; //$NON-NLS-1$

-

-	/** The Constant COMMAND_NULL. */

-	protected static final String COMMAND_NULL = " command null"; //$NON-NLS-1$

-

-	/** The Constant VIEW_DELETION. */

-	protected static final String VIEW_DELETION = "VIEW DELETION: "; //$NON-NLS-1$

-

-	/** The Constant TEST_THE_REDO. */

-	protected static final String TEST_THE_REDO = "test the redo"; //$NON-NLS-1$

-

-	/** The Constant TEST_THE_UNDO. */

-	protected static final String TEST_THE_UNDO = "test the undo"; //$NON-NLS-1$

-

-	/** The Constant TEST_THE_EXECUTION. */

-	protected static final String TEST_THE_EXECUTION = "test the execution"; //$NON-NLS-1$

-

-	/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */

-	protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed"; //$NON-NLS-1$

-

-	/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */

-	protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created"; //$NON-NLS-1$

-

-	/** The Constant INITIALIZATION_TEST. */

-	protected static final String INITIALIZATION_TEST = "Intitial State"; //$NON-NLS-1$

-

-	/** The Constant CHANGE_CONTAINER. */

-	protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER"; //$NON-NLS-1$

-

-	/** The root compartment. */

-	protected ShapeCompartmentEditPart rootCompartment = null;

-

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testViewDeletion(IElementType type) {

-		//DELETION OF THE VIEW

-		//DELETION OF ALL THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, linkNode != null);

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = linkNode.getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 5);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 6);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 4);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 5);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 0);

-	}

-

-	public static Point getIntersectionPoint(ConnectionEditPart connEP, boolean source) {

-		ConnectionAnchor sourceAnchor;

-		ConnectionAnchor targetAnchor;

-		NodeEditPart sourceEP = (NodeEditPart)connEP.getSource();

-		NodeEditPart targetEP = (NodeEditPart)connEP.getTarget();

-		Point endLocation;

-		sourceAnchor = sourceEP.getSourceConnectionAnchor(connEP);

-		targetAnchor = targetEP.getTargetConnectionAnchor(connEP);

-		if(source) {

-			endLocation = sourceAnchor.getLocation(targetAnchor.getReferencePoint()).getCopy();

-		} else {

-			endLocation = targetAnchor.getLocation(sourceAnchor.getReferencePoint()).getCopy();

-		}

-		return endLocation;

-	}

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testDestroy(IElementType type) {

-		//DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 6);

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = linkNode.getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 5);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 6);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 4);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 5);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 0);

-	}

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testDrop(IElementType type) {

-		//DROP

-		//INIT

-		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 5);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 6);

-		assertTrue(DROP + INITIALIZATION_TEST, ((Diagram)getRootView()).getEdges().size() == 0);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().get(5) instanceof Relationship);

-		Relationship relationship = (Relationship)getRootSemanticModel().getOwnedElements().get(5);

-		//DO

-		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		ArrayList<Element> list = new ArrayList<Element>();

-		list.add(relationship);

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(new Point(20, 20));

-		Command command = getDiagramEditPart().getCommand(dropObjectsRequest);

-		assertNotNull(DROP + COMMAND_NULL, command);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DROP + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 6);

-		assertTrue(DROP + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 4);

-		//UNDO

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DROP + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 5);

-		assertTrue(DROP + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 0);

-		//REDO

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 6);

-		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 6);

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 4);

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param branchType

-	 *        type of the branch to create

-	 * @param flow

-	 *        TODO

-	 *

-	 */

-	public void testToCreateAMultiLink(IElementType branchType, boolean flow) {

-		//test to create the branch for dependency to node

-		Command cmd = target.getCommand(createConnectionViewRequest(branchType, binaryLink, thirdPlayer));

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 3);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 6);

-		//Undo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 6);

-		//redo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 3);

-		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 6);

-		assertTrue(CREATION + TEST_THE_REDO, getDiagramEditPart().getChildren().get(5) != null);

-		linkNode = (ShapeNodeEditPart)getDiagramEditPart().getChildren().get(5);

-		//test to create the branch from node to multidependency

-		if(flow) {

-			cmd = linkNode.getCommand(createConnectionViewRequest(branchType, fourthPlayer, linkNode));

-		} else {//test to create the branch from  multidependency to node

-			cmd = linkNode.getCommand(createConnectionViewRequest(branchType, linkNode, fourthPlayer));

-		}

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 4);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 6);

-		//undo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 3);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 6);

-		//redo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 4);

-		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 6);

-	}

-

-	public void testTargetReconnectAMultiLink(IElementType type) {

-		//target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_BRANCH_TO_RECONNECT_EXISTS, (ConnectionEditPart)target.getTargetConnections().get(0) != null);

-		ConnectionEditPart branch = (ConnectionEditPart)target.getTargetConnections().get(0);

-		reconnectRequest.setConnectionEditPart(branch);

-		reconnectRequest.setTargetEditPart(guestPlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

-		Command cmd = guestPlayer.getCommand(reconnectRequest);

-		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 4);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 6);

-		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET, branch.getTarget().equals(guestPlayer));

-		//undo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, branch.getTarget().equals(target));

-		//redo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, branch.getTarget().equals(guestPlayer));

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-	}

-

-	public void testSourceReconnectAMultiLink(IElementType type) {

-		//target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_BRANCH_TO_RECONNECT_EXISTS, (ConnectionEditPart)source.getSourceConnections().get(0) != null);

-		ConnectionEditPart branch = (ConnectionEditPart)source.getSourceConnections().get(0);

-		reconnectRequest.setConnectionEditPart(branch);

-		reconnectRequest.setTargetEditPart(guestPlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);

-		Command cmd = guestPlayer.getCommand(reconnectRequest);

-		assertTrue(RECONNECTION_SOURCE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		assertTrue(RECONNECTION_SOURCE + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 4);

-		assertTrue(RECONNECTION_SOURCE + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 6);

-		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_EXECUTION, branch.getSource().equals(guestPlayer));

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_UNDO, branch.getSource().equals(source));

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_REDO, branch.getSource().equals(guestPlayer));

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-	}

-

-	public CreateConnectionViewRequest createConnectionViewRequest(IElementType type, EditPart source, EditPart target) {

-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, ((IGraphicalEditPart)getDiagramEditPart()).getDiagramPreferencesHint());

-		connectionRequest.setSourceEditPart(null);

-		connectionRequest.setTargetEditPart(source);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);

-		source.getCommand(connectionRequest);

-		// Now, setup the request in preparation to get the

-		// connection end

-		// command.

-		connectionRequest.setSourceEditPart(source);

-		connectionRequest.setTargetEditPart(target);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);

-		return connectionRequest;

-	}

-

-	protected abstract CreateViewRequest createViewRequestShapeContainer();

-

-	/**

-	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()

-	 *

-	 * @throws Exception

-	 */

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		CreateViewRequest requestcreation = createViewRequestShapeContainer();

-		//1st node

-		requestcreation.setLocation(new Point(10, 10));

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);

-		requestcreation.setLocation(new Point(400, 10));

-		//2d node

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 2);

-		requestcreation.setLocation(new Point(200, 200));

-		//3d node

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 3);

-		source = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-		target = (GraphicalEditPart)getDiagramEditPart().getChildren().get(1);

-		thirdPlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(2);

-		//4d node

-		requestcreation.setLocation(new Point(400, 400));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		fourthPlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(3);

-		//4d guest

-		requestcreation.setLocation(new Point(600, 400));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 5);

-		guestPlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(4);

-	}

-

-	public void installbinaryLink(IElementType type) {

-		//binaryLink

-		Command command = target.getCommand(createConnectionViewRequest(type, source, target));

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram)getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 6);

-		binaryLink = (ConnectionEditPart)source.getSourceConnections().get(0);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()

-	 *

-	 * @return

-	 */

-	@Override

-	protected View getRootView() {

-		return (View)getDiagramEditPart().getModel();

-	}

-

-	/**

-	 * Test to manage child node.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testToManageMultiLink(IElementType binaryLinkType, IElementType branchType, boolean flow) {

-		installbinaryLink(binaryLinkType);

-		testToCreateAMultiLink(branchType, flow);

-		testTargetReconnectAMultiLink(branchType);

-		if(flow) {

-			testSourceReconnectAMultiLink(branchType);

-		}

-		testDestroy(branchType);

-		//end of the test

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getDiagramEditPart().getChildren().get(5) instanceof ShapeNodeEditPart);

-		linkNode = (ShapeNodeEditPart)getDiagramEditPart().getChildren().get(5);

-		testViewDeletion(branchType);

-		testDrop(branchType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.draw2d.ConnectionAnchor;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.NodeEditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Relationship;
+import org.junit.Before;
+
+/**
+ * The Class MultiLink.
+ */
+public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase {
+
+	protected static final String THE_BRANCH_TO_RECONNECT_EXISTS = "the branch to reconnect exists"; //$NON-NLS-1$
+
+	protected static final String BRANCH_EXISTS_RECONNECTION_ON_TARGET = "branch exists reconnection on target "; //$NON-NLS-1$
+
+	protected static final String RECONNECTION_TARGET = "Reconnection target "; //$NON-NLS-1$
+
+	protected static final String BRANCH_EXISTS_RECONNECTION_ON_SOURCE = "branch exists reconnection on Source "; //$NON-NLS-1$
+
+	protected static final String RECONNECTION_SOURCE = "Reconnection Source "; //$NON-NLS-1$
+
+	GraphicalEditPart source = null;
+
+	GraphicalEditPart target = null;
+
+	GraphicalEditPart thirdPlayer = null;
+
+	GraphicalEditPart fourthPlayer = null;
+
+	GraphicalEditPart guestPlayer = null;
+
+	ConnectionEditPart binaryLink = null;
+
+	ShapeNodeEditPart linkNode = null;
+
+	/** The Constant CREATION. */
+	protected static final String CREATION = "CREATION:"; //$NON-NLS-1$
+
+	/** The Constant CONTAINER_CREATION. */
+	protected static final String CONTAINER_CREATION = "CONTAINER CREATION: "; //$NON-NLS-1$
+
+	/** The Constant DROP. */
+	protected static final String DROP = "DROP: "; //$NON-NLS-1$
+
+	/** The Constant DESTROY_DELETION. */
+	protected static final String DESTROY_DELETION = "DESTROY DELETION: "; //$NON-NLS-1$
+
+	/** The Constant COMMAND_NULL. */
+	protected static final String COMMAND_NULL = " command null"; //$NON-NLS-1$
+
+	/** The Constant VIEW_DELETION. */
+	protected static final String VIEW_DELETION = "VIEW DELETION: "; //$NON-NLS-1$
+
+	/** The Constant TEST_THE_REDO. */
+	protected static final String TEST_THE_REDO = "test the redo"; //$NON-NLS-1$
+
+	/** The Constant TEST_THE_UNDO. */
+	protected static final String TEST_THE_UNDO = "test the undo"; //$NON-NLS-1$
+
+	/** The Constant TEST_THE_EXECUTION. */
+	protected static final String TEST_THE_EXECUTION = "test the execution"; //$NON-NLS-1$
+
+	/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */
+	protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed"; //$NON-NLS-1$
+
+	/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */
+	protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created"; //$NON-NLS-1$
+
+	/** The Constant INITIALIZATION_TEST. */
+	protected static final String INITIALIZATION_TEST = "Intitial State"; //$NON-NLS-1$
+
+	/** The Constant CHANGE_CONTAINER. */
+	protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER"; //$NON-NLS-1$
+
+	/** The root compartment. */
+	protected ShapeCompartmentEditPart rootCompartment = null;
+
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testViewDeletion(IElementType type) {
+		//DELETION OF THE VIEW
+		//DELETION OF ALL THE VIEW
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, linkNode != null);
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = linkNode.getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 5);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 6);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 4);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 5);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 0);
+	}
+
+	public static Point getIntersectionPoint(ConnectionEditPart connEP, boolean source) {
+		ConnectionAnchor sourceAnchor;
+		ConnectionAnchor targetAnchor;
+		NodeEditPart sourceEP = (NodeEditPart)connEP.getSource();
+		NodeEditPart targetEP = (NodeEditPart)connEP.getTarget();
+		Point endLocation;
+		sourceAnchor = sourceEP.getSourceConnectionAnchor(connEP);
+		targetAnchor = targetEP.getTargetConnectionAnchor(connEP);
+		if(source) {
+			endLocation = sourceAnchor.getLocation(targetAnchor.getReferencePoint()).getCopy();
+		} else {
+			endLocation = targetAnchor.getLocation(sourceAnchor.getReferencePoint()).getCopy();
+		}
+		return endLocation;
+	}
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testDestroy(IElementType type) {
+		//DESTROY SEMANTIC+ VIEW
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 6);
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = linkNode.getCommand(deleteViewRequest);
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 5);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 6);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 4);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 5);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 0);
+	}
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testDrop(IElementType type) {
+		//DROP
+		//INIT
+		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 5);
+		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 6);
+		assertTrue(DROP + INITIALIZATION_TEST, ((Diagram)getRootView()).getEdges().size() == 0);
+		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().get(5) instanceof Relationship);
+		Relationship relationship = (Relationship)getRootSemanticModel().getOwnedElements().get(5);
+		//DO
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		list.add(relationship);
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(new Point(20, 20));
+		Command command = getDiagramEditPart().getCommand(dropObjectsRequest);
+		assertNotNull(DROP + COMMAND_NULL, command);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DROP + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 6);
+		assertTrue(DROP + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 4);
+		//UNDO
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DROP + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 5);
+		assertTrue(DROP + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 0);
+		//REDO
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 6);
+		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 6);
+		assertTrue(DROP + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 4);
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param branchType
+	 *        type of the branch to create
+	 * @param flow
+	 *        TODO
+	 *
+	 */
+	public void testToCreateAMultiLink(IElementType branchType, boolean flow) {
+		//test to create the branch for dependency to node
+		Command cmd = target.getCommand(createConnectionViewRequest(branchType, binaryLink, thirdPlayer));
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 3);
+		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 6);
+		//Undo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 6);
+		//redo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 3);
+		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 6);
+		assertTrue(CREATION + TEST_THE_REDO, getDiagramEditPart().getChildren().get(5) != null);
+		linkNode = (ShapeNodeEditPart)getDiagramEditPart().getChildren().get(5);
+		//test to create the branch from node to multidependency
+		if(flow) {
+			cmd = linkNode.getCommand(createConnectionViewRequest(branchType, fourthPlayer, linkNode));
+		} else {//test to create the branch from  multidependency to node
+			cmd = linkNode.getCommand(createConnectionViewRequest(branchType, linkNode, fourthPlayer));
+		}
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 4);
+		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 6);
+		//undo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, ((Diagram)getRootView()).getEdges().size() == 3);
+		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 6);
+		//redo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 4);
+		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 6);
+	}
+
+	public void testTargetReconnectAMultiLink(IElementType type) {
+		//target reconnection
+		ReconnectRequest reconnectRequest = new ReconnectRequest();
+		assertTrue(THE_BRANCH_TO_RECONNECT_EXISTS, (ConnectionEditPart)target.getTargetConnections().get(0) != null);
+		ConnectionEditPart branch = (ConnectionEditPart)target.getTargetConnections().get(0);
+		reconnectRequest.setConnectionEditPart(branch);
+		reconnectRequest.setTargetEditPart(guestPlayer);
+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
+		Command cmd = guestPlayer.getCommand(reconnectRequest);
+		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 4);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 6);
+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET, branch.getTarget().equals(guestPlayer));
+		//undo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, branch.getTarget().equals(target));
+		//redo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, branch.getTarget().equals(guestPlayer));
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+	}
+
+	public void testSourceReconnectAMultiLink(IElementType type) {
+		//target reconnection
+		ReconnectRequest reconnectRequest = new ReconnectRequest();
+		assertTrue(THE_BRANCH_TO_RECONNECT_EXISTS, (ConnectionEditPart)source.getSourceConnections().get(0) != null);
+		ConnectionEditPart branch = (ConnectionEditPart)source.getSourceConnections().get(0);
+		reconnectRequest.setConnectionEditPart(branch);
+		reconnectRequest.setTargetEditPart(guestPlayer);
+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);
+		Command cmd = guestPlayer.getCommand(reconnectRequest);
+		assertTrue(RECONNECTION_SOURCE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+		assertTrue(RECONNECTION_SOURCE + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 4);
+		assertTrue(RECONNECTION_SOURCE + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 6);
+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_EXECUTION, branch.getSource().equals(guestPlayer));
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_UNDO, branch.getSource().equals(source));
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_REDO, branch.getSource().equals(guestPlayer));
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+	}
+
+	public CreateConnectionViewRequest createConnectionViewRequest(IElementType type, EditPart source, EditPart target) {
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, ((IGraphicalEditPart)getDiagramEditPart()).getDiagramPreferencesHint());
+		connectionRequest.setSourceEditPart(null);
+		connectionRequest.setTargetEditPart(source);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
+		source.getCommand(connectionRequest);
+		// Now, setup the request in preparation to get the
+		// connection end
+		// command.
+		connectionRequest.setSourceEditPart(source);
+		connectionRequest.setTargetEditPart(target);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
+		return connectionRequest;
+	}
+
+	protected abstract CreateViewRequest createViewRequestShapeContainer();
+
+	/**
+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()
+	 *
+	 * @throws Exception
+	 */
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		CreateViewRequest requestcreation = createViewRequestShapeContainer();
+		//1st node
+		requestcreation.setLocation(new Point(10, 10));
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);
+		requestcreation.setLocation(new Point(400, 10));
+		//2d node
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 2);
+		requestcreation.setLocation(new Point(200, 200));
+		//3d node
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 3);
+		source = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
+		target = (GraphicalEditPart)getDiagramEditPart().getChildren().get(1);
+		thirdPlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(2);
+		//4d node
+		requestcreation.setLocation(new Point(400, 400));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		fourthPlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(3);
+		//4d guest
+		requestcreation.setLocation(new Point(600, 400));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 5);
+		guestPlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(4);
+	}
+
+	public void installbinaryLink(IElementType type) {
+		//binaryLink
+		Command command = target.getCommand(createConnectionViewRequest(type, source, target));
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram)getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 6);
+		binaryLink = (ConnectionEditPart)source.getSourceConnections().get(0);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()
+	 *
+	 * @return
+	 */
+	@Override
+	protected View getRootView() {
+		return (View)getDiagramEditPart().getModel();
+	}
+
+	/**
+	 * Test to manage child node.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testToManageMultiLink(IElementType binaryLinkType, IElementType branchType, boolean flow) {
+		installbinaryLink(binaryLinkType);
+		testToCreateAMultiLink(branchType, flow);
+		testTargetReconnectAMultiLink(branchType);
+		if(flow) {
+			testSourceReconnectAMultiLink(branchType);
+		}
+		testDestroy(branchType);
+		//end of the test
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, getDiagramEditPart().getChildren().get(5) instanceof ShapeNodeEditPart);
+		linkNode = (ShapeNodeEditPart)getDiagramEditPart().getChildren().get(5);
+		testViewDeletion(branchType);
+		testDrop(branchType);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestChildLabel.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestChildLabel.java
index 54e6a1472cc..4d03c8d31cd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestChildLabel.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestChildLabel.java
@@ -1,439 +1,439 @@
-/*****************************************************************************

- * 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.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.Shape;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.uml2.uml.Element;

-import org.junit.Assert;

-

-

-/**

- * The Class TestChildLabel.

- */

-public abstract class TestChildLabel extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {

-

-	/** The Constant CREATION. */

-	protected static final String CREATION = "CREATION:"; //$NON-NLS-1$

-

-	/** The Constant CONTAINER_CREATION. */

-	protected static final String CONTAINER_CREATION = "CONTAINER CREATION: "; //$NON-NLS-1$

-

-	/** The Constant DROP. */

-	protected static final String DROP = "DROP: "; //$NON-NLS-1$

-

-	/** The Constant DESTROY_DELETION. */

-	protected static final String DESTROY_DELETION = "DESTROY DELETION: "; //$NON-NLS-1$

-

-	/** The Constant COMMAND_NULL. */

-	protected static final String COMMAND_NULL = " command null"; //$NON-NLS-1$

-

-	/** The Constant VIEW_DELETION. */

-	protected static final String VIEW_DELETION = "VIEW DELETION: "; //$NON-NLS-1$

-

-	/** The Constant TEST_THE_REDO. */

-	protected static final String TEST_THE_REDO = "test the redo"; //$NON-NLS-1$

-

-	/** The Constant TEST_THE_UNDO. */

-	protected static final String TEST_THE_UNDO = "test the undo"; //$NON-NLS-1$

-

-	/** The Constant TEST_THE_EXECUTION. */

-	protected static final String TEST_THE_EXECUTION = "test the execution"; //$NON-NLS-1$

-

-	/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */

-	protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed"; //$NON-NLS-1$

-

-	/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */

-	protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created"; //$NON-NLS-1$

-

-	/** The Constant INITIALIZATION_TEST. */

-	protected static final String INITIALIZATION_TEST = "Intitial State"; //$NON-NLS-1$

-

-	/** The Constant CHANGE_CONTAINER. */

-	protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER"; //$NON-NLS-1$

-

-	/** The top node. */

-	protected GraphicalEditPart topNode;

-

-	public abstract DiagramUpdater getDiagramUpdater();

-	

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testViewDeletion(IElementType type, String containerType) {

-		ListCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < getTopEditPart().getChildren().size()) {

-			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$

-				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null); //$NON-NLS-1$

-		//DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, compartment.getChildren().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((GraphicalEditPart)compartment.getChildren().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, compartment.getChildren().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, compartment.getChildren().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);

-	}

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testDestroy(IElementType type, String containerType) {

-		ListCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < getTopEditPart().getChildren().size()) {

-			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$

-				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null); //$NON-NLS-1$

-		//DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, compartment.getChildren().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ((GraphicalEditPart)compartment.getChildren().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		//assertTrue(DESTROY_DELETION +TEST_THE_UNDO,compartment.getChildren().size()==1);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, compartment.getChildren().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);

-	}

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testDrop(IElementType type, String containerType) {

-		ListCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < getTopEditPart().getChildren().size()) {

-			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$

-				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null); //$NON-NLS-1$

-		//DROP

-		assertTrue(DROP + INITIALIZATION_TEST, compartment.getChildren().size() == 0);

-		assertTrue(DROP + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);

-		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		ArrayList<Element> list = new ArrayList<Element>();

-		list.add(getRootSemanticModel().getOwnedElements().get(0));

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(new Point(20, 20));

-		Command command = compartment.getCommand(dropObjectsRequest);

-		assertNotNull(DROP + COMMAND_NULL, command);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DROP + TEST_THE_EXECUTION, compartment.getChildren().size() != 0);

-		assertTrue(DROP + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() != 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DROP + TEST_THE_UNDO, compartment.getChildren().size() == 0);

-		assertTrue(DROP + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() != 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DROP + TEST_THE_REDO, compartment.getChildren().size() != 0);

-		assertTrue(DROP + TEST_THE_REDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() != 0);

-	}

-

-	/**

-	 * Test change container.

-	 *

-	 * @param topNodeType

-	 *        the top node type

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testChangeContainer(IElementType topNodeType, IElementType type, String containerType) {

-		ListCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < getTopEditPart().getChildren().size()) {

-			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$

-				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null); //$NON-NLS-1$

-		//CHANGE CONTAINER

-		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, compartment.getChildren().size() == 1);

-		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);

-		Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(topNodeType, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CONTAINER_CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 2);

-		GraphicalEditPart newContainerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(1);

-		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);

-		changeBoundsRequest.setEditParts((EditPart)compartment.getChildren().get(0));

-		changeBoundsRequest.setLocation(new Point(30, 30));

-		ListCompartmentEditPart newCompartment = null;

-		index = 0;

-		while(newCompartment == null && index < newContainerEditPart.getChildren().size()) {

-			if((newContainerEditPart.getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals("" + containerType))) { //$NON-NLS-1$

-				newCompartment = (ListCompartmentEditPart)(newContainerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("NewContainer not found", newCompartment != null); //$NON-NLS-1$

-		command = newCompartment.getCommand(changeBoundsRequest);

-		assertNotNull(CHANGE_CONTAINER, command);

-		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, newCompartment.getChildren().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, compartment.getChildren().size() == 1);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, newCompartment.getChildren().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, compartment.getChildren().size() == 0);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, newCompartment.getChildren().size() == 1);

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 * @param maskmanaged used to test if the editpart must have a mask managed edit policy

-	 */

-	public void testToCreateANode(IElementType type, String containerType, boolean maskmanaged, String initialName) {

-		ListCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < getTopEditPart().getChildren().size()) {

-			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$

-				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null); //$NON-NLS-1$

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, compartment.getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = compartment.getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);

-		Assert.assertTrue("Node must be org.eclipse.gmf.runtime.notation.Shape",((EditPart)compartment.getChildren().get(0)).getModel() instanceof Shape); //$NON-NLS-1$

-		EditPart createdEditPart= (EditPart)compartment.getChildren().get(0);

-		testNodeEditPart(maskmanaged, createdEditPart, initialName);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, compartment.getChildren().size() == 0);

-		assertTrue(CREATION + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue("CREATION: " + TEST_THE_REDO, compartment.getChildren().size() == 1); //$NON-NLS-1$

-		

-		Assert.assertNotEquals("Diagram updater must detect that children has been created",0,getDiagramUpdater().getSemanticChildren(getRootView()).size()); //$NON-NLS-1$

-		Assert.assertEquals("Diagram updater must detect that no link has been created",0,getDiagramUpdater().getContainedLinks(getRootView()).size()); //$NON-NLS-1$

-		Assert.assertEquals ("Diagram updater must detect that no link are incoming",0,getDiagramUpdater().getIncomingLinks(((GraphicalEditPart) compartment.getChildren().get(0)).getNotationView()).size()); //$NON-NLS-1$

-		Assert.assertEquals ("Diagram updater must detect that no link are outgoing",0,getDiagramUpdater().getOutgoingLinks(((GraphicalEditPart) compartment.getChildren().get(0)).getNotationView()).size()); //$NON-NLS-1$

-		Assert.assertEquals ("Diagram updater must detect that no children has ben created in the new element",0,getDiagramUpdater().getSemanticChildren(((GraphicalEditPart) compartment.getChildren().get(0)).getNotationView()).size()); //$NON-NLS-1$

-		Assert.assertEquals ("Diagram updater must detect that no link has been created in the new element",0,getDiagramUpdater().getContainedLinks(((GraphicalEditPart) compartment.getChildren().get(0)).getNotationView()).size()); //$NON-NLS-1$

-		

-		

-		

-	}

-	/**

-	 * this method is used to test the created editpart

-	 * @param maskmanaged

-	 * @param createdEditPart

-	 */

-	protected void testNodeEditPart(boolean maskmanaged, EditPart createdEditPart, String initialName) {

-		Assert.assertNotNull("The editpart must be created", createdEditPart); //$NON-NLS-1$

-		if( maskmanaged){

-			Assert.assertNotNull("the created editpolicy must have as MASK_MANAGED_LABEL_EDIT_POLICY", createdEditPart.getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY)); //$NON-NLS-1$

-		}

-		Assert.assertTrue("the primary editpart must be the namelabelEditpart",createdEditPart instanceof ITextAwareEditPart); //$NON-NLS-1$

-		Assert.assertTrue("the primary editpart must be the namelabelEditpart",createdEditPart instanceof GraphicalEditPart); //$NON-NLS-1$

-		String name=((GraphicalEditPart)createdEditPart).resolveSemanticElement().eClass().getName();

-		if(initialName!=null){

-			name= initialName;

-		}

-		if(name.length()<((ITextAwareEditPart)createdEditPart).getEditText().length()){

-			Assert.assertEquals(" the name must contain the name of the metaclass",name, ((ITextAwareEditPart)createdEditPart).getEditText().substring(0,name.length())); //$NON-NLS-1$

-		}

-		else{

-			//not the same it sure but display the mistake is important

-			Assert.assertEquals(" the name must contain the name of the metaclass",name, ((ITextAwareEditPart)createdEditPart).getEditText()); //$NON-NLS-1$

-		}

-		Assert.assertTrue("the primary editpart must be the namelabelEditpart",createdEditPart instanceof CompartmentEditPart); //$NON-NLS-1$

-		Assert.assertTrue("namelabelEditpart must be editable",((CompartmentEditPart)createdEditPart).isEditModeEnabled()); //$NON-NLS-1$

-	}

-

-	/**

-	 * Test to create a top node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateATopNode(IElementType type) {

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element)((View)getDiagramEditPart().getModel()).getElement()).getOwnedElements().size() == 0);

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		topNode = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-	}

-

-	/**

-	 * Gets the top edit part.

-	 *

-	 * @return the top edit part

-	 */

-	public GraphicalEditPart getTopEditPart() {

-		return topNode;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootSemanticModel()

-	 *

-	 * @return

-	 */

-	@Override

-	protected Element getRootSemanticModel() {

-		return (Element)((View)getTopEditPart().getModel()).getElement();

-	}

-

-	/**

-	 * Test to manage top node.

-	 *

-	 * @param topNodeType

-	 *        the top node type

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testToManageTopNode(IElementType topNodeType, IElementType type, String containerType,String initialName) {

-		testToCreateATopNode(topNodeType);

-		testToCreateANode(type, containerType, false, initialName);

-		testDestroy(type, containerType);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		testViewDeletion(type, containerType);

-		testDrop(type, containerType);

-		testChangeContainer(topNodeType, type, containerType);

-	}

-	

-	/**

-	 * Test to manage top node.

-	 *

-	 * @param topNodeType

-	 *        the top node type

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testToManageTopNode(IElementType topNodeType, IElementType type, String containerType) {

-		testToManageTopNode(topNodeType, type, containerType, null);

-	}

-

-	/**

-	 * Test to manage top node and test if an editpolicy mask managed is applied.

-	 *

-	 * @param topNodeType

-	 *        the top node type

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testToManageTopNodeWithMask(IElementType topNodeType, IElementType type, String containerType,String initialName) {

-		testToCreateATopNode(topNodeType);

-		testToCreateANode(type, containerType, true, initialName);

-		testDestroy(type, containerType);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		testViewDeletion(type, containerType);

-		testDrop(type, containerType);

-		testChangeContainer(topNodeType, type, containerType);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.uml2.uml.Element;
+import org.junit.Assert;
+
+
+/**
+ * The Class TestChildLabel.
+ */
+public abstract class TestChildLabel extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {
+
+	/** The Constant CREATION. */
+	protected static final String CREATION = "CREATION:"; //$NON-NLS-1$
+
+	/** The Constant CONTAINER_CREATION. */
+	protected static final String CONTAINER_CREATION = "CONTAINER CREATION: "; //$NON-NLS-1$
+
+	/** The Constant DROP. */
+	protected static final String DROP = "DROP: "; //$NON-NLS-1$
+
+	/** The Constant DESTROY_DELETION. */
+	protected static final String DESTROY_DELETION = "DESTROY DELETION: "; //$NON-NLS-1$
+
+	/** The Constant COMMAND_NULL. */
+	protected static final String COMMAND_NULL = " command null"; //$NON-NLS-1$
+
+	/** The Constant VIEW_DELETION. */
+	protected static final String VIEW_DELETION = "VIEW DELETION: "; //$NON-NLS-1$
+
+	/** The Constant TEST_THE_REDO. */
+	protected static final String TEST_THE_REDO = "test the redo"; //$NON-NLS-1$
+
+	/** The Constant TEST_THE_UNDO. */
+	protected static final String TEST_THE_UNDO = "test the undo"; //$NON-NLS-1$
+
+	/** The Constant TEST_THE_EXECUTION. */
+	protected static final String TEST_THE_EXECUTION = "test the execution"; //$NON-NLS-1$
+
+	/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */
+	protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed"; //$NON-NLS-1$
+
+	/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */
+	protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created"; //$NON-NLS-1$
+
+	/** The Constant INITIALIZATION_TEST. */
+	protected static final String INITIALIZATION_TEST = "Intitial State"; //$NON-NLS-1$
+
+	/** The Constant CHANGE_CONTAINER. */
+	protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER"; //$NON-NLS-1$
+
+	/** The top node. */
+	protected GraphicalEditPart topNode;
+
+	public abstract DiagramUpdater getDiagramUpdater();
+	
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testViewDeletion(IElementType type, String containerType) {
+		ListCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < getTopEditPart().getChildren().size()) {
+			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$
+				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null); //$NON-NLS-1$
+		//DELETION OF THE VIEW
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, compartment.getChildren().size() == 1);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((GraphicalEditPart)compartment.getChildren().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, compartment.getChildren().size() == 1);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, compartment.getChildren().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);
+	}
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testDestroy(IElementType type, String containerType) {
+		ListCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < getTopEditPart().getChildren().size()) {
+			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$
+				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null); //$NON-NLS-1$
+		//DESTROY SEMANTIC+ VIEW
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, compartment.getChildren().size() == 1);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = ((GraphicalEditPart)compartment.getChildren().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		//assertTrue(DESTROY_DELETION +TEST_THE_UNDO,compartment.getChildren().size()==1);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, compartment.getChildren().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);
+	}
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testDrop(IElementType type, String containerType) {
+		ListCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < getTopEditPart().getChildren().size()) {
+			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$
+				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null); //$NON-NLS-1$
+		//DROP
+		assertTrue(DROP + INITIALIZATION_TEST, compartment.getChildren().size() == 0);
+		assertTrue(DROP + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		list.add(getRootSemanticModel().getOwnedElements().get(0));
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(new Point(20, 20));
+		Command command = compartment.getCommand(dropObjectsRequest);
+		assertNotNull(DROP + COMMAND_NULL, command);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DROP + TEST_THE_EXECUTION, compartment.getChildren().size() != 0);
+		assertTrue(DROP + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() != 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DROP + TEST_THE_UNDO, compartment.getChildren().size() == 0);
+		assertTrue(DROP + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() != 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DROP + TEST_THE_REDO, compartment.getChildren().size() != 0);
+		assertTrue(DROP + TEST_THE_REDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() != 0);
+	}
+
+	/**
+	 * Test change container.
+	 *
+	 * @param topNodeType
+	 *        the top node type
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testChangeContainer(IElementType topNodeType, IElementType type, String containerType) {
+		ListCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < getTopEditPart().getChildren().size()) {
+			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$
+				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null); //$NON-NLS-1$
+		//CHANGE CONTAINER
+		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, compartment.getChildren().size() == 1);
+		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);
+		Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(topNodeType, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CONTAINER_CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 2);
+		GraphicalEditPart newContainerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(1);
+		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);
+		changeBoundsRequest.setEditParts((EditPart)compartment.getChildren().get(0));
+		changeBoundsRequest.setLocation(new Point(30, 30));
+		ListCompartmentEditPart newCompartment = null;
+		index = 0;
+		while(newCompartment == null && index < newContainerEditPart.getChildren().size()) {
+			if((newContainerEditPart.getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals("" + containerType))) { //$NON-NLS-1$
+				newCompartment = (ListCompartmentEditPart)(newContainerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("NewContainer not found", newCompartment != null); //$NON-NLS-1$
+		command = newCompartment.getCommand(changeBoundsRequest);
+		assertNotNull(CHANGE_CONTAINER, command);
+		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, newCompartment.getChildren().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, compartment.getChildren().size() == 1);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 1);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, newCompartment.getChildren().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, compartment.getChildren().size() == 0);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, newCompartment.getChildren().size() == 1);
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 * @param maskmanaged used to test if the editpart must have a mask managed edit policy
+	 */
+	public void testToCreateANode(IElementType type, String containerType, boolean maskmanaged, String initialName) {
+		ListCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < getTopEditPart().getChildren().size()) {
+			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$
+				compartment = (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null); //$NON-NLS-1$
+		//CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, compartment.getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = compartment.getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);
+		Assert.assertTrue("Node must be org.eclipse.gmf.runtime.notation.Shape",((EditPart)compartment.getChildren().get(0)).getModel() instanceof Shape); //$NON-NLS-1$
+		EditPart createdEditPart= (EditPart)compartment.getChildren().get(0);
+		testNodeEditPart(maskmanaged, createdEditPart, initialName);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, compartment.getChildren().size() == 0);
+		assertTrue(CREATION + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue("CREATION: " + TEST_THE_REDO, compartment.getChildren().size() == 1); //$NON-NLS-1$
+		
+		Assert.assertNotEquals("Diagram updater must detect that children has been created",0,getDiagramUpdater().getSemanticChildren(getRootView()).size()); //$NON-NLS-1$
+		Assert.assertEquals("Diagram updater must detect that no link has been created",0,getDiagramUpdater().getContainedLinks(getRootView()).size()); //$NON-NLS-1$
+		Assert.assertEquals ("Diagram updater must detect that no link are incoming",0,getDiagramUpdater().getIncomingLinks(((GraphicalEditPart) compartment.getChildren().get(0)).getNotationView()).size()); //$NON-NLS-1$
+		Assert.assertEquals ("Diagram updater must detect that no link are outgoing",0,getDiagramUpdater().getOutgoingLinks(((GraphicalEditPart) compartment.getChildren().get(0)).getNotationView()).size()); //$NON-NLS-1$
+		Assert.assertEquals ("Diagram updater must detect that no children has ben created in the new element",0,getDiagramUpdater().getSemanticChildren(((GraphicalEditPart) compartment.getChildren().get(0)).getNotationView()).size()); //$NON-NLS-1$
+		Assert.assertEquals ("Diagram updater must detect that no link has been created in the new element",0,getDiagramUpdater().getContainedLinks(((GraphicalEditPart) compartment.getChildren().get(0)).getNotationView()).size()); //$NON-NLS-1$
+		
+		
+		
+	}
+	/**
+	 * this method is used to test the created editpart
+	 * @param maskmanaged
+	 * @param createdEditPart
+	 */
+	protected void testNodeEditPart(boolean maskmanaged, EditPart createdEditPart, String initialName) {
+		Assert.assertNotNull("The editpart must be created", createdEditPart); //$NON-NLS-1$
+		if( maskmanaged){
+			Assert.assertNotNull("the created editpolicy must have as MASK_MANAGED_LABEL_EDIT_POLICY", createdEditPart.getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY)); //$NON-NLS-1$
+		}
+		Assert.assertTrue("the primary editpart must be the namelabelEditpart",createdEditPart instanceof ITextAwareEditPart); //$NON-NLS-1$
+		Assert.assertTrue("the primary editpart must be the namelabelEditpart",createdEditPart instanceof GraphicalEditPart); //$NON-NLS-1$
+		String name=((GraphicalEditPart)createdEditPart).resolveSemanticElement().eClass().getName();
+		if(initialName!=null){
+			name= initialName;
+		}
+		if(name.length()<((ITextAwareEditPart)createdEditPart).getEditText().length()){
+			Assert.assertEquals(" the name must contain the name of the metaclass",name, ((ITextAwareEditPart)createdEditPart).getEditText().substring(0,name.length())); //$NON-NLS-1$
+		}
+		else{
+			//not the same it sure but display the mistake is important
+			Assert.assertEquals(" the name must contain the name of the metaclass",name, ((ITextAwareEditPart)createdEditPart).getEditText()); //$NON-NLS-1$
+		}
+		Assert.assertTrue("the primary editpart must be the namelabelEditpart",createdEditPart instanceof CompartmentEditPart); //$NON-NLS-1$
+		Assert.assertTrue("namelabelEditpart must be editable",((CompartmentEditPart)createdEditPart).isEditModeEnabled()); //$NON-NLS-1$
+	}
+
+	/**
+	 * Test to create a top node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateATopNode(IElementType type) {
+		//CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element)((View)getDiagramEditPart().getModel()).getElement()).getOwnedElements().size() == 0);
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		topNode = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
+	}
+
+	/**
+	 * Gets the top edit part.
+	 *
+	 * @return the top edit part
+	 */
+	public GraphicalEditPart getTopEditPart() {
+		return topNode;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootSemanticModel()
+	 *
+	 * @return
+	 */
+	@Override
+	protected Element getRootSemanticModel() {
+		return (Element)((View)getTopEditPart().getModel()).getElement();
+	}
+
+	/**
+	 * Test to manage top node.
+	 *
+	 * @param topNodeType
+	 *        the top node type
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testToManageTopNode(IElementType topNodeType, IElementType type, String containerType,String initialName) {
+		testToCreateATopNode(topNodeType);
+		testToCreateANode(type, containerType, false, initialName);
+		testDestroy(type, containerType);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		testViewDeletion(type, containerType);
+		testDrop(type, containerType);
+		testChangeContainer(topNodeType, type, containerType);
+	}
+	
+	/**
+	 * Test to manage top node.
+	 *
+	 * @param topNodeType
+	 *        the top node type
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testToManageTopNode(IElementType topNodeType, IElementType type, String containerType) {
+		testToManageTopNode(topNodeType, type, containerType, null);
+	}
+
+	/**
+	 * Test to manage top node and test if an editpolicy mask managed is applied.
+	 *
+	 * @param topNodeType
+	 *        the top node type
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testToManageTopNodeWithMask(IElementType topNodeType, IElementType type, String containerType,String initialName) {
+		testToCreateATopNode(topNodeType);
+		testToCreateANode(type, containerType, true, initialName);
+		testDestroy(type, containerType);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		testViewDeletion(type, containerType);
+		testDrop(type, containerType);
+		testChangeContainer(topNodeType, type, containerType);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestChildNode.java
index faceadde203..1d255c9a151 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestChildNode.java
@@ -1,127 +1,127 @@
-/*****************************************************************************

- * 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.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNotSame;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.junit.Before;

-

-/**

- * The Class TestChildNode.

- * Semantic tests shall be executed apart from the graphical test has one view may be related to a different number of UML elements

- * in different diagram

- */

-public abstract class TestChildNode extends AbstractTestNode {

-

-	/** The root compartment. */

-	protected ShapeCompartmentEditPart rootCompartment = null;

-	protected boolean testAffixedNode=false;

-

-

-

-	public boolean isTestAffixedNode() {

-		return testAffixedNode;

-	}

-

-

-	public void setTestAffixedNode(boolean testAffixedNode) {

-		this.testAffixedNode = testAffixedNode;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()

-	 *

-	 * @throws Exception

-	 */

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		CreateViewRequest requestcreation = createViewRequestShapeContainer();

-		if(requestcreation != null) {

-			requestcreation.setSize(new Dimension(500, 500));

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-			assertNotSame(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, UnexecutableCommand.INSTANCE, command);

-			assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-			executeOnUIThread(command);

-		}

-		assertEquals(CREATION + INITIALIZATION_TEST, 1, getDiagramEditPart().getChildren().size());

-		GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-		rootCompartment = null;

-		int index = 0;

-		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {

-			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {

-				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-		assertNotNull("There should be at least one container for the node tests", rootCompartment); //$NON-NLS-1$

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected IGraphicalEditPart getContainerEditPart() {

-		if(testAffixedNode){

-			return (IGraphicalEditPart)rootCompartment.getParent();

-		}

-		return rootCompartment;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()

-	 *

-	 * @return

-	 */

-	@Override

-	protected View getRootView() {

-		return (View)getContainerEditPart().getModel();

-	}

-

-	public void testToManageNode(IElementType type, EClass eClass, IElementType containerType, boolean containerMove, int expectedGraphicalChildren, int expectedSemanticChildren, int addedGraphicalChildren, int addedSemanticChildren, boolean maskmanaged, String initialName,int  numberSemanticChildreen) {

-		// create a node

-		testToCreateANode(type, expectedGraphicalChildren, expectedSemanticChildren, addedGraphicalChildren, addedSemanticChildren, maskmanaged,null, numberSemanticChildreen);

-		// creates a second one

-		testToCreateANode(type, expectedGraphicalChildren+1, expectedSemanticChildren+1, addedGraphicalChildren, addedSemanticChildren, maskmanaged,null,numberSemanticChildreen);

-		// destroy the first element

-		testDestroy(type, expectedGraphicalChildren+2*addedGraphicalChildren, 2, 1, 1);

-		// destroy the second one

-		testDestroy(type,  expectedGraphicalChildren+addedGraphicalChildren, 1, 1, 1);

-		// the node has been destroyed, the UML element also. restore one element

-		undoOnUIThread();

-		// the node and the UML element are present

-		testViewDeletion(type,expectedGraphicalChildren+addedGraphicalChildren, 1, 1);

-		// The node has been deleted, the uml element is still present

-		testDrop(type, eClass,expectedGraphicalChildren,addedGraphicalChildren,addedSemanticChildren);

-		// the node and element are present

-		if(containerMove) {

-			testChangeContainer(type, containerType);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.Before;
+
+/**
+ * The Class TestChildNode.
+ * Semantic tests shall be executed apart from the graphical test has one view may be related to a different number of UML elements
+ * in different diagram
+ */
+public abstract class TestChildNode extends AbstractTestNode {
+
+	/** The root compartment. */
+	protected ShapeCompartmentEditPart rootCompartment = null;
+	protected boolean testAffixedNode=false;
+
+
+
+	public boolean isTestAffixedNode() {
+		return testAffixedNode;
+	}
+
+
+	public void setTestAffixedNode(boolean testAffixedNode) {
+		this.testAffixedNode = testAffixedNode;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()
+	 *
+	 * @throws Exception
+	 */
+	@Before
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		CreateViewRequest requestcreation = createViewRequestShapeContainer();
+		if(requestcreation != null) {
+			requestcreation.setSize(new Dimension(500, 500));
+			Command command = getDiagramEditPart().getCommand(requestcreation);
+			assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+			assertNotSame(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, UnexecutableCommand.INSTANCE, command);
+			assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+			executeOnUIThread(command);
+		}
+		assertEquals(CREATION + INITIALIZATION_TEST, 1, getDiagramEditPart().getChildren().size());
+		GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
+		rootCompartment = null;
+		int index = 0;
+		while(rootCompartment == null && index < containerEditPart.getChildren().size()) {
+			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
+				rootCompartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+		assertNotNull("There should be at least one container for the node tests", rootCompartment); //$NON-NLS-1$
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected IGraphicalEditPart getContainerEditPart() {
+		if(testAffixedNode){
+			return (IGraphicalEditPart)rootCompartment.getParent();
+		}
+		return rootCompartment;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()
+	 *
+	 * @return
+	 */
+	@Override
+	protected View getRootView() {
+		return (View)getContainerEditPart().getModel();
+	}
+
+	public void testToManageNode(IElementType type, EClass eClass, IElementType containerType, boolean containerMove, int expectedGraphicalChildren, int expectedSemanticChildren, int addedGraphicalChildren, int addedSemanticChildren, boolean maskmanaged, String initialName,int  numberSemanticChildreen) {
+		// create a node
+		testToCreateANode(type, expectedGraphicalChildren, expectedSemanticChildren, addedGraphicalChildren, addedSemanticChildren, maskmanaged,null, numberSemanticChildreen);
+		// creates a second one
+		testToCreateANode(type, expectedGraphicalChildren+1, expectedSemanticChildren+1, addedGraphicalChildren, addedSemanticChildren, maskmanaged,null,numberSemanticChildreen);
+		// destroy the first element
+		testDestroy(type, expectedGraphicalChildren+2*addedGraphicalChildren, 2, 1, 1);
+		// destroy the second one
+		testDestroy(type,  expectedGraphicalChildren+addedGraphicalChildren, 1, 1, 1);
+		// the node has been destroyed, the UML element also. restore one element
+		undoOnUIThread();
+		// the node and the UML element are present
+		testViewDeletion(type,expectedGraphicalChildren+addedGraphicalChildren, 1, 1);
+		// The node has been deleted, the uml element is still present
+		testDrop(type, eClass,expectedGraphicalChildren,addedGraphicalChildren,addedSemanticChildren);
+		// the node and element are present
+		if(containerMove) {
+			testChangeContainer(type, containerType);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestCommentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestCommentLink.java
index ec6eee5343a..d878a310624 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestCommentLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestCommentLink.java
@@ -1,247 +1,247 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gef.requests.ReconnectRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.uml2.uml.Element;

-

-public abstract class TestCommentLink extends TestLink {

-

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testViewDeletion(IElementType type) {

-		// DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1

-	}

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDestroy(IElementType type) {

-		// DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-	}

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDrop(IElementType type) {

-		// DROP

-		// it is impossible to drop but you can recreat the link between this element

-		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);

-	}

-

-	/**

-	 * Test to create a link.

-	 *

-	 * @param linkType

-	 *            the type

-	 */

-	@Override

-	public void testToCreateALink(IElementType linkType, String initialName) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1

-	}

-

-	@Override

-	public void installEnvironment(IElementType sourceType, IElementType targetType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-		// create the source

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 100));

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the source player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the target

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 100));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the target player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);

-		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);

-		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);

-		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);

-	}

-

-	@Override

-	public void testTargetReconnectAMultiLink(IElementType type) {

-		// target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart) target.getTargetConnections().get(0) != null);

-		ConnectionEditPart binaryLink = (ConnectionEditPart) target.getTargetConnections().get(0);

-		reconnectRequest.setConnectionEditPart(binaryLink);

-		reconnectRequest.setTargetEditPart(targetPlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

-		Command cmd = targetPlayer.getCommand(reconnectRequest);

-		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));

-		// undo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));

-		// redo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));

-	}

-

-	@Override

-	public void testSourceReconnectAMultiLink(IElementType type) {

-	}

-

-	/**

-	 * test the drop of a link where the source and the target are the same objects

-	 *

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {

-	}

-

-	/**

-	 * test the creation of a link where the source and the target are the same objects

-	 *

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		// Note: Must always ask the target edit-part to create the connection, and in this case the target is 'source'

-		Command command = source.getCommand(createConnectionViewRequest(linkType, source, source));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == allowed);

-		if (allowed) {

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-			assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-			assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-			assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.uml2.uml.Element;
+
+public abstract class TestCommentLink extends TestLink {
+
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testViewDeletion(IElementType type) {
+		// DELETION OF THE VIEW
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1
+	}
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDestroy(IElementType type) {
+		// DESTROY SEMANTIC+ VIEW
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+	}
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDrop(IElementType type) {
+		// DROP
+		// it is impossible to drop but you can recreat the link between this element
+		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DROP + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1
+		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);
+	}
+
+	/**
+	 * Test to create a link.
+	 *
+	 * @param linkType
+	 *            the type
+	 */
+	@Override
+	public void testToCreateALink(IElementType linkType, String initialName) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);
+		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);// 1
+	}
+
+	@Override
+	public void installEnvironment(IElementType sourceType, IElementType targetType) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+		// create the source
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 100));
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the source player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the target
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 100));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the target player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);
+		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);
+		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);
+		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);
+	}
+
+	@Override
+	public void testTargetReconnectAMultiLink(IElementType type) {
+		// target reconnection
+		ReconnectRequest reconnectRequest = new ReconnectRequest();
+		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart) target.getTargetConnections().get(0) != null);
+		ConnectionEditPart binaryLink = (ConnectionEditPart) target.getTargetConnections().get(0);
+		reconnectRequest.setConnectionEditPart(binaryLink);
+		reconnectRequest.setTargetEditPart(targetPlayer);
+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
+		Command cmd = targetPlayer.getCommand(reconnectRequest);
+		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));
+		// undo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));
+		// redo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));
+	}
+
+	@Override
+	public void testSourceReconnectAMultiLink(IElementType type) {
+	}
+
+	/**
+	 * test the drop of a link where the source and the target are the same objects
+	 *
+	 * @param linkType
+	 * @param allowed
+	 */
+	@Override
+	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {
+	}
+
+	/**
+	 * test the creation of a link where the source and the target are the same objects
+	 *
+	 * @param linkType
+	 * @param allowed
+	 */
+	@Override
+	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		// Note: Must always ask the target edit-part to create the connection, and in this case the target is 'source'
+		Command command = source.getCommand(createConnectionViewRequest(linkType, source, source));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == allowed);
+		if (allowed) {
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);
+			assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+			assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);
+			assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+			assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 2);
+			assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestConstraintLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestConstraintLink.java
index e2745b62a59..2a6fdc5b3c0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestConstraintLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestConstraintLink.java
@@ -1,247 +1,247 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gef.requests.ReconnectRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.uml2.uml.Element;

-

-public abstract class TestConstraintLink extends TestLink {

-

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testViewDeletion(IElementType type) {

-		// DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-	}

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDestroy(IElementType type) {

-		// DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-	}

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDrop(IElementType type) {

-		// DROP

-		// it is impossible to drop but you can recreat the link between this element

-		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);

-	}

-

-	/**

-	 * Test to create a link.

-	 *

-	 * @param linkType

-	 *            the type

-	 */

-	@Override

-	public void testToCreateALink(IElementType linkType, String initialName) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-	}

-

-	@Override

-	public void installEnvironment(IElementType sourceType, IElementType targetType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-		// create the source

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 100));

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the source player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the target

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 100));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the target player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);

-		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);

-		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);

-		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);

-	}

-

-	@Override

-	public void testTargetReconnectAMultiLink(IElementType type) {

-		// target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart) target.getTargetConnections().get(0) != null);

-		ConnectionEditPart binaryLink = (ConnectionEditPart) target.getTargetConnections().get(0);

-		reconnectRequest.setConnectionEditPart(binaryLink);

-		reconnectRequest.setTargetEditPart(targetPlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

-		Command cmd = targetPlayer.getCommand(reconnectRequest);

-		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));

-		// undo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));

-		// redo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));

-	}

-

-	@Override

-	public void testSourceReconnectAMultiLink(IElementType type) {

-	}

-

-	/**

-	 * test the drop of a link where the source and the target are the same objects

-	 *

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {

-	}

-

-	/**

-	 * test the creation of a link where the source and the target are the same objects

-	 *

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		// Note: Must always ask the target edit-part to create the connection, and in this case the target is 'source'

-		Command command = source.getCommand(createConnectionViewRequest(linkType, source, source));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == allowed);

-		if (allowed) {

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-			assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-			assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-			assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.uml2.uml.Element;
+
+public abstract class TestConstraintLink extends TestLink {
+
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testViewDeletion(IElementType type) {
+		// DELETION OF THE VIEW
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+	}
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDestroy(IElementType type) {
+		// DESTROY SEMANTIC+ VIEW
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+	}
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDrop(IElementType type) {
+		// DROP
+		// it is impossible to drop but you can recreat the link between this element
+		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DROP + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);
+	}
+
+	/**
+	 * Test to create a link.
+	 *
+	 * @param linkType
+	 *            the type
+	 */
+	@Override
+	public void testToCreateALink(IElementType linkType, String initialName) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);
+		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+	}
+
+	@Override
+	public void installEnvironment(IElementType sourceType, IElementType targetType) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+		// create the source
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 100));
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the source player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the target
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 100));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the target player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);
+		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);
+		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);
+		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);
+	}
+
+	@Override
+	public void testTargetReconnectAMultiLink(IElementType type) {
+		// target reconnection
+		ReconnectRequest reconnectRequest = new ReconnectRequest();
+		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart) target.getTargetConnections().get(0) != null);
+		ConnectionEditPart binaryLink = (ConnectionEditPart) target.getTargetConnections().get(0);
+		reconnectRequest.setConnectionEditPart(binaryLink);
+		reconnectRequest.setTargetEditPart(targetPlayer);
+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
+		Command cmd = targetPlayer.getCommand(reconnectRequest);
+		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));
+		// undo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));
+		// redo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));
+	}
+
+	@Override
+	public void testSourceReconnectAMultiLink(IElementType type) {
+	}
+
+	/**
+	 * test the drop of a link where the source and the target are the same objects
+	 *
+	 * @param linkType
+	 * @param allowed
+	 */
+	@Override
+	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {
+	}
+
+	/**
+	 * test the creation of a link where the source and the target are the same objects
+	 *
+	 * @param linkType
+	 * @param allowed
+	 */
+	@Override
+	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		// Note: Must always ask the target edit-part to create the connection, and in this case the target is 'source'
+		Command command = source.getCommand(createConnectionViewRequest(linkType, source, source));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == allowed);
+		if (allowed) {
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);
+			assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+			assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);
+			assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+			assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 2);
+			assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestContainmentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestContainmentLink.java
index 60e28db240e..3623a819347 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestContainmentLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestContainmentLink.java
@@ -1,251 +1,251 @@
-/*****************************************************************************

- * 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.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gef.requests.ReconnectRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.uml2.uml.Element;

-

-public abstract class TestContainmentLink extends TestLink {

-

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testViewDeletion(IElementType type) {

-		// DELETION OF THE VIEW

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 3);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 3);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 3);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-	}

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDestroy(IElementType type) {

-		// DESTROY SEMANTIC+ VIEW

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		// ContainmentLink cannot be destroyed

-		assertTrue(DESTROY_DELETION + COMMAND_NULL, command == null);

-

-	}

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDrop(IElementType type) {

-		// DROP

-		// it is impossible to drop but you can recreat the link between this element

-		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);

-		assertTrue(DROP + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);

-	}

-

-	/**

-	 * Test to create a link.

-	 *

-	 * @param linkType

-	 *            the type

-	 */

-	@Override

-	public void testToCreateALink(IElementType linkType, String initialName) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 0);

-		assertTrue(CREATION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-	}

-

-	@Override

-	public void installEnvironment(IElementType sourceType, IElementType targetType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-		// create the source

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 100));

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the source player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the target

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 100));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the target player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);

-		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);

-		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);

-		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);

-	}

-

-	@Override

-	public void testTargetReconnectAMultiLink(IElementType type) {

-		// target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart) target.getTargetConnections().get(0) != null);

-		ConnectionEditPart binaryLink = (ConnectionEditPart) target.getTargetConnections().get(0);

-		reconnectRequest.setConnectionEditPart(binaryLink);

-		reconnectRequest.setTargetEditPart(targetPlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

-		Command cmd = targetPlayer.getCommand(reconnectRequest);

-		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 2);

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));

-		// undo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));

-		// redo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));

-	}

-

-	@Override

-	public void testSourceReconnectAMultiLink(IElementType type) {

-		// target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_LINK_TO_RECONNECT_EXISTS, ((ConnectionEditPart) source.getSourceConnections().get(0)) != null); //$NON-NLS-1$

-		ConnectionEditPart branch = ((ConnectionEditPart) source.getSourceConnections().get(0)); //$NON-NLS-1$

-		reconnectRequest.setConnectionEditPart(branch);

-		reconnectRequest.setTargetEditPart(sourcePlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);

-		Command cmd = sourcePlayer.getCommand(reconnectRequest);

-		assertTrue(RECONNECTION_SOURCE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-	}

-

-	/**

-	 * Test to manage top node.

-	 *

-	 * @param type

-	 *            the type

-	 * @param containerType

-	 *            the container type

-	 */

-	public void testToManageLink(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType containerType) {

-		installEnvironment(sourceType, targetType);

-		testToCreateALink(linkType, null);

-		testDestroy(linkType);

-		testViewDeletion(linkType);

-		testDrop(linkType);

-		testRecreation(linkType);

-		testSourceReconnectAMultiLink(linkType);

-		testTargetReconnectAMultiLink(linkType);

-	}

-

-	public void testRecreation(IElementType linkType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.uml2.uml.Element;
+
+public abstract class TestContainmentLink extends TestLink {
+
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testViewDeletion(IElementType type) {
+		// DELETION OF THE VIEW
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 3);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 3);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 3);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+	}
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDestroy(IElementType type) {
+		// DESTROY SEMANTIC+ VIEW
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		// ContainmentLink cannot be destroyed
+		assertTrue(DESTROY_DELETION + COMMAND_NULL, command == null);
+
+	}
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDrop(IElementType type) {
+		// DROP
+		// it is impossible to drop but you can recreat the link between this element
+		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);
+		assertTrue(DROP + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);
+	}
+
+	/**
+	 * Test to create a link.
+	 *
+	 * @param linkType
+	 *            the type
+	 */
+	@Override
+	public void testToCreateALink(IElementType linkType, String initialName) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 0);
+		assertTrue(CREATION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+	}
+
+	@Override
+	public void installEnvironment(IElementType sourceType, IElementType targetType) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+		// create the source
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 100));
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the source player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the target
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 100));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the target player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);
+		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);
+		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);
+		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);
+	}
+
+	@Override
+	public void testTargetReconnectAMultiLink(IElementType type) {
+		// target reconnection
+		ReconnectRequest reconnectRequest = new ReconnectRequest();
+		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart) target.getTargetConnections().get(0) != null);
+		ConnectionEditPart binaryLink = (ConnectionEditPart) target.getTargetConnections().get(0);
+		reconnectRequest.setConnectionEditPart(binaryLink);
+		reconnectRequest.setTargetEditPart(targetPlayer);
+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
+		Command cmd = targetPlayer.getCommand(reconnectRequest);
+		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 2);
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));
+		// undo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));
+		// redo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));
+	}
+
+	@Override
+	public void testSourceReconnectAMultiLink(IElementType type) {
+		// target reconnection
+		ReconnectRequest reconnectRequest = new ReconnectRequest();
+		assertTrue(THE_LINK_TO_RECONNECT_EXISTS, ((ConnectionEditPart) source.getSourceConnections().get(0)) != null); //$NON-NLS-1$
+		ConnectionEditPart branch = ((ConnectionEditPart) source.getSourceConnections().get(0)); //$NON-NLS-1$
+		reconnectRequest.setConnectionEditPart(branch);
+		reconnectRequest.setTargetEditPart(sourcePlayer);
+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);
+		Command cmd = sourcePlayer.getCommand(reconnectRequest);
+		assertTrue(RECONNECTION_SOURCE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+	}
+
+	/**
+	 * Test to manage top node.
+	 *
+	 * @param type
+	 *            the type
+	 * @param containerType
+	 *            the container type
+	 */
+	public void testToManageLink(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType containerType) {
+		installEnvironment(sourceType, targetType);
+		testToCreateALink(linkType, null);
+		testDestroy(linkType);
+		testViewDeletion(linkType);
+		testDrop(linkType);
+		testRecreation(linkType);
+		testSourceReconnectAMultiLink(linkType);
+		testTargetReconnectAMultiLink(linkType);
+	}
+
+	public void testRecreation(IElementType linkType) {
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 3);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestContextLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestContextLink.java
index 780d7fc782b..90418c850fe 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestContextLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestContextLink.java
@@ -1,166 +1,166 @@
-package org.eclipse.papyrus.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Element;

-

-public abstract class TestContextLink extends TestLink {

-

-	protected int rootSemanticOwnedElementsAfterDestroy = 4;

-

-	protected void manageContextLink(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType containerType) {

-		testToManageLink(sourceType, targetType, linkType, containerType, false, null);

-		checkUnexecutableCreateLinkCommand(linkType, source, target);

-		checkUnexecutableCreateLinkCommand(linkType, source, targetPlayer);

-		testDestroy(linkType);

-		checkExecutableCreateLinkCommand(linkType, source, target);

-		checkExecutableCreateLinkCommand(linkType, source, targetPlayer);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		testViewDeletion(linkType);

-		checkExecutableCreateLinkCommand(linkType, source, target);

-		checkExecutableCreateLinkCommand(linkType, source, targetPlayer);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		testToManageDropConstraint();

-	}

-

-	@Override

-	public void testToCreateALink(IElementType linkType, String initialName) {

-		testCreateLink(linkType, initialName);

-	}

-

-	@Override

-	public void testToManageLink(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType containerType, boolean allowedOntheSame, String initialName) {

-		installEnvironment(sourceType, targetType);

-		testToCreateALink(linkType, initialName);

-		testDestroy(linkType);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		testViewDeletion(linkType);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-	}

-

-	protected void testToManageDropConstraint() {

-		testConstraintViewDeletion();

-		testDropConstraint();

-	}

-

-	//FIXME : this override must be removed and fixed!

-	@Override

-	public void testViewDeletion(IElementType type) {

-		testDestroy(type);

-	}

-

-	@Override

-	public void testDestroy(IElementType type) {

-		// DESTROY SEMANTIC+ VIEW

-		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, createdEdgesCount, calculateDiagramEdgesCount());

-		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, createdEdgesCount, source.getSourceConnections().size());

-		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, createdEdgesCount, getDiagramEditPart().getConnections().size());

-		ConnectionEditPart linkEditPart = (ConnectionEditPart) getDiagramEditPart().getConnections().get(0);

-

-		//Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = linkEditPart.getCommand((new EditCommandRequestWrapper(new DestroyElementRequest(false))));

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		assertEquals(DESTROY_DELETION + TEST_THE_EXECUTION, 0, calculateDiagramEdgesCount());

-		assertEquals(DESTROY_DELETION + TEST_THE_EXECUTION, 0, source.getSourceConnections().size());

-		assertEquals(DESTROY_DELETION + TEST_THE_EXECUTION, rootSemanticOwnedElementsAfterDestroy, getRootSemanticModel().getOwnedElements().size());

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, diagramEditor.getDiagramEditDomain().getDiagramCommandStack().canUndo());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertEquals(DESTROY_DELETION + TEST_THE_UNDO, createdEdgesCount, calculateDiagramEdgesCount());

-		assertEquals(DESTROY_DELETION + TEST_THE_UNDO, createdEdgesCount, source.getSourceConnections().size());

-		assertEquals(DESTROY_DELETION + TEST_THE_UNDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, 0, calculateDiagramEdgesCount());

-		assertEquals(DESTROY_DELETION + TEST_THE_REDO, 0, source.getSourceConnections().size());

-		assertEquals(DESTROY_DELETION + TEST_THE_REDO, rootSemanticOwnedElementsAfterDestroy, getRootSemanticModel().getOwnedElements().size());

-	}

-

-	private void testConstraintViewDeletion() {

-		assertEquals(VIEW_DELETION + INITIALIZATION_TEST, 4, getRootEditPart().getChildren().size());

-		assertEquals(VIEW_DELETION + INITIALIZATION_TEST, createdEdgesCount, calculateDiagramEdgesCount());

-		assertEquals(VIEW_DELETION + INITIALIZATION_TEST, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = source.getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertEquals(VIEW_DELETION + TEST_THE_EXECUTION, 3, getRootEditPart().getChildren().size());

-		assertEquals(VIEW_DELETION + TEST_THE_EXECUTION, 0, calculateDiagramEdgesCount());

-		assertEquals(VIEW_DELETION + TEST_THE_EXECUTION, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertEquals(VIEW_DELETION + TEST_THE_UNDO, 4, getRootEditPart().getChildren().size());

-		assertEquals(VIEW_DELETION + TEST_THE_UNDO, createdEdgesCount, calculateDiagramEdgesCount());

-		assertEquals(VIEW_DELETION + TEST_THE_UNDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertEquals(VIEW_DELETION + TEST_THE_REDO, 3, getRootEditPart().getChildren().size());

-		assertEquals(VIEW_DELETION + TEST_THE_REDO, 0, calculateDiagramEdgesCount());

-		assertEquals(VIEW_DELETION + TEST_THE_REDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-	}

-

-	private void testDropConstraint() {

-		assertEquals(DROP + INITIALIZATION_TEST, 3, getRootEditPart().getChildren().size());

-		assertEquals(DROP + INITIALIZATION_TEST, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-		assertEquals(CREATION + INITIALIZATION_TEST, 0, calculateDiagramEdgesCount());

-		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		ArrayList<Element> list = new ArrayList<Element>();

-		list.add(((Element) target.resolveSemanticElement()).getOwnedElements().get(0));

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(new Point(20, 20));

-		Command command = getRootEditPart().getCommand(dropObjectsRequest);

-		assertNotNull(DROP + COMMAND_NULL, command);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertEquals(DROP + TEST_THE_EXECUTION, 4, getRootEditPart().getChildren().size());

-		assertEquals(DROP + TEST_THE_EXECUTION, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-		assertEquals(DROP + TEST_THE_EXECUTION, createdEdgesCount, calculateDiagramEdgesCount());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertEquals(DROP + TEST_THE_UNDO, 3, getRootEditPart().getChildren().size());

-		assertEquals(DROP + TEST_THE_UNDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-		assertEquals(DROP + TEST_THE_UNDO, 0, calculateDiagramEdgesCount());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertEquals(DROP + TEST_THE_REDO, 4, getRootEditPart().getChildren().size());

-		assertEquals(DROP + TEST_THE_REDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());

-		assertEquals(DROP + TEST_THE_REDO, createdEdgesCount, calculateDiagramEdgesCount());

-	}

-

-	@Override

-	public void installEnvironment(IElementType sourceType, IElementType targetType) {

-		rootSemanticOwnedElements = 3;

-		super.installEnvironment(sourceType, targetType);

-		assertTrue(CREATION + INITIALIZATION_TEST, source.resolveSemanticElement() instanceof Constraint);

-	}

-

-	private void checkUnexecutableCreateLinkCommand(IElementType linkType, GraphicalEditPart source, GraphicalEditPart target) {

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertNull("Creation of the second context link from the constraint should be forbidden.", command);

-	}

-

-	private void checkExecutableCreateLinkCommand(IElementType linkType, GraphicalEditPart source, GraphicalEditPart target) {

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertTrue(command != null && command.canExecute());

-	}

+package org.eclipse.papyrus.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.Element;
+
+public abstract class TestContextLink extends TestLink {
+
+	protected int rootSemanticOwnedElementsAfterDestroy = 4;
+
+	protected void manageContextLink(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType containerType) {
+		testToManageLink(sourceType, targetType, linkType, containerType, false, null);
+		checkUnexecutableCreateLinkCommand(linkType, source, target);
+		checkUnexecutableCreateLinkCommand(linkType, source, targetPlayer);
+		testDestroy(linkType);
+		checkExecutableCreateLinkCommand(linkType, source, target);
+		checkExecutableCreateLinkCommand(linkType, source, targetPlayer);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		testViewDeletion(linkType);
+		checkExecutableCreateLinkCommand(linkType, source, target);
+		checkExecutableCreateLinkCommand(linkType, source, targetPlayer);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		testToManageDropConstraint();
+	}
+
+	@Override
+	public void testToCreateALink(IElementType linkType, String initialName) {
+		testCreateLink(linkType, initialName);
+	}
+
+	@Override
+	public void testToManageLink(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType containerType, boolean allowedOntheSame, String initialName) {
+		installEnvironment(sourceType, targetType);
+		testToCreateALink(linkType, initialName);
+		testDestroy(linkType);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		testViewDeletion(linkType);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+	}
+
+	protected void testToManageDropConstraint() {
+		testConstraintViewDeletion();
+		testDropConstraint();
+	}
+
+	//FIXME : this override must be removed and fixed!
+	@Override
+	public void testViewDeletion(IElementType type) {
+		testDestroy(type);
+	}
+
+	@Override
+	public void testDestroy(IElementType type) {
+		// DESTROY SEMANTIC+ VIEW
+		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, createdEdgesCount, calculateDiagramEdgesCount());
+		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, createdEdgesCount, source.getSourceConnections().size());
+		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, createdEdgesCount, getDiagramEditPart().getConnections().size());
+		ConnectionEditPart linkEditPart = (ConnectionEditPart) getDiagramEditPart().getConnections().get(0);
+
+		//Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = linkEditPart.getCommand((new EditCommandRequestWrapper(new DestroyElementRequest(false))));
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+
+		assertEquals(DESTROY_DELETION + TEST_THE_EXECUTION, 0, calculateDiagramEdgesCount());
+		assertEquals(DESTROY_DELETION + TEST_THE_EXECUTION, 0, source.getSourceConnections().size());
+		assertEquals(DESTROY_DELETION + TEST_THE_EXECUTION, rootSemanticOwnedElementsAfterDestroy, getRootSemanticModel().getOwnedElements().size());
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, diagramEditor.getDiagramEditDomain().getDiagramCommandStack().canUndo());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertEquals(DESTROY_DELETION + TEST_THE_UNDO, createdEdgesCount, calculateDiagramEdgesCount());
+		assertEquals(DESTROY_DELETION + TEST_THE_UNDO, createdEdgesCount, source.getSourceConnections().size());
+		assertEquals(DESTROY_DELETION + TEST_THE_UNDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertEquals(DESTROY_DELETION + INITIALIZATION_TEST, 0, calculateDiagramEdgesCount());
+		assertEquals(DESTROY_DELETION + TEST_THE_REDO, 0, source.getSourceConnections().size());
+		assertEquals(DESTROY_DELETION + TEST_THE_REDO, rootSemanticOwnedElementsAfterDestroy, getRootSemanticModel().getOwnedElements().size());
+	}
+
+	private void testConstraintViewDeletion() {
+		assertEquals(VIEW_DELETION + INITIALIZATION_TEST, 4, getRootEditPart().getChildren().size());
+		assertEquals(VIEW_DELETION + INITIALIZATION_TEST, createdEdgesCount, calculateDiagramEdgesCount());
+		assertEquals(VIEW_DELETION + INITIALIZATION_TEST, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = source.getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertEquals(VIEW_DELETION + TEST_THE_EXECUTION, 3, getRootEditPart().getChildren().size());
+		assertEquals(VIEW_DELETION + TEST_THE_EXECUTION, 0, calculateDiagramEdgesCount());
+		assertEquals(VIEW_DELETION + TEST_THE_EXECUTION, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertEquals(VIEW_DELETION + TEST_THE_UNDO, 4, getRootEditPart().getChildren().size());
+		assertEquals(VIEW_DELETION + TEST_THE_UNDO, createdEdgesCount, calculateDiagramEdgesCount());
+		assertEquals(VIEW_DELETION + TEST_THE_UNDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertEquals(VIEW_DELETION + TEST_THE_REDO, 3, getRootEditPart().getChildren().size());
+		assertEquals(VIEW_DELETION + TEST_THE_REDO, 0, calculateDiagramEdgesCount());
+		assertEquals(VIEW_DELETION + TEST_THE_REDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+	}
+
+	private void testDropConstraint() {
+		assertEquals(DROP + INITIALIZATION_TEST, 3, getRootEditPart().getChildren().size());
+		assertEquals(DROP + INITIALIZATION_TEST, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+		assertEquals(CREATION + INITIALIZATION_TEST, 0, calculateDiagramEdgesCount());
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		list.add(((Element) target.resolveSemanticElement()).getOwnedElements().get(0));
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(new Point(20, 20));
+		Command command = getRootEditPart().getCommand(dropObjectsRequest);
+		assertNotNull(DROP + COMMAND_NULL, command);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertEquals(DROP + TEST_THE_EXECUTION, 4, getRootEditPart().getChildren().size());
+		assertEquals(DROP + TEST_THE_EXECUTION, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+		assertEquals(DROP + TEST_THE_EXECUTION, createdEdgesCount, calculateDiagramEdgesCount());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertEquals(DROP + TEST_THE_UNDO, 3, getRootEditPart().getChildren().size());
+		assertEquals(DROP + TEST_THE_UNDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+		assertEquals(DROP + TEST_THE_UNDO, 0, calculateDiagramEdgesCount());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertEquals(DROP + TEST_THE_REDO, 4, getRootEditPart().getChildren().size());
+		assertEquals(DROP + TEST_THE_REDO, rootSemanticOwnedElements, getRootSemanticModel().getOwnedElements().size());
+		assertEquals(DROP + TEST_THE_REDO, createdEdgesCount, calculateDiagramEdgesCount());
+	}
+
+	@Override
+	public void installEnvironment(IElementType sourceType, IElementType targetType) {
+		rootSemanticOwnedElements = 3;
+		super.installEnvironment(sourceType, targetType);
+		assertTrue(CREATION + INITIALIZATION_TEST, source.resolveSemanticElement() instanceof Constraint);
+	}
+
+	private void checkUnexecutableCreateLinkCommand(IElementType linkType, GraphicalEditPart source, GraphicalEditPart target) {
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+		assertNull("Creation of the second context link from the constraint should be forbidden.", command);
+	}
+
+	private void checkExecutableCreateLinkCommand(IElementType linkType, GraphicalEditPart source, GraphicalEditPart target) {
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+		assertTrue(command != null && command.canExecute());
+	}
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestLinkOwnedBySource.java
index 13255ffa473..9d5fd3a1a13 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestLinkOwnedBySource.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestLinkOwnedBySource.java
@@ -1,325 +1,325 @@
-/*****************************************************************************

- * Copyright (c) 2009, 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 459701

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gef.requests.ReconnectRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.uml2.uml.Element;

-

-public abstract class TestLinkOwnedBySource extends TestLink {

-

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testViewDeletion(IElementType type) {

-		// DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-	}

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDestroy(IElementType type) {

-		// DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		testEnableForDeleteFromModel();

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-	}

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	@Override

-	public void testDrop(IElementType type) {

-		// DROP

-		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);

-		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		ArrayList<Element> list = new ArrayList<Element>();

-		list.add(((Element) source.resolveSemanticElement()).getOwnedElements().get(0));

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(new Point(20, 20));

-		Command command = getDiagramEditPart().getCommand(dropObjectsRequest);

-		assertNotNull(DROP + COMMAND_NULL, command);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DROP + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DROP + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		assertTrue(DROP + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DROP + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DROP + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);

-	}

-

-	/**

-	 * Test to create a link.

-	 *

-	 * @param linkType

-	 *            the type

-	 */

-	@Override

-	public void testToCreateALink(IElementType linkType, String initialName) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);

-	}

-

-	@Override

-	public void installEnvironment(IElementType sourceType, IElementType targetType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-		// create the source

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 100));

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the source player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the target

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 100));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		// create the target player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);

-		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);

-		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);

-		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);

-

-		performAdditionalEnvironmentConfiguration(sourceType, targetType);

-	}

-

-	@Override

-	public void testTargetReconnectAMultiLink(IElementType type) {

-		// target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart) target.getTargetConnections().get(0) != null);

-		ConnectionEditPart binaryLink = (ConnectionEditPart) target.getTargetConnections().get(0);

-		reconnectRequest.setConnectionEditPart(binaryLink);

-		reconnectRequest.setTargetEditPart(targetPlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

-		Command cmd = targetPlayer.getCommand(reconnectRequest);

-		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));

-		// undo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));

-		// redo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));

-	}

-

-	@Override

-	public void testSourceReconnectAMultiLink(IElementType type) {

-		// target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_LINK_TO_RECONNECT_EXISTS, (ConnectionEditPart) source.getSourceConnections().get(0) != null);

-		ConnectionEditPart branch = (ConnectionEditPart) source.getSourceConnections().get(0);

-		reconnectRequest.setConnectionEditPart(branch);

-		reconnectRequest.setTargetEditPart(sourcePlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);

-		Command cmd = sourcePlayer.getCommand(reconnectRequest);

-		assertTrue(RECONNECTION_SOURCE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		assertTrue(RECONNECTION_SOURCE + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);

-		assertTrue(RECONNECTION_SOURCE + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_EXECUTION, branch.getSource().equals(sourcePlayer));

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_UNDO, branch.getSource().equals(source));

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_REDO, branch.getSource().equals(sourcePlayer));

-	}

-

-	/**

-	 * test the drop of a link where the source and the target are the same objects

-	 *

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {

-		// DROP

-		if (allowed) {

-			assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-			assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);

-			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-			ArrayList<Element> list = new ArrayList<Element>();

-			list.add(((Element) source.resolveSemanticElement()).getOwnedElements().get(1));

-			dropObjectsRequest.setObjects(list);

-			dropObjectsRequest.setLocation(new Point(20, 20));

-			Command command = getDiagramEditPart().getCommand(dropObjectsRequest);

-			assertNotNull(DROP + COMMAND_NULL, command);

-			assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(DROP + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 4);

-			assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-			assertTrue(DROP + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 3);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-			assertTrue(DROP + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 4);

-			assertTrue(DROP + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-			assertTrue(DROP + TEST_THE_UNDO, ((Diagram) getRootView()).getEdges().size() == 2);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-			assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 4);

-			assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-			assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 3);

-		}

-	}

-

-	/**

-	 * test the creation of a link where the source and the target are the same objects

-	 *

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-

-		// Note: Must always ask the target edit-part to create the connection, and in this case the target is 'source'

-		Command command = source.getCommand(createConnectionViewRequest(linkType, source, source));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == allowed);

-		if (allowed) {

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-			assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-			assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-			assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 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 459701
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.uml2.uml.Element;
+
+public abstract class TestLinkOwnedBySource extends TestLink {
+
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testViewDeletion(IElementType type) {
+		// DELETION OF THE VIEW
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+	}
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDestroy(IElementType type) {
+		// DESTROY SEMANTIC+ VIEW
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = ((ConnectionEditPart) source.getSourceConnections().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		testEnableForDeleteFromModel();
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+	}
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	@Override
+	public void testDrop(IElementType type) {
+		// DROP
+		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DROP + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		list.add(((Element) source.resolveSemanticElement()).getOwnedElements().get(0));
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(new Point(20, 20));
+		Command command = getDiagramEditPart().getCommand(dropObjectsRequest);
+		assertNotNull(DROP + COMMAND_NULL, command);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DROP + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DROP + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		assertTrue(DROP + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DROP + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(DROP + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);
+	}
+
+	/**
+	 * Test to create a link.
+	 *
+	 * @param linkType
+	 *            the type
+	 */
+	@Override
+	public void testToCreateALink(IElementType linkType, String initialName) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);
+		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + TEST_THE_UNDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(CREATION + TEST_THE_REDO, ((Element) source.resolveSemanticElement()).getOwnedElements().size() == 1);
+	}
+
+	@Override
+	public void installEnvironment(IElementType sourceType, IElementType targetType) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+		// create the source
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 100));
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the source player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(100, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the target
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 100));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		// create the target player to test reconnect
+		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
+		requestcreation.setLocation(new Point(300, 300));
+		command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		source = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);
+		sourcePlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);
+		target = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);
+		targetPlayer = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);
+
+		performAdditionalEnvironmentConfiguration(sourceType, targetType);
+	}
+
+	@Override
+	public void testTargetReconnectAMultiLink(IElementType type) {
+		// target reconnection
+		ReconnectRequest reconnectRequest = new ReconnectRequest();
+		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart) target.getTargetConnections().get(0) != null);
+		ConnectionEditPart binaryLink = (ConnectionEditPart) target.getTargetConnections().get(0);
+		reconnectRequest.setConnectionEditPart(binaryLink);
+		reconnectRequest.setTargetEditPart(targetPlayer);
+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
+		Command cmd = targetPlayer.getCommand(reconnectRequest);
+		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));
+		// undo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));
+		// redo
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));
+	}
+
+	@Override
+	public void testSourceReconnectAMultiLink(IElementType type) {
+		// target reconnection
+		ReconnectRequest reconnectRequest = new ReconnectRequest();
+		assertTrue(THE_LINK_TO_RECONNECT_EXISTS, (ConnectionEditPart) source.getSourceConnections().get(0) != null);
+		ConnectionEditPart branch = (ConnectionEditPart) source.getSourceConnections().get(0);
+		reconnectRequest.setConnectionEditPart(branch);
+		reconnectRequest.setTargetEditPart(sourcePlayer);
+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);
+		Command cmd = sourcePlayer.getCommand(reconnectRequest);
+		assertTrue(RECONNECTION_SOURCE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+		assertTrue(RECONNECTION_SOURCE + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 1);
+		assertTrue(RECONNECTION_SOURCE + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_EXECUTION, branch.getSource().equals(sourcePlayer));
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_UNDO, branch.getSource().equals(source));
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE + TEST_THE_REDO, branch.getSource().equals(sourcePlayer));
+	}
+
+	/**
+	 * test the drop of a link where the source and the target are the same objects
+	 *
+	 * @param linkType
+	 * @param allowed
+	 */
+	@Override
+	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {
+		// DROP
+		if (allowed) {
+			assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+			assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);
+			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+			ArrayList<Element> list = new ArrayList<Element>();
+			list.add(((Element) source.resolveSemanticElement()).getOwnedElements().get(1));
+			dropObjectsRequest.setObjects(list);
+			dropObjectsRequest.setLocation(new Point(20, 20));
+			Command command = getDiagramEditPart().getCommand(dropObjectsRequest);
+			assertNotNull(DROP + COMMAND_NULL, command);
+			assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+			assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(DROP + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 4);
+			assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);
+			assertTrue(DROP + TEST_THE_EXECUTION, ((Diagram) getRootView()).getEdges().size() == 3);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+			assertTrue(DROP + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 4);
+			assertTrue(DROP + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+			assertTrue(DROP + TEST_THE_UNDO, ((Diagram) getRootView()).getEdges().size() == 2);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+			assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 4);
+			assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+			assertTrue(DROP + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 3);
+		}
+	}
+
+	/**
+	 * test the creation of a link where the source and the target are the same objects
+	 *
+	 * @param linkType
+	 * @param allowed
+	 */
+	@Override
+	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+
+		// Note: Must always ask the target edit-part to create the connection, and in this case the target is 'source'
+		Command command = source.getCommand(createConnectionViewRequest(linkType, source, source));
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == allowed);
+		if (allowed) {
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram) getRootView()).getEdges().size() == 2);
+			assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+			assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);
+			assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);
+			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+			assertTrue(CREATION + TEST_THE_REDO, ((Diagram) getRootView()).getEdges().size() == 2);
+			assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestListCompartmentHelper.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestListCompartmentHelper.java
index d77d01f8d39..9a662a3fd63 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestListCompartmentHelper.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestListCompartmentHelper.java
@@ -1,273 +1,273 @@
-package org.eclipse.papyrus.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-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.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.AttributeOwner;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.Property;

-import org.junit.Assert;

-

-/**

- * ListCompartmentN test helper

- *

- */

-public abstract class TestListCompartmentHelper extends AbstractPapyrusTest {

-

-	private boolean myOperationFailed = false;

-

-	private final DiagramEditPart myDiagramEditPart;

-

-	/** The diagram editor. */

-	private final UmlGmfDiagramEditor myDiagramEditor;

-

-	public TestListCompartmentHelper(DiagramEditPart diagramEditPart, UmlGmfDiagramEditor diagramEditor) {

-		myDiagramEditPart = diagramEditPart;

-		myDiagramEditor = diagramEditor;

-	}

-

-	public void checkDuplicate(String parent, String parentContainer, String child) {

-		checkDuplicate(parent, parentContainer, child, null);

-	}

-

-	public void checkDuplicate(String parent, String parentContainer, String child, String nestedChild) {

-		IGraphicalEditPart parentEP = createChild(parent, myDiagramEditPart, 0);

-		IGraphicalEditPart targetEP = findChildBySemanticHint(parentEP, parentContainer);

-		IGraphicalEditPart dndEP = createChild(nestedChild != null ? nestedChild : child, targetEP, 0);

-		{

-			Command ddCommand = createDropCommand(dndEP, myDiagramEditPart);

-			Assert.assertTrue(ddCommand.canExecute());

-			executeOnUIThread(ddCommand);

-		}

-		IGraphicalEditPart canvasDnDEP = findChildBySemanticHint(myDiagramEditPart, nestedChild != null ? child : getDefaultNamedElementVisualId());

-		{

-			Command ddCommand = createDropCommand(canvasDnDEP, targetEP);

-			Assert.assertFalse(canvasDnDEP.getClass().getName() + " can't be dropped to the " + targetEP.getClass().getName() + " due the duplication behavior rule.", ddCommand.canExecute());

-		}

-	}

-

-	public void checkUnexecutableChildCreate(String targetVisualId, String targetCompartmentVisualId, String childVisualId) {

-		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);

-		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);

-		Command command = getCreateChildCommand(childVisualId, targetCompartmentEP);

-		Assert.assertFalse("The " + childVisualId + "-visualId can't be created in the " + targetCompartmentEP.getClass().getName(), command.canExecute());

-	}

-

-	public void checkChildCreate(String targetVisualId, String targetCompartmentVisualId, String childVisualId) {

-		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);

-		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);

-		Command command = getCreateChildCommand(childVisualId, targetCompartmentEP);

-		Assert.assertTrue("The " + childVisualId + "-visualId should be created in the " + targetCompartmentEP.getClass().getName(), command.canExecute());

-	}

-

-	public void checkUnexecutableDrop2Canvas(String targetVisualId, String targetCompartmentVisualId, String childVisualId) {

-		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);

-		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);

-		IGraphicalEditPart childEP = createChild(childVisualId, targetCompartmentEP, 0);

-		EObject semantic = childEP.resolveSemanticElement();

-		Assert.assertTrue(semantic != null && (semantic instanceof Property || semantic instanceof Operation));

-		Command command = createDropCommand(childEP, myDiagramEditPart);

-		Assert.assertFalse("The " + childEP.getClass().getName() + " can't be droped to the Canvas.", command.canExecute());

-	}

-

-	public void checkDropPropertyFromModelExplorer2Canvas(String targetVisualId, String targetCompartmentVisualId, String childVisualId) throws Exception {

-		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);

-		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);

-		IGraphicalEditPart childEP = createChild(childVisualId, targetCompartmentEP, 0);

-		EObject semantic = childEP.resolveSemanticElement();

-		Assert.assertTrue(semantic != null && (semantic instanceof Property || semantic instanceof Operation));

-		List<EObject> forDrop = new ArrayList<EObject>();

-		forDrop.add(semantic);

-		Command ddCommand = createDropCommandFromModelExplorer2Canvas(forDrop);

-		Assert.assertTrue(ddCommand.canExecute());

-	}

-

-	/**

-	 * Requirement 20170700 An association end property could be dropped only in a container which is its semantic container

-	 * @param targetVisualId

-	 * @param targetCompartmentVisualId

-	 * @param associationType

-	 * @throws Exception

-	 */

-	public void checkDropAssociationEndPropertyFromModelExplorer(String targetVisualId, String targetCompartmentVisualId, IElementType associationType) throws Exception {

-		IGraphicalEditPart sourceEP = createChild(targetVisualId, myDiagramEditPart, 0);

-		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 1);

-		IGraphicalEditPart sourceCompartmentEP = findChildBySemanticHint(sourceEP, targetCompartmentVisualId);

-		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);

-		IGraphicalEditPart associationEP = createAssociationLink(associationType, sourceEP, targetEP);

-		assertNotNull(associationEP);

-		EObject sourceSemantic = sourceEP.resolveSemanticElement();

-		assertTrue("Source should be StructuredClassifier.", sourceSemantic instanceof AttributeOwner);

-		List<Property> sourceProperties = ((AttributeOwner) sourceSemantic).getOwnedAttributes();

-		assertEquals("Source owned attributes", 1, sourceProperties.size());

-		Property sourceProperty = sourceProperties.get(0);

-		List<EObject> forDrop = new ArrayList<EObject>();

-		forDrop.add(sourceProperty);

-		Command ddCommand = createDropCommandFromModelExplorer(forDrop, sourceCompartmentEP);

-		Assert.assertTrue(ddCommand != null || true == ddCommand.canExecute());

-		

-		ddCommand = createDropCommandFromModelExplorer(forDrop, targetCompartmentEP);

-		Assert.assertTrue(ddCommand == null || false == ddCommand.canExecute());

-	}

-

-	private IGraphicalEditPart createAssociationLink(IElementType type, EditPart source, EditPart target) {

-		Command endCommand = target.getCommand(createConnectionViewRequest(type, source, target));

-		Assert.assertNotNull(endCommand);

-		Assert.assertTrue(endCommand.canExecute());

-		executeOnUIThread(endCommand);

-		Assert.assertEquals(1, myDiagramEditPart.getConnections().size());

-		IGraphicalEditPart association = (IGraphicalEditPart) myDiagramEditPart.getConnections().get(0);

-		Assert.assertTrue(association.resolveSemanticElement() instanceof Association);

-		return association;

-	}

-

-	private CreateConnectionViewRequest createConnectionViewRequest(IElementType type, EditPart source, EditPart target) {

-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, myDiagramEditPart.getDiagramPreferencesHint());

-		connectionRequest.setSourceEditPart(null);

-		connectionRequest.setTargetEditPart(source);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);

-		source.getCommand(connectionRequest);

-		connectionRequest.setSourceEditPart(source);

-		connectionRequest.setTargetEditPart(target);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);

-		return connectionRequest;

-	}

-

-	private Command createDropCommandFromModelExplorer2Canvas(List<EObject> elements) {

-		return myDiagramEditPart.getCommand(createDropRequestFromModelExplorer(elements));

-	}

-

-	private Command createDropCommandFromModelExplorer(List<EObject> elements, IGraphicalEditPart target) {

-		return target.getCommand(createDropRequestFromModelExplorer(elements));

-	}

-

-	private DropObjectsRequest createDropRequestFromModelExplorer(List<EObject> elements) {

-		DropObjectsRequest req = new DropObjectsRequest();

-		req.setObjects(elements);

-		req.setAllowedDetail(DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);

-		req.setLocation(new Point(15, 15));

-		req.setRequiredDetail(DND.DROP_COPY);

-		req.setType(RequestConstants.REQ_DROP_OBJECTS);

-		return req;

-	}

-

-	private Command getCreateChildCommand(String childVID, IGraphicalEditPart container) {

-		final IElementType childType = getElementType(childVID);

-		final CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(childType, container.getDiagramPreferencesHint());

-		requestcreation.setSize(new Dimension(1, 1));

-		requestcreation.setLocation(new Point(10, 10));

-		return container.getCommand(requestcreation);

-	}

-

-	public void checkUnexecutableDrop(String targetVisualId, String targetCompartmentVisualId, String dropableVisualId) {

-		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);

-		IGraphicalEditPart dropableEP = createChild(dropableVisualId, myDiagramEditPart, 1);

-		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);

-		Command command = createDropCommand(dropableEP, targetCompartmentEP);

-		Assert.assertFalse("The " + dropableEP.getClass().getName() + " can't be droped to the " + targetCompartmentEP.getClass().getName(), command.canExecute());

-	}

-

-	protected abstract String getDefaultNamedElementVisualId();

-

-	protected abstract IElementType getElementType(String childVID);

-

-	protected abstract String getVisualID(View view);

-

-	private void executeOnUIThread(final Command command) {

-		Display.getDefault().syncExec(new Runnable() {

-

-			public void run() {

-				execute(command);

-			}

-		});

-	}

-

-	private void assertLastOperationSuccessful() {

-		Assert.assertFalse("The operation failed. Look at the log, or put a breakpoint on ExecutionException or DefaultOperationHistory#notifyNotOK to find the cause.", this.myOperationFailed); //$NON-NLS-1$

-	}

-

-	/**

-	 * Reset the "operation failed" state. Call this before executing each

-	 * operation for which you want to test whether if failed with {@link assertLastOperationSuccessful()}.

-	 */

-	private void resetLastOperationFailedState() {

-		myOperationFailed = false;

-	}

-

-	/** Execute the given command in the diagram editor. */

-	private void execute(final Command command) {

-		resetLastOperationFailedState();

-		getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

-		assertLastOperationSuccessful();

-	}

-

-	/** The command stack to use to execute commands on the diagram. */

-	private CommandStack getCommandStack() {

-		// not "diagramEditor.getDiagramEditDomain().getDiagramCommandStack()"

-		// because it messes up undo contexts

-		return myDiagramEditor.getEditingDomain().getCommandStack();

-	}

-

-	private Command createDropCommand(IGraphicalEditPart child, IGraphicalEditPart newParent) {

-		CompoundCommand c = new CompoundCommand();

-		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DRAG);

-		changeBoundsRequest.setEditParts(child);

-		changeBoundsRequest.setLocation(new Point(15, 15));

-		c.add(child.getCommand(changeBoundsRequest));

-		myDiagramEditPart.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(c));

-		changeBoundsRequest.setType(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DROP);

-		c.add(newParent.getCommand(changeBoundsRequest));

-		return c;

-	}

-

-	private IGraphicalEditPart createChild(String childVID, IGraphicalEditPart container, int number) {

-		Command cmd = getCreateChildCommand(childVID, container);

-		executeOnUIThread(cmd);

-		return findChild(container, childVID, number);

-	}

-

-

-	private IGraphicalEditPart findChild(IGraphicalEditPart parent, String vid, int number) {

-		List<?> children = parent.getChildren();

-		if (number > children.size() - 1) {

-			Assert.fail("Parent " + parent + ", type " + parent.getNotationView() + " hasn't less children then " + number);

-		}

-		IGraphicalEditPart childEP = (IGraphicalEditPart) children.get(number);

-		assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);

-		Assert.assertEquals("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, getVisualID(childEP.getNotationView()), vid);

-		return childEP;

-	}

-

-	private IGraphicalEditPart findChildBySemanticHint(IGraphicalEditPart parent, String vid) {

-		IGraphicalEditPart childEP = parent.getChildBySemanticHint(vid);

-		assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);

-		return childEP;

-	}

-}

+package org.eclipse.papyrus.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+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.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.uml2.uml.Association;
+import org.eclipse.uml2.uml.AttributeOwner;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Property;
+import org.junit.Assert;
+
+/**
+ * ListCompartmentN test helper
+ *
+ */
+public abstract class TestListCompartmentHelper extends AbstractPapyrusTest {
+
+	private boolean myOperationFailed = false;
+
+	private final DiagramEditPart myDiagramEditPart;
+
+	/** The diagram editor. */
+	private final UmlGmfDiagramEditor myDiagramEditor;
+
+	public TestListCompartmentHelper(DiagramEditPart diagramEditPart, UmlGmfDiagramEditor diagramEditor) {
+		myDiagramEditPart = diagramEditPart;
+		myDiagramEditor = diagramEditor;
+	}
+
+	public void checkDuplicate(String parent, String parentContainer, String child) {
+		checkDuplicate(parent, parentContainer, child, null);
+	}
+
+	public void checkDuplicate(String parent, String parentContainer, String child, String nestedChild) {
+		IGraphicalEditPart parentEP = createChild(parent, myDiagramEditPart, 0);
+		IGraphicalEditPart targetEP = findChildBySemanticHint(parentEP, parentContainer);
+		IGraphicalEditPart dndEP = createChild(nestedChild != null ? nestedChild : child, targetEP, 0);
+		{
+			Command ddCommand = createDropCommand(dndEP, myDiagramEditPart);
+			Assert.assertTrue(ddCommand.canExecute());
+			executeOnUIThread(ddCommand);
+		}
+		IGraphicalEditPart canvasDnDEP = findChildBySemanticHint(myDiagramEditPart, nestedChild != null ? child : getDefaultNamedElementVisualId());
+		{
+			Command ddCommand = createDropCommand(canvasDnDEP, targetEP);
+			Assert.assertFalse(canvasDnDEP.getClass().getName() + " can't be dropped to the " + targetEP.getClass().getName() + " due the duplication behavior rule.", ddCommand.canExecute());
+		}
+	}
+
+	public void checkUnexecutableChildCreate(String targetVisualId, String targetCompartmentVisualId, String childVisualId) {
+		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);
+		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);
+		Command command = getCreateChildCommand(childVisualId, targetCompartmentEP);
+		Assert.assertFalse("The " + childVisualId + "-visualId can't be created in the " + targetCompartmentEP.getClass().getName(), command.canExecute());
+	}
+
+	public void checkChildCreate(String targetVisualId, String targetCompartmentVisualId, String childVisualId) {
+		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);
+		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);
+		Command command = getCreateChildCommand(childVisualId, targetCompartmentEP);
+		Assert.assertTrue("The " + childVisualId + "-visualId should be created in the " + targetCompartmentEP.getClass().getName(), command.canExecute());
+	}
+
+	public void checkUnexecutableDrop2Canvas(String targetVisualId, String targetCompartmentVisualId, String childVisualId) {
+		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);
+		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);
+		IGraphicalEditPart childEP = createChild(childVisualId, targetCompartmentEP, 0);
+		EObject semantic = childEP.resolveSemanticElement();
+		Assert.assertTrue(semantic != null && (semantic instanceof Property || semantic instanceof Operation));
+		Command command = createDropCommand(childEP, myDiagramEditPart);
+		Assert.assertFalse("The " + childEP.getClass().getName() + " can't be droped to the Canvas.", command.canExecute());
+	}
+
+	public void checkDropPropertyFromModelExplorer2Canvas(String targetVisualId, String targetCompartmentVisualId, String childVisualId) throws Exception {
+		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);
+		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);
+		IGraphicalEditPart childEP = createChild(childVisualId, targetCompartmentEP, 0);
+		EObject semantic = childEP.resolveSemanticElement();
+		Assert.assertTrue(semantic != null && (semantic instanceof Property || semantic instanceof Operation));
+		List<EObject> forDrop = new ArrayList<EObject>();
+		forDrop.add(semantic);
+		Command ddCommand = createDropCommandFromModelExplorer2Canvas(forDrop);
+		Assert.assertTrue(ddCommand.canExecute());
+	}
+
+	/**
+	 * Requirement 20170700 An association end property could be dropped only in a container which is its semantic container
+	 * @param targetVisualId
+	 * @param targetCompartmentVisualId
+	 * @param associationType
+	 * @throws Exception
+	 */
+	public void checkDropAssociationEndPropertyFromModelExplorer(String targetVisualId, String targetCompartmentVisualId, IElementType associationType) throws Exception {
+		IGraphicalEditPart sourceEP = createChild(targetVisualId, myDiagramEditPart, 0);
+		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 1);
+		IGraphicalEditPart sourceCompartmentEP = findChildBySemanticHint(sourceEP, targetCompartmentVisualId);
+		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);
+		IGraphicalEditPart associationEP = createAssociationLink(associationType, sourceEP, targetEP);
+		assertNotNull(associationEP);
+		EObject sourceSemantic = sourceEP.resolveSemanticElement();
+		assertTrue("Source should be StructuredClassifier.", sourceSemantic instanceof AttributeOwner);
+		List<Property> sourceProperties = ((AttributeOwner) sourceSemantic).getOwnedAttributes();
+		assertEquals("Source owned attributes", 1, sourceProperties.size());
+		Property sourceProperty = sourceProperties.get(0);
+		List<EObject> forDrop = new ArrayList<EObject>();
+		forDrop.add(sourceProperty);
+		Command ddCommand = createDropCommandFromModelExplorer(forDrop, sourceCompartmentEP);
+		Assert.assertTrue(ddCommand != null || true == ddCommand.canExecute());
+		
+		ddCommand = createDropCommandFromModelExplorer(forDrop, targetCompartmentEP);
+		Assert.assertTrue(ddCommand == null || false == ddCommand.canExecute());
+	}
+
+	private IGraphicalEditPart createAssociationLink(IElementType type, EditPart source, EditPart target) {
+		Command endCommand = target.getCommand(createConnectionViewRequest(type, source, target));
+		Assert.assertNotNull(endCommand);
+		Assert.assertTrue(endCommand.canExecute());
+		executeOnUIThread(endCommand);
+		Assert.assertEquals(1, myDiagramEditPart.getConnections().size());
+		IGraphicalEditPart association = (IGraphicalEditPart) myDiagramEditPart.getConnections().get(0);
+		Assert.assertTrue(association.resolveSemanticElement() instanceof Association);
+		return association;
+	}
+
+	private CreateConnectionViewRequest createConnectionViewRequest(IElementType type, EditPart source, EditPart target) {
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, myDiagramEditPart.getDiagramPreferencesHint());
+		connectionRequest.setSourceEditPart(null);
+		connectionRequest.setTargetEditPart(source);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
+		source.getCommand(connectionRequest);
+		connectionRequest.setSourceEditPart(source);
+		connectionRequest.setTargetEditPart(target);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
+		return connectionRequest;
+	}
+
+	private Command createDropCommandFromModelExplorer2Canvas(List<EObject> elements) {
+		return myDiagramEditPart.getCommand(createDropRequestFromModelExplorer(elements));
+	}
+
+	private Command createDropCommandFromModelExplorer(List<EObject> elements, IGraphicalEditPart target) {
+		return target.getCommand(createDropRequestFromModelExplorer(elements));
+	}
+
+	private DropObjectsRequest createDropRequestFromModelExplorer(List<EObject> elements) {
+		DropObjectsRequest req = new DropObjectsRequest();
+		req.setObjects(elements);
+		req.setAllowedDetail(DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);
+		req.setLocation(new Point(15, 15));
+		req.setRequiredDetail(DND.DROP_COPY);
+		req.setType(RequestConstants.REQ_DROP_OBJECTS);
+		return req;
+	}
+
+	private Command getCreateChildCommand(String childVID, IGraphicalEditPart container) {
+		final IElementType childType = getElementType(childVID);
+		final CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(childType, container.getDiagramPreferencesHint());
+		requestcreation.setSize(new Dimension(1, 1));
+		requestcreation.setLocation(new Point(10, 10));
+		return container.getCommand(requestcreation);
+	}
+
+	public void checkUnexecutableDrop(String targetVisualId, String targetCompartmentVisualId, String dropableVisualId) {
+		IGraphicalEditPart targetEP = createChild(targetVisualId, myDiagramEditPart, 0);
+		IGraphicalEditPart dropableEP = createChild(dropableVisualId, myDiagramEditPart, 1);
+		IGraphicalEditPart targetCompartmentEP = findChildBySemanticHint(targetEP, targetCompartmentVisualId);
+		Command command = createDropCommand(dropableEP, targetCompartmentEP);
+		Assert.assertFalse("The " + dropableEP.getClass().getName() + " can't be droped to the " + targetCompartmentEP.getClass().getName(), command.canExecute());
+	}
+
+	protected abstract String getDefaultNamedElementVisualId();
+
+	protected abstract IElementType getElementType(String childVID);
+
+	protected abstract String getVisualID(View view);
+
+	private void executeOnUIThread(final Command command) {
+		Display.getDefault().syncExec(new Runnable() {
+
+			public void run() {
+				execute(command);
+			}
+		});
+	}
+
+	private void assertLastOperationSuccessful() {
+		Assert.assertFalse("The operation failed. Look at the log, or put a breakpoint on ExecutionException or DefaultOperationHistory#notifyNotOK to find the cause.", this.myOperationFailed); //$NON-NLS-1$
+	}
+
+	/**
+	 * Reset the "operation failed" state. Call this before executing each
+	 * operation for which you want to test whether if failed with {@link assertLastOperationSuccessful()}.
+	 */
+	private void resetLastOperationFailedState() {
+		myOperationFailed = false;
+	}
+
+	/** Execute the given command in the diagram editor. */
+	private void execute(final Command command) {
+		resetLastOperationFailedState();
+		getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+		assertLastOperationSuccessful();
+	}
+
+	/** The command stack to use to execute commands on the diagram. */
+	private CommandStack getCommandStack() {
+		// not "diagramEditor.getDiagramEditDomain().getDiagramCommandStack()"
+		// because it messes up undo contexts
+		return myDiagramEditor.getEditingDomain().getCommandStack();
+	}
+
+	private Command createDropCommand(IGraphicalEditPart child, IGraphicalEditPart newParent) {
+		CompoundCommand c = new CompoundCommand();
+		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DRAG);
+		changeBoundsRequest.setEditParts(child);
+		changeBoundsRequest.setLocation(new Point(15, 15));
+		c.add(child.getCommand(changeBoundsRequest));
+		myDiagramEditPart.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(c));
+		changeBoundsRequest.setType(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DROP);
+		c.add(newParent.getCommand(changeBoundsRequest));
+		return c;
+	}
+
+	private IGraphicalEditPart createChild(String childVID, IGraphicalEditPart container, int number) {
+		Command cmd = getCreateChildCommand(childVID, container);
+		executeOnUIThread(cmd);
+		return findChild(container, childVID, number);
+	}
+
+
+	private IGraphicalEditPart findChild(IGraphicalEditPart parent, String vid, int number) {
+		List<?> children = parent.getChildren();
+		if (number > children.size() - 1) {
+			Assert.fail("Parent " + parent + ", type " + parent.getNotationView() + " hasn't less children then " + number);
+		}
+		IGraphicalEditPart childEP = (IGraphicalEditPart) children.get(number);
+		assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);
+		Assert.assertEquals("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, getVisualID(childEP.getNotationView()), vid);
+		return childEP;
+	}
+
+	private IGraphicalEditPart findChildBySemanticHint(IGraphicalEditPart parent, String vid) {
+		IGraphicalEditPart childEP = parent.getChildBySemanticHint(vid);
+		assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);
+		return childEP;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestNested.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestNested.java
index 6d7ab61c731..70022bcc0b3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestNested.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestNested.java
@@ -1,184 +1,184 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST)  - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.uml2.uml.Element;

-

-public abstract class TestNested extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {

-

-	/** The top node. */

-	protected GraphicalEditPart topNode;

-

-	/** The Child node. */

-	protected GraphicalEditPart childNode;

-

-	/**

-	 * Test to create a nested classifier node.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testToCreateAChildLabel(IElementType type, String containerType) {

-		ListCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < getChildEditPart().getChildren().size()) {

-			if((getChildEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getChildEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$

-				compartment = (ListCompartmentEditPart)(getChildEditPart().getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null); //$NON-NLS-1$

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, compartment.getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModelchild().getOwnedElements().size() == 0);

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = compartment.getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, compartment.getChildren().size() == 0);

-		assertTrue(CREATION + TEST_THE_UNDO, ((Element)((View)getChildEditPart().getModel()).getElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue("CREATION: " + TEST_THE_REDO, compartment.getChildren().size() == 1); //$NON-NLS-1$

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testToCreateANode(IElementType type, String containerType) {

-		ResizableCompartmentEditPart compartment = null;

-		int index = 0;

-		while(compartment == null && index < getTopEditPart().getChildren().size()) {

-			if((getTopEditPart().getChildren().get(index)) instanceof ResizableCompartmentEditPart) {

-				if((((View)((ResizableCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$

-					compartment = (ResizableCompartmentEditPart)(getTopEditPart().getChildren().get(index));

-				}

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null); //$NON-NLS-1$

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, compartment.getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = compartment.getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, compartment.getChildren().size() == 0);

-		assertTrue(CREATION + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue("CREATION: " + TEST_THE_REDO, compartment.getChildren().size() == 1); //$NON-NLS-1$

-		childNode = (GraphicalEditPart)compartment.getChildren().get(0);

-	}

-

-	/**

-	 * Gets the root semantic modelchild.

-	 *

-	 * @return the root semantic modelchild

-	 */

-	private Element getRootSemanticModelchild() {

-		return (Element)((View)getChildEditPart().getModel()).getElement();

-	}

-

-	/**

-	 * Test to create a top node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateATopNode(IElementType type) {

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element)((View)getDiagramEditPart().getModel()).getElement()).getOwnedElements().size() == 0);

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		topNode = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-	}

-

-	/**

-	 * Gets the top edit part.

-	 *

-	 * @return the top edit part

-	 */

-	public GraphicalEditPart getTopEditPart() {

-		return topNode;

-	}

-

-	/**

-	 * Gets the Child edit part.

-	 *

-	 * @return the Child edit part

-	 */

-	public GraphicalEditPart getChildEditPart() {

-		return childNode;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootSemanticModel()

-	 *

-	 * @return

-	 */

-	@Override

-	protected Element getRootSemanticModel() {

-		return (Element)((View)getTopEditPart().getModel()).getElement();

-	}

-

-	/**

-	 * Test to manage top node.

-	 *

-	 * @param type

-	 *        the type

-	 * @param containerType

-	 *        the container type

-	 */

-	public void testToManageTopNode(IElementType parentNodeType, IElementType topNodeType, IElementType type, String containerChilType, String containerType) {

-		//Parent Node

-		testToCreateATopNode(parentNodeType);

-		//Top Node

-		testToCreateANode(topNodeType, containerChilType);

-		//Nested classifier

-		testToCreateAChildLabel(type, containerType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST)  - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.uml2.uml.Element;
+
+public abstract class TestNested extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {
+
+	/** The top node. */
+	protected GraphicalEditPart topNode;
+
+	/** The Child node. */
+	protected GraphicalEditPart childNode;
+
+	/**
+	 * Test to create a nested classifier node.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testToCreateAChildLabel(IElementType type, String containerType) {
+		ListCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < getChildEditPart().getChildren().size()) {
+			if((getChildEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart && (((View)((ListCompartmentEditPart)(getChildEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$
+				compartment = (ListCompartmentEditPart)(getChildEditPart().getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null); //$NON-NLS-1$
+		//CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, compartment.getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModelchild().getOwnedElements().size() == 0);
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = compartment.getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, compartment.getChildren().size() == 0);
+		assertTrue(CREATION + TEST_THE_UNDO, ((Element)((View)getChildEditPart().getModel()).getElement()).getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue("CREATION: " + TEST_THE_REDO, compartment.getChildren().size() == 1); //$NON-NLS-1$
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testToCreateANode(IElementType type, String containerType) {
+		ResizableCompartmentEditPart compartment = null;
+		int index = 0;
+		while(compartment == null && index < getTopEditPart().getChildren().size()) {
+			if((getTopEditPart().getChildren().get(index)) instanceof ResizableCompartmentEditPart) {
+				if((((View)((ResizableCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(containerType))) { //$NON-NLS-1$
+					compartment = (ResizableCompartmentEditPart)(getTopEditPart().getChildren().get(index));
+				}
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null); //$NON-NLS-1$
+		//CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, compartment.getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = compartment.getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); //$NON-NLS-1$
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, compartment.getChildren().size() == 0);
+		assertTrue(CREATION + TEST_THE_UNDO, ((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue("CREATION: " + TEST_THE_REDO, compartment.getChildren().size() == 1); //$NON-NLS-1$
+		childNode = (GraphicalEditPart)compartment.getChildren().get(0);
+	}
+
+	/**
+	 * Gets the root semantic modelchild.
+	 *
+	 * @return the root semantic modelchild
+	 */
+	private Element getRootSemanticModelchild() {
+		return (Element)((View)getChildEditPart().getModel()).getElement();
+	}
+
+	/**
+	 * Test to create a top node.
+	 *
+	 * @param type
+	 *        the type
+	 */
+	public void testToCreateATopNode(IElementType type) {
+		//CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, ((Element)((View)getDiagramEditPart().getModel()).getElement()).getOwnedElements().size() == 0);
+		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		topNode = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
+	}
+
+	/**
+	 * Gets the top edit part.
+	 *
+	 * @return the top edit part
+	 */
+	public GraphicalEditPart getTopEditPart() {
+		return topNode;
+	}
+
+	/**
+	 * Gets the Child edit part.
+	 *
+	 * @return the Child edit part
+	 */
+	public GraphicalEditPart getChildEditPart() {
+		return childNode;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootSemanticModel()
+	 *
+	 * @return
+	 */
+	@Override
+	protected Element getRootSemanticModel() {
+		return (Element)((View)getTopEditPart().getModel()).getElement();
+	}
+
+	/**
+	 * Test to manage top node.
+	 *
+	 * @param type
+	 *        the type
+	 * @param containerType
+	 *        the container type
+	 */
+	public void testToManageTopNode(IElementType parentNodeType, IElementType topNodeType, IElementType type, String containerChilType, String containerType) {
+		//Parent Node
+		testToCreateATopNode(parentNodeType);
+		//Top Node
+		testToCreateANode(topNodeType, containerChilType);
+		//Nested classifier
+		testToCreateAChildLabel(type, containerType);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestPortLocation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestPortLocation.java
index 0cb6717b806..b0dd2cfd933 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestPortLocation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestPortLocation.java
@@ -1,172 +1,172 @@
-package org.eclipse.papyrus.uml.diagram.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-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.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.GMFtoGEFCommandWrapper;

-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;

-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-

-public abstract class TestPortLocation extends AbstractPapyrusTestCase {

-

-	protected abstract IElementType getPortType();

-

-	protected void testPortLocation(IElementType container) {

-		testPortLocation(container, null, null);

-	}

-

-	protected void testPortLocation(IElementType container, String containerCompartmentVisualId, IElementType child) {

-		IGraphicalEditPart parentEP = createChild(getDiagramEditPart(), container);

-		EObject containerSemantic = parentEP.resolveSemanticElement();

-		if (containerCompartmentVisualId != null) {

-			parentEP = findChildBySemanticHint(parentEP, containerCompartmentVisualId);

-		}

-		if (child != null) {

-			parentEP = createChild(parentEP, child);

-			EObject parentSemantic = parentEP.resolveSemanticElement();

-			if (parentSemantic instanceof Property) {

-				SetValueCommand setPropertyTypeCommand = new SetValueCommand(new SetRequest(parentSemantic, UMLPackage.eINSTANCE.getTypedElement_Type(), containerSemantic));

-				executeOnUIThread(new GMFtoGEFCommandWrapper(setPropertyTypeCommand));

-			}

-		}

-		Point parentLocation = new Point(100, 100);

-		parentEP.getFigure().setBounds(new Rectangle(parentLocation, new Dimension(200, 200)));

-		Point portLocation = new Point(100, 280);

-		IGraphicalEditPart portEP = createChild(parentEP, getPortType(), portLocation);

-		Port portSemantic = (Port) portEP.resolveSemanticElement();

-		assertNotNull(portSemantic);

-		checkPortPosition(portEP);

-		testViewDeletion(portEP, child == null ? 1 : 0);

-		testDrop(parentEP, portSemantic, portLocation, child == null ? 1 : 0);

-		portEP = parentEP.getChildBySemanticHint(((IHintedType) getPortType()).getSemanticHint());

-		checkPortPosition(portEP);

-	}

-

-	private void checkPortPosition(IGraphicalEditPart port) {

-		assertNotNull(port);

-		PortPositionLocator portPositionLocator = getConstraint(port);

-		assertNotNull(portPositionLocator);

-		assertNotNull(portPositionLocator.getConstraint());

-		Assert.assertEquals(new Point(-10, 180), portPositionLocator.getConstraint().getLocation());

-	}

-

-	private IGraphicalEditPart findChildBySemanticHint(IGraphicalEditPart parent, String vid) {

-		IGraphicalEditPart childEP = parent.getChildBySemanticHint(vid);

-		assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);

-		return childEP;

-	}

-

-	private PortPositionLocator getConstraint(IGraphicalEditPart portEP) {

-		if (false == portEP.getModel() instanceof View) {

-			return null;

-		}

-		Object constraint = ((AbstractBorderedShapeEditPart) portEP.getParent()).getBorderedFigure().getBorderItemContainer().getLayoutManager().getConstraint(portEP.getFigure());

-		if (false == constraint instanceof PortPositionLocator) {

-			return null;

-		}

-		return (PortPositionLocator) constraint;

-	}

-

-	private IGraphicalEditPart createChild(IGraphicalEditPart container, IElementType childType) {

-		return createChild(container, childType, new Point(0, 0));

-	}

-

-	private IGraphicalEditPart createChild(IGraphicalEditPart container, IElementType childType, Point location) {

-		final CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(childType, container.getDiagramPreferencesHint());

-		@SuppressWarnings("unchecked")

-		Map<Object, Object> params = requestcreation.getExtendedData();

-		params.put(AspectUnspecifiedTypeCreationTool.INITIAL_MOUSE_LOCATION_FOR_CREATION, location);

-		requestcreation.setSize(new Dimension(10, 10));

-		requestcreation.setLocation(location);

-		Command command = container.getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		executeOnUIThread(command);

-		EditPart createdEditPart = (EditPart) container.getChildren().get((container.getChildren().size() - 1));

-		Assert.assertNotNull("The editpart must be created", createdEditPart); //$NON-NLS-1$

-		Assert.assertTrue(createdEditPart instanceof IGraphicalEditPart);

-		return (IGraphicalEditPart) createdEditPart;

-	}

-

-	@SuppressWarnings("unchecked")

-	private void testViewDeletion(EditPart forHide, int expectedChildViews) {

-		assertEquals(VIEW_DELETION + INITIALIZATION_TEST, 1, getRootView().getChildren().size());

-		List<View> childViewsBefore = ((View) getRootView().getChildren().get(0)).getChildren();

-		int childViewsSize = childViewsBefore.size();

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = forHide.getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		// execute hide the view

-		executeOnUIThread(command);

-		List<View> childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();

-		assertEquals(VIEW_DELETION + " if the port has been hided.", expectedChildViews, childViewsSize - childViewsAfter.size());

-		// undo hide the view

-		undoOnUIThread();

-		childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();

-		assertEquals(VIEW_DELETION + " UNDO if the port has been restored.", childViewsSize, childViewsAfter.size());

-		// redo hide the view

-		redoOnUIThread();

-		childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();

-		assertEquals(VIEW_DELETION + "REDO if the port has been hided.", expectedChildViews, childViewsSize - childViewsAfter.size());

-	}

-

-	@SuppressWarnings("unchecked")

-	private void testDrop(IGraphicalEditPart container, Port port, Point location, int expectedChildViews) {

-		List<View> childViewsBefore = ((View) getRootView().getChildren().get(0)).getChildren();

-		int childViewsBeforeSize = childViewsBefore.size();

-		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		ArrayList<Element> list = new ArrayList<Element>();

-		list.add(port);

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(location);

-		Command command = container.getCommand(dropObjectsRequest);

-		assertNotNull(DROP + COMMAND_NULL, command);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		// execute the drop

-		executeOnUIThread(command);

-		List<View> childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();

-		assertEquals(DROP + TEST_THE_EXECUTION, expectedChildViews, childViewsAfter.size() - childViewsBeforeSize);

-		// undo the drop

-		undoOnUIThread();

-		childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();

-		Assert.assertEquals(DROP + TEST_THE_UNDO, childViewsAfter.size(), childViewsBeforeSize);

-		// redo the drop

-		redoOnUIThread();

-		childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();

-		Assert.assertEquals(DROP + TEST_THE_REDO, expectedChildViews, childViewsAfter.size() - childViewsBeforeSize);

-	}

-}

+package org.eclipse.papyrus.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+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.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.wrappers.GMFtoGEFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+
+public abstract class TestPortLocation extends AbstractPapyrusTestCase {
+
+	protected abstract IElementType getPortType();
+
+	protected void testPortLocation(IElementType container) {
+		testPortLocation(container, null, null);
+	}
+
+	protected void testPortLocation(IElementType container, String containerCompartmentVisualId, IElementType child) {
+		IGraphicalEditPart parentEP = createChild(getDiagramEditPart(), container);
+		EObject containerSemantic = parentEP.resolveSemanticElement();
+		if (containerCompartmentVisualId != null) {
+			parentEP = findChildBySemanticHint(parentEP, containerCompartmentVisualId);
+		}
+		if (child != null) {
+			parentEP = createChild(parentEP, child);
+			EObject parentSemantic = parentEP.resolveSemanticElement();
+			if (parentSemantic instanceof Property) {
+				SetValueCommand setPropertyTypeCommand = new SetValueCommand(new SetRequest(parentSemantic, UMLPackage.eINSTANCE.getTypedElement_Type(), containerSemantic));
+				executeOnUIThread(new GMFtoGEFCommandWrapper(setPropertyTypeCommand));
+			}
+		}
+		Point parentLocation = new Point(100, 100);
+		parentEP.getFigure().setBounds(new Rectangle(parentLocation, new Dimension(200, 200)));
+		Point portLocation = new Point(100, 280);
+		IGraphicalEditPart portEP = createChild(parentEP, getPortType(), portLocation);
+		Port portSemantic = (Port) portEP.resolveSemanticElement();
+		assertNotNull(portSemantic);
+		checkPortPosition(portEP);
+		testViewDeletion(portEP, child == null ? 1 : 0);
+		testDrop(parentEP, portSemantic, portLocation, child == null ? 1 : 0);
+		portEP = parentEP.getChildBySemanticHint(((IHintedType) getPortType()).getSemanticHint());
+		checkPortPosition(portEP);
+	}
+
+	private void checkPortPosition(IGraphicalEditPart port) {
+		assertNotNull(port);
+		PortPositionLocator portPositionLocator = getConstraint(port);
+		assertNotNull(portPositionLocator);
+		assertNotNull(portPositionLocator.getConstraint());
+		Assert.assertEquals(new Point(-10, 180), portPositionLocator.getConstraint().getLocation());
+	}
+
+	private IGraphicalEditPart findChildBySemanticHint(IGraphicalEditPart parent, String vid) {
+		IGraphicalEditPart childEP = parent.getChildBySemanticHint(vid);
+		assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);
+		return childEP;
+	}
+
+	private PortPositionLocator getConstraint(IGraphicalEditPart portEP) {
+		if (false == portEP.getModel() instanceof View) {
+			return null;
+		}
+		Object constraint = ((AbstractBorderedShapeEditPart) portEP.getParent()).getBorderedFigure().getBorderItemContainer().getLayoutManager().getConstraint(portEP.getFigure());
+		if (false == constraint instanceof PortPositionLocator) {
+			return null;
+		}
+		return (PortPositionLocator) constraint;
+	}
+
+	private IGraphicalEditPart createChild(IGraphicalEditPart container, IElementType childType) {
+		return createChild(container, childType, new Point(0, 0));
+	}
+
+	private IGraphicalEditPart createChild(IGraphicalEditPart container, IElementType childType, Point location) {
+		final CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(childType, container.getDiagramPreferencesHint());
+		@SuppressWarnings("unchecked")
+		Map<Object, Object> params = requestcreation.getExtendedData();
+		params.put(AspectUnspecifiedTypeCreationTool.INITIAL_MOUSE_LOCATION_FOR_CREATION, location);
+		requestcreation.setSize(new Dimension(10, 10));
+		requestcreation.setLocation(location);
+		Command command = container.getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		executeOnUIThread(command);
+		EditPart createdEditPart = (EditPart) container.getChildren().get((container.getChildren().size() - 1));
+		Assert.assertNotNull("The editpart must be created", createdEditPart); //$NON-NLS-1$
+		Assert.assertTrue(createdEditPart instanceof IGraphicalEditPart);
+		return (IGraphicalEditPart) createdEditPart;
+	}
+
+	@SuppressWarnings("unchecked")
+	private void testViewDeletion(EditPart forHide, int expectedChildViews) {
+		assertEquals(VIEW_DELETION + INITIALIZATION_TEST, 1, getRootView().getChildren().size());
+		List<View> childViewsBefore = ((View) getRootView().getChildren().get(0)).getChildren();
+		int childViewsSize = childViewsBefore.size();
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = forHide.getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		// execute hide the view
+		executeOnUIThread(command);
+		List<View> childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();
+		assertEquals(VIEW_DELETION + " if the port has been hided.", expectedChildViews, childViewsSize - childViewsAfter.size());
+		// undo hide the view
+		undoOnUIThread();
+		childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();
+		assertEquals(VIEW_DELETION + " UNDO if the port has been restored.", childViewsSize, childViewsAfter.size());
+		// redo hide the view
+		redoOnUIThread();
+		childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();
+		assertEquals(VIEW_DELETION + "REDO if the port has been hided.", expectedChildViews, childViewsSize - childViewsAfter.size());
+	}
+
+	@SuppressWarnings("unchecked")
+	private void testDrop(IGraphicalEditPart container, Port port, Point location, int expectedChildViews) {
+		List<View> childViewsBefore = ((View) getRootView().getChildren().get(0)).getChildren();
+		int childViewsBeforeSize = childViewsBefore.size();
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		list.add(port);
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(location);
+		Command command = container.getCommand(dropObjectsRequest);
+		assertNotNull(DROP + COMMAND_NULL, command);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		// execute the drop
+		executeOnUIThread(command);
+		List<View> childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();
+		assertEquals(DROP + TEST_THE_EXECUTION, expectedChildViews, childViewsAfter.size() - childViewsBeforeSize);
+		// undo the drop
+		undoOnUIThread();
+		childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();
+		Assert.assertEquals(DROP + TEST_THE_UNDO, childViewsAfter.size(), childViewsBeforeSize);
+		// redo the drop
+		redoOnUIThread();
+		childViewsAfter = ((View) getRootView().getChildren().get(0)).getChildren();
+		Assert.assertEquals(DROP + TEST_THE_REDO, expectedChildViews, childViewsAfter.size() - childViewsBeforeSize);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestTopNode.java
index 55dd6791f1a..c68b5d5da82 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestTopNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestTopNode.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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.uml.diagram.tests.canonical;

-

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * The Class TestTopNode.

- */

-public abstract class TestTopNode extends AbstractTestNode {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected IGraphicalEditPart getContainerEditPart() {

-		return getDiagramEditPart();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected View getRootView() {

-		return (View)getContainerEditPart().getModel();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected boolean isSemanticTest() {

-		return true;

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.tests.canonical;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * The Class TestTopNode.
+ */
+public abstract class TestTopNode extends AbstractTestNode {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected IGraphicalEditPart getContainerEditPart() {
+		return getDiagramEditPart();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected View getRootView() {
+		return (View)getContainerEditPart().getModel();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean isSemanticTest() {
+		return true;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/edition/EditableElementTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/edition/EditableElementTest.java
index 5d3a20a909d..f2bde99ed6d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/edition/EditableElementTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/edition/EditableElementTest.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.tests.edition;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;

-

-

-public abstract class EditableElementTest extends AbstractPapyrusTestCase{

-	

-

-	public abstract void testEdition(IElementType type);

-	public abstract GraphicalEditPart getContainerEditPart();

-	

-	/**

-	 * get the primary figure that correspond to the edipart

-	 * @param createdEditpart

-	 * @return a Ifigure

-	 */

-	protected IFigure getPrimaryFigure(GraphicalEditPart createdEditpart) {

-		if(createdEditpart.getFigure() instanceof BorderedNodeFigure){

-			IFigure nodePlate = (IFigure)((BorderedNodeFigure)createdEditpart.getFigure()).getChildren().get(0);

-			// now verify position of each subfigure

-			IFigure fig = ((IFigure)nodePlate.getChildren().get(0));

-			return fig;

-		}

-		else{return createdEditpart.getFigure(); }

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.tests.edition;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase;
+
+
+public abstract class EditableElementTest extends AbstractPapyrusTestCase{
+	
+
+	public abstract void testEdition(IElementType type);
+	public abstract GraphicalEditPart getContainerEditPart();
+	
+	/**
+	 * get the primary figure that correspond to the edipart
+	 * @param createdEditpart
+	 * @return a Ifigure
+	 */
+	protected IFigure getPrimaryFigure(GraphicalEditPart createdEditpart) {
+		if(createdEditpart.getFigure() instanceof BorderedNodeFigure){
+			IFigure nodePlate = (IFigure)((BorderedNodeFigure)createdEditpart.getFigure()).getChildren().get(0);
+			// now verify position of each subfigure
+			IFigure fig = ((IFigure)nodePlate.getChildren().get(0));
+			return fig;
+		}
+		else{return createdEditpart.getFigure(); }
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/synchronization/AbstractCSSSynchronizationTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/synchronization/AbstractCSSSynchronizationTest.java
index d0f0cb7a3e4..76162796614 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/synchronization/AbstractCSSSynchronizationTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/synchronization/AbstractCSSSynchronizationTest.java
@@ -1,263 +1,263 @@
-/*****************************************************************************

- * 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.uml.diagram.tests.synchronization;

-

-import java.io.InputStream;

-import java.lang.annotation.ElementType;

-import java.lang.annotation.Retention;

-import java.lang.annotation.RetentionPolicy;

-import java.lang.annotation.Target;

-import java.net.URL;

-import java.util.List;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.common.util.WrappedException;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-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.gmfdiag.common.databinding.custom.AddCustomStyleListValueCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;

-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.databinding.AddCSSStyleSheetCommand;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;

-import org.eclipse.papyrus.junit.utils.JUnitUtils;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.rules.TestRule;

-import org.junit.rules.TestWatcher;

-import org.junit.runner.Description;

-import org.osgi.framework.FrameworkUtil;

-

-import com.google.common.collect.Iterables;

-import com.google.common.collect.Lists;

-

-/**

- * Common implementation of synchronization test cases for CSS.

- */

-@PluginResource("resources/synch-test-model.di")

-public abstract class AbstractCSSSynchronizationTest extends AbstractSynchronizationTest {

-	@Rule

-	public final TestRule stylesheetRule = new StylesheetRule();

-

-	protected IFile cssFile;

-

-	public AbstractCSSSynchronizationTest() {

-		super();

-	}

-

-	@Before

-	@Override

-	public void makeDiagramCanonical() {

-		super.makeDiagramCanonical();

-

-		((StylesheetRule) stylesheetRule).apply();

-	}

-

-	protected EmbeddedStyleSheet getStylesheet(String name) {

-		EmbeddedStyleSheet result = null;

-

-		for (EmbeddedStyleSheet next : Iterables.filter(getDiagramEditPart().getNotationView().eResource().getContents(), EmbeddedStyleSheet.class)) {

-			if (name.equals(next.getLabel())) {

-				result = next;

-				break;

-			}

-		}

-

-		return result;

-	}

-

-	protected void referenceEmbeddedStylesheet(String name) {

-		referenceEmbeddedStylesheet(name, false);

-	}

-

-	private void referenceEmbeddedStylesheet(String name, boolean unsafe) {

-		TransactionalEditingDomain domain = getEditingDomain();

-		View targetView = getDiagramEditPart().getNotationView();

-		EmbeddedStyleSheet css = getStylesheet(name);

-

-		Command command = new AddCSSStyleSheetCommand(domain, targetView,

-				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,

-				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,

-				css);

-

-		if (unsafe) {

-			command = GMFUnsafe.wrap(getEditingDomain(), command);

-			command.execute();

-			domain.getCommandStack().flush(); // Just in case

-		} else {

-			domain.getCommandStack().execute(command);

-		}

-

-		waitForUIEvents();

-	}

-

-	protected void referenceExternalStylesheet(String path) {

-		referenceExternalStylesheet(path, false);

-	}

-

-	private void referenceExternalStylesheet(String path, boolean unsafe) {

-		TransactionalEditingDomain domain = getEditingDomain();

-		View targetView = getDiagramEditPart().getNotationView();

-		StyleSheetReference css = StylesheetsFactory.eINSTANCE.createStyleSheetReference();

-		css.setPath(path);

-

-		Command command = new AddCSSStyleSheetCommand(domain, targetView,

-				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,

-				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,

-				css);

-

-		if (unsafe) {

-			command = GMFUnsafe.wrap(getEditingDomain(), command);

-			command.execute();

-			domain.getCommandStack().flush(); // Just in case

-		} else {

-			domain.getCommandStack().execute(command);

-		}

-

-		waitForUIEvents();

-	}

-

-	protected EmbeddedStyleSheet createEmbeddedStylesheet(String css, boolean unsafe) {

-		EmbeddedStyleSheet result = StylesheetsFactory.eINSTANCE.createEmbeddedStyleSheet();

-		result.setContent(css);

-

-		final TransactionalEditingDomain domain = getEditingDomain();

-		final View diagram = getDiagramEditPart().getNotationView();

-		Command command = new AddCommand(domain, diagram.eResource().getContents(), result);

-		command = command.chain(new AddCSSStyleSheetCommand(domain, diagram,

-				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,

-				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,

-				result));

-

-		if (unsafe) {

-			command = GMFUnsafe.wrap(domain, command);

-			command.execute();

-			domain.getCommandStack().flush(); // Just in case

-		} else {

-			domain.getCommandStack().execute(command);

-		}

-

-		waitForUIEvents();

-

-		return result;

-	}

-

-	protected void addStyleClass(View view, String name) {

-		TransactionalEditingDomain domain = getEditingDomain();

-

-		Command command = new AddCustomStyleListValueCommand(domain, view,

-				CSSStyles.CSS_GMF_CLASS_KEY,

-				NotationPackage.Literals.STRING_LIST_VALUE_STYLE, NotationPackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE,

-				name);

-

-		domain.getCommandStack().execute(command);

-

-		waitForUIEvents();

-	}

-

-	protected void refreshDiagram() {

-		Diagram diagram = getDiagramEditPart().getDiagramView();

-		((CSSDiagram) diagram).getEngine().reset();

-		DiagramHelper.forceRefresh(getDiagramEditPart());

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * An annotation naming a CSS stylesheet embedded in the model that should be referenced

-	 * as the stylesheet of the diagram in which the test is performed.

-	 */

-	@Retention(RetentionPolicy.RUNTIME)

-	@Target({ ElementType.TYPE, ElementType.METHOD })

-	public @interface StylesheetRef {

-		String value();

-	}

-

-	/**

-	 * An annotation naming an external CSS stylesheet resource in the model that should be referenced

-	 * as the stylesheet of the diagram in which the test is performed.

-	 */

-	@Retention(RetentionPolicy.RUNTIME)

-	@Target({ ElementType.TYPE, ElementType.METHOD })

-	public @interface CSSResource {

-		String value();

-	}

-

-	/**

-	 * An annotation defining a CSS stylesheet (literally) that should be attached

-	 * as the stylesheet of the diagram in which the test is performed.

-	 */

-	@Retention(RetentionPolicy.RUNTIME)

-	@Target({ ElementType.TYPE, ElementType.METHOD })

-	public @interface CSS {

-		String value();

-	}

-

-	private class StylesheetRule extends TestWatcher {

-		private List<StylesheetRef> refs = Lists.newArrayListWithExpectedSize(1);

-		private List<CSSResource> cssResources = Lists.newArrayListWithExpectedSize(1);

-		private List<CSS> csses = Lists.newArrayListWithExpectedSize(1);

-

-		@Override

-		protected void starting(Description description) {

-			StylesheetRef ref = JUnitUtils.getAnnotation(description, StylesheetRef.class);

-			if (ref != null) {

-				refs.add(ref);

-			}

-

-			CSSResource cssRes = JUnitUtils.getAnnotation(description, CSSResource.class);

-			if (cssRes != null) {

-				cssResources.add(cssRes);

-			}

-

-			CSS css = JUnitUtils.getAnnotation(description, CSS.class);

-			if (css != null) {

-				csses.add(css);

-			}

-		}

-

-		void apply() {

-			for (StylesheetRef ref : refs) {

-				referenceEmbeddedStylesheet(ref.value(), true);

-			}

-

-			for (CSSResource cssRes : cssResources) {

-				URL url = FrameworkUtil.getBundle(AbstractCSSSynchronizationTest.this.getClass()).getEntry(cssRes.value());

-				try (InputStream contents = url.openStream()) {

-					cssFile = suiteState.getProject().getFile(URI.createURI(url.toExternalForm()).lastSegment());

-					cssFile.create(contents, false, null);

-				} catch (Exception e) {

-					throw new WrappedException(e);

-				}

-				referenceExternalStylesheet(cssFile.getFullPath().toString(), true);

-			}

-

-			for (CSS css : csses) {

-				createEmbeddedStylesheet(css.value(), true);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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.uml.diagram.tests.synchronization;
+
+import java.io.InputStream;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.net.URL;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+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.gmfdiag.common.databinding.custom.AddCustomStyleListValueCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
+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.databinding.AddCSSStyleSheetCommand;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;
+import org.eclipse.papyrus.junit.utils.JUnitUtils;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestRule;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
+import org.osgi.framework.FrameworkUtil;
+
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
+/**
+ * Common implementation of synchronization test cases for CSS.
+ */
+@PluginResource("resources/synch-test-model.di")
+public abstract class AbstractCSSSynchronizationTest extends AbstractSynchronizationTest {
+	@Rule
+	public final TestRule stylesheetRule = new StylesheetRule();
+
+	protected IFile cssFile;
+
+	public AbstractCSSSynchronizationTest() {
+		super();
+	}
+
+	@Before
+	@Override
+	public void makeDiagramCanonical() {
+		super.makeDiagramCanonical();
+
+		((StylesheetRule) stylesheetRule).apply();
+	}
+
+	protected EmbeddedStyleSheet getStylesheet(String name) {
+		EmbeddedStyleSheet result = null;
+
+		for (EmbeddedStyleSheet next : Iterables.filter(getDiagramEditPart().getNotationView().eResource().getContents(), EmbeddedStyleSheet.class)) {
+			if (name.equals(next.getLabel())) {
+				result = next;
+				break;
+			}
+		}
+
+		return result;
+	}
+
+	protected void referenceEmbeddedStylesheet(String name) {
+		referenceEmbeddedStylesheet(name, false);
+	}
+
+	private void referenceEmbeddedStylesheet(String name, boolean unsafe) {
+		TransactionalEditingDomain domain = getEditingDomain();
+		View targetView = getDiagramEditPart().getNotationView();
+		EmbeddedStyleSheet css = getStylesheet(name);
+
+		Command command = new AddCSSStyleSheetCommand(domain, targetView,
+				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,
+				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,
+				css);
+
+		if (unsafe) {
+			command = GMFUnsafe.wrap(getEditingDomain(), command);
+			command.execute();
+			domain.getCommandStack().flush(); // Just in case
+		} else {
+			domain.getCommandStack().execute(command);
+		}
+
+		waitForUIEvents();
+	}
+
+	protected void referenceExternalStylesheet(String path) {
+		referenceExternalStylesheet(path, false);
+	}
+
+	private void referenceExternalStylesheet(String path, boolean unsafe) {
+		TransactionalEditingDomain domain = getEditingDomain();
+		View targetView = getDiagramEditPart().getNotationView();
+		StyleSheetReference css = StylesheetsFactory.eINSTANCE.createStyleSheetReference();
+		css.setPath(path);
+
+		Command command = new AddCSSStyleSheetCommand(domain, targetView,
+				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,
+				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,
+				css);
+
+		if (unsafe) {
+			command = GMFUnsafe.wrap(getEditingDomain(), command);
+			command.execute();
+			domain.getCommandStack().flush(); // Just in case
+		} else {
+			domain.getCommandStack().execute(command);
+		}
+
+		waitForUIEvents();
+	}
+
+	protected EmbeddedStyleSheet createEmbeddedStylesheet(String css, boolean unsafe) {
+		EmbeddedStyleSheet result = StylesheetsFactory.eINSTANCE.createEmbeddedStyleSheet();
+		result.setContent(css);
+
+		final TransactionalEditingDomain domain = getEditingDomain();
+		final View diagram = getDiagramEditPart().getNotationView();
+		Command command = new AddCommand(domain, diagram.eResource().getContents(), result);
+		command = command.chain(new AddCSSStyleSheetCommand(domain, diagram,
+				CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,
+				NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,
+				result));
+
+		if (unsafe) {
+			command = GMFUnsafe.wrap(domain, command);
+			command.execute();
+			domain.getCommandStack().flush(); // Just in case
+		} else {
+			domain.getCommandStack().execute(command);
+		}
+
+		waitForUIEvents();
+
+		return result;
+	}
+
+	protected void addStyleClass(View view, String name) {
+		TransactionalEditingDomain domain = getEditingDomain();
+
+		Command command = new AddCustomStyleListValueCommand(domain, view,
+				CSSStyles.CSS_GMF_CLASS_KEY,
+				NotationPackage.Literals.STRING_LIST_VALUE_STYLE, NotationPackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE,
+				name);
+
+		domain.getCommandStack().execute(command);
+
+		waitForUIEvents();
+	}
+
+	protected void refreshDiagram() {
+		Diagram diagram = getDiagramEditPart().getDiagramView();
+		((CSSDiagram) diagram).getEngine().reset();
+		DiagramHelper.forceRefresh(getDiagramEditPart());
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * An annotation naming a CSS stylesheet embedded in the model that should be referenced
+	 * as the stylesheet of the diagram in which the test is performed.
+	 */
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target({ ElementType.TYPE, ElementType.METHOD })
+	public @interface StylesheetRef {
+		String value();
+	}
+
+	/**
+	 * An annotation naming an external CSS stylesheet resource in the model that should be referenced
+	 * as the stylesheet of the diagram in which the test is performed.
+	 */
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target({ ElementType.TYPE, ElementType.METHOD })
+	public @interface CSSResource {
+		String value();
+	}
+
+	/**
+	 * An annotation defining a CSS stylesheet (literally) that should be attached
+	 * as the stylesheet of the diagram in which the test is performed.
+	 */
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target({ ElementType.TYPE, ElementType.METHOD })
+	public @interface CSS {
+		String value();
+	}
+
+	private class StylesheetRule extends TestWatcher {
+		private List<StylesheetRef> refs = Lists.newArrayListWithExpectedSize(1);
+		private List<CSSResource> cssResources = Lists.newArrayListWithExpectedSize(1);
+		private List<CSS> csses = Lists.newArrayListWithExpectedSize(1);
+
+		@Override
+		protected void starting(Description description) {
+			StylesheetRef ref = JUnitUtils.getAnnotation(description, StylesheetRef.class);
+			if (ref != null) {
+				refs.add(ref);
+			}
+
+			CSSResource cssRes = JUnitUtils.getAnnotation(description, CSSResource.class);
+			if (cssRes != null) {
+				cssResources.add(cssRes);
+			}
+
+			CSS css = JUnitUtils.getAnnotation(description, CSS.class);
+			if (css != null) {
+				csses.add(css);
+			}
+		}
+
+		void apply() {
+			for (StylesheetRef ref : refs) {
+				referenceEmbeddedStylesheet(ref.value(), true);
+			}
+
+			for (CSSResource cssRes : cssResources) {
+				URL url = FrameworkUtil.getBundle(AbstractCSSSynchronizationTest.this.getClass()).getEntry(cssRes.value());
+				try (InputStream contents = url.openStream()) {
+					cssFile = suiteState.getProject().getFile(URI.createURI(url.toExternalForm()).lastSegment());
+					cssFile.create(contents, false, null);
+				} catch (Exception e) {
+					throw new WrappedException(e);
+				}
+				referenceExternalStylesheet(cssFile.getFullPath().toString(), true);
+			}
+
+			for (CSS css : csses) {
+				createEmbeddedStylesheet(css.value(), true);
+			}
+		}
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF
index 883cb43f7a3..d01218ab6ee 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF
@@ -1,34 +1,34 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.3.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.4.1",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.xtend.lib;bundle-version="2.8.1",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.timing.tests,

- org.eclipse.papyrus.uml.diagram.timing.tests.canonical,

- org.eclipse.papyrus.uml.diagram.timing.tests.generation,

- org.eclipse.papyrus.uml.diagram.timing.tests.generic

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Papyrus Timing Diagram Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.4.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.timing.tests,
+ org.eclipse.papyrus.uml.diagram.timing.tests.canonical,
+ org.eclipse.papyrus.uml.diagram.timing.tests.generation,
+ org.eclipse.papyrus.uml.diagram.timing.tests.generic
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Papyrus Timing Diagram Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/TODO.txt b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/TODO.txt
index dd867480403..a1dc54b5cfd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/TODO.txt
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/TODO.txt
@@ -1,70 +1,70 @@
-remaining tests to write:

-- check that full state invariants are positioned in front of their state definition

-- test deleting a full state invariant (check that related time elements and general orderings are deleted)

-- test hiding a full state invariant (check that related time elements and general orderings are hidden)

-- test hiding an occurrence specification in a full lifeline

-- test that moving a vertical line moves the preceding occurrence specification

-- check that related time elements and general orderings are deleted when deleting a compact occurrence specification

-- check that related time elements and general orderings are deleted when deleting a compact state invariant

-- test hiding a compact occurrence specification (check that related elements are hidden)

-- check that fragment names are updated when changing a state definition name

-- check that vertical lines cannot be deleted

-- test model consistency when modifying the model from the Model Explorer (delete, rename, ...)

-- test reordering Lifelines through drag&drop inside the interaction

-- test reordering state definitions through drag&drop inside the state definition compartment

-- test creating sync/async/reply Messages (check that OccurrenceSpecifications are converted to MessageOccurrenceSpecifications on the fly)

-- test deleting a MessageOccurrenceSpecification (check that the associated Message is deleted)

-- test creating a lost message

-- test moving a lost message floating anchor

-- test creating a found message

-- test moving a found message floating anchor

-- test re-orienting sync/async/reply Messages

-- test re-orienting a create message: everything before the start occurrence must be deleted

-- test re-orienting a destroy message: everything after the destruction occurrence must be deleted

-- test re-orienting the source of a lost message

-- test re-orienting the target of a found message

-- test creating a Gate on the border of an Interaction

-- test renaming a Gate

-- test deleting a Gate (the associated Messages must be deleted)

-- test re-orienting a message from/to a Gate

-- 

-

-- test creating a create message (full and compact): check that occurrences and state invariants before the start occurrence are deleted

-- check that time elements and general orderings are not deleted when creating a create message, unless their related element gets deleted

-- check that deleting the start occurrence (from a create message) restores the timeline to normal (full and compact): starting with a StateInvariant

-- check that deleting the state invariant immediately after a creation occurrence (that starts the timeline) also deletes the creation occurrence

-

-- test creating a delete message: check that a DestructionOccurrenceSpecification is created and that other occurrences and state invariants after it are deleted

-- check that time elements and general orderings are not deleted when adding a DestructionOccurrenceSpecification, unless their related element gets deleted

-- test creating a DestructionOccurrenceSpecification from the palette

-- test deleting a DestructionOccurrenceSpecification

-

-- test creating TimeObservations/TimeConstraints (on occurrence specifications and state invariants)

-- test renaming TimeObservations/TimeConstraints

-- test deleting TimeObservations/TimeConstraints

-- test that changing "firstEvent" on a TimeObservation/TimeConstraint moves the TimeObservation/TimeConstraint

-- test that TimeObservations and TimeConstraints have the same horizontal position as the element they are linked to

-- test creating DurationObservations/DurationConstraints (on occurrence specifications and state invariants)

-- test creating DurationObservation/DurationConstraint from a state invariant to the same state invariant

-- test renaming DurationObservations/DurationConstraints

-- test deleting DurationObservations/DurationConstraints

-- test that a DurationObservation/DurationConstraint on the last StateInvariant is properly positioned

-- test that a DurationObservation/DurationConstraint on a StateInvariant is reconnected to the new StateInvariant when cutting the first StateInvariant in two (not yet implemented)

-- test that DurationObservations/DurationConstraints have the correct horizontal position and size considering the elements they are linked to

-- same thing, on a compact state with occurrences on top of it

-- test that in the presence of a DestructionOccurrenceSpecification, DurationObservations/DurationConstraints on the last state end on this DestructionOccurrenceSpecification

-- test creating a general ordering

-- test renaming a general ordering

-- test deleting a general ordering

-

-

-- test dropping lifelines with their covering fragments

-- test dropping messages (sync/async/reply/create/delete/lost/found)

-- test dropping TimeObservation, TimeConstraint, DurationObservation, DurationConstraint

-- test dropping GeneralOrdering

-- test dropping Gate

-- test dropping non-valid models (to check that validation fixes the model)

-

-- test stereotypes

-- test switching between full and compact lifelines

+remaining tests to write:
+- check that full state invariants are positioned in front of their state definition
+- test deleting a full state invariant (check that related time elements and general orderings are deleted)
+- test hiding a full state invariant (check that related time elements and general orderings are hidden)
+- test hiding an occurrence specification in a full lifeline
+- test that moving a vertical line moves the preceding occurrence specification
+- check that related time elements and general orderings are deleted when deleting a compact occurrence specification
+- check that related time elements and general orderings are deleted when deleting a compact state invariant
+- test hiding a compact occurrence specification (check that related elements are hidden)
+- check that fragment names are updated when changing a state definition name
+- check that vertical lines cannot be deleted
+- test model consistency when modifying the model from the Model Explorer (delete, rename, ...)
+- test reordering Lifelines through drag&drop inside the interaction
+- test reordering state definitions through drag&drop inside the state definition compartment
+- test creating sync/async/reply Messages (check that OccurrenceSpecifications are converted to MessageOccurrenceSpecifications on the fly)
+- test deleting a MessageOccurrenceSpecification (check that the associated Message is deleted)
+- test creating a lost message
+- test moving a lost message floating anchor
+- test creating a found message
+- test moving a found message floating anchor
+- test re-orienting sync/async/reply Messages
+- test re-orienting a create message: everything before the start occurrence must be deleted
+- test re-orienting a destroy message: everything after the destruction occurrence must be deleted
+- test re-orienting the source of a lost message
+- test re-orienting the target of a found message
+- test creating a Gate on the border of an Interaction
+- test renaming a Gate
+- test deleting a Gate (the associated Messages must be deleted)
+- test re-orienting a message from/to a Gate
+- 
+
+- test creating a create message (full and compact): check that occurrences and state invariants before the start occurrence are deleted
+- check that time elements and general orderings are not deleted when creating a create message, unless their related element gets deleted
+- check that deleting the start occurrence (from a create message) restores the timeline to normal (full and compact): starting with a StateInvariant
+- check that deleting the state invariant immediately after a creation occurrence (that starts the timeline) also deletes the creation occurrence
+
+- test creating a delete message: check that a DestructionOccurrenceSpecification is created and that other occurrences and state invariants after it are deleted
+- check that time elements and general orderings are not deleted when adding a DestructionOccurrenceSpecification, unless their related element gets deleted
+- test creating a DestructionOccurrenceSpecification from the palette
+- test deleting a DestructionOccurrenceSpecification
+
+- test creating TimeObservations/TimeConstraints (on occurrence specifications and state invariants)
+- test renaming TimeObservations/TimeConstraints
+- test deleting TimeObservations/TimeConstraints
+- test that changing "firstEvent" on a TimeObservation/TimeConstraint moves the TimeObservation/TimeConstraint
+- test that TimeObservations and TimeConstraints have the same horizontal position as the element they are linked to
+- test creating DurationObservations/DurationConstraints (on occurrence specifications and state invariants)
+- test creating DurationObservation/DurationConstraint from a state invariant to the same state invariant
+- test renaming DurationObservations/DurationConstraints
+- test deleting DurationObservations/DurationConstraints
+- test that a DurationObservation/DurationConstraint on the last StateInvariant is properly positioned
+- test that a DurationObservation/DurationConstraint on a StateInvariant is reconnected to the new StateInvariant when cutting the first StateInvariant in two (not yet implemented)
+- test that DurationObservations/DurationConstraints have the correct horizontal position and size considering the elements they are linked to
+- same thing, on a compact state with occurrences on top of it
+- test that in the presence of a DestructionOccurrenceSpecification, DurationObservations/DurationConstraints on the last state end on this DestructionOccurrenceSpecification
+- test creating a general ordering
+- test renaming a general ordering
+- test deleting a general ordering
+
+
+- test dropping lifelines with their covering fragments
+- test dropping messages (sync/async/reply/create/delete/lost/found)
+- test dropping TimeObservation, TimeConstraint, DurationObservation, DurationConstraint
+- test dropping GeneralOrdering
+- test dropping Gate
+- test dropping non-valid models (to check that validation fixes the model)
+
+- test stereotypes
+- test switching between full and compact lifelines
 - test that what works with OccurrenceSpecifications (moving, hiding, deleting, etc.) also works with MessageOccurrenceSpecifications and DestructionOccurrenceSpecifications
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/build.properties
index 50f335de4ca..50ac12db5fc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/build.properties
@@ -1,18 +1,18 @@
-###############################################################################

-# Copyright (c) 2012 CEA LIST.

-#

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-###############################################################################

-source.. = src/,\

-           test-gen/,\

-           xtend-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               org.eclipse.papyrus.uml.diagram.timing.tests.launch,\

-               build.properties

-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
+###############################################################################
+source.. = src/,\
+           test-gen/,\
+           xtend-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               org.eclipse.papyrus.uml.diagram.timing.tests.launch,\
+               build.properties
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/org.eclipse.papyrus.uml.diagram.timing.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/org.eclipse.papyrus.uml.diagram.timing.tests.launch
index 8d57ebc8a14..475c30d7805 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/org.eclipse.papyrus.uml.diagram.timing.tests.launch
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/org.eclipse.papyrus.uml.diagram.timing.tests.launch
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-timing-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.timing.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.timing.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea    -Xms40m -Xmx4096m&#13;&#10;-XX:+CMSClassUnloadingEnabled"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.facet.common.core@default:default,org.eclipse.emf.facet.common.ui@default:default,org.eclipse.emf.facet.custom.core@default:default,org.eclipse.emf.facet.custom.metamodel@default:default,org.eclipse.emf.facet.custom.ui@default:default,org.eclipse.emf.facet.efacet.catalog@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet@default:default,org.eclipse.emf.facet.infra.browser.custom.core@default:default,org.eclipse.emf.facet.infra.browser.custom.ui@default:default,org.eclipse.emf.facet.infra.browser.custom@default:default,org.eclipse.emf.facet.infra.browser.uicore@default:default,org.eclipse.emf.facet.infra.browser@default:default,org.eclipse.emf.facet.infra.common.core@default:default,org.eclipse.emf.facet.infra.common.ui@default:default,org.eclipse.emf.facet.infra.facet.core@default:default,org.eclipse.emf.facet.infra.facet.edit@default:default,org.eclipse.emf.facet.infra.facet.editor@default:default,org.eclipse.emf.facet.infra.facet.ui@default:default,org.eclipse.emf.facet.infra.facet@default:default,org.eclipse.emf.facet.infra.query.core@default:default,org.eclipse.emf.facet.infra.query.edit@default:default,org.eclipse.emf.facet.infra.query.editor@default:default,org.eclipse.emf.facet.infra.query.ui@default:default,org.eclipse.emf.facet.infra.query@default:default,org.eclipse.emf.facet.query.java.core@default:default,org.eclipse.emf.facet.query.java.metamodel@default:default,org.eclipse.emf.facet.query.java@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.emf.catalog@default:default,org.eclipse.emf.facet.util.emf.core@default:default,org.eclipse.emf.facet.util.emf.ui@default:default,org.eclipse.emf.facet.util.ui@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.emf.facet.widgets.celleditors@default:default,org.eclipse.emf.facet.widgets@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmt.modisco.infra.common.core@default:default,org.eclipse.gmt.modisco.infra.common.ui@default:default,org.eclipse.gmt.modisco.infra.discoverymanager@default:default,org.eclipse.gmt.modisco.xml.discoverer@default:default,org.eclipse.gmt.modisco.xml@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.modisco.infra.discovery.core@default:default,org.eclipse.modisco.infra.discovery.ui@default:default,org.eclipse.modisco.infra.discovery@default:default,org.eclipse.modisco.xml.discoverer@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.common@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.l2@default:default,org.eclipse.uml2.uml.profile.l3@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>

-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.core.resourceloading.tests@default:false,org.eclipse.papyrus.core.tests@default:false,org.eclipse.papyrus.diagram.common.tests@default:false,org.eclipse.papyrus.diagram.tests@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.tests@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview.tests@default:default,org.eclipse.papyrus.uml.diagram.timing.tests@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.views.modelexplorer.newchild@default:default"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-timing-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.timing.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.timing.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea    -Xms40m -Xmx4096m&#13;&#10;-XX:+CMSClassUnloadingEnabled"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.facet.common.core@default:default,org.eclipse.emf.facet.common.ui@default:default,org.eclipse.emf.facet.custom.core@default:default,org.eclipse.emf.facet.custom.metamodel@default:default,org.eclipse.emf.facet.custom.ui@default:default,org.eclipse.emf.facet.efacet.catalog@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet@default:default,org.eclipse.emf.facet.infra.browser.custom.core@default:default,org.eclipse.emf.facet.infra.browser.custom.ui@default:default,org.eclipse.emf.facet.infra.browser.custom@default:default,org.eclipse.emf.facet.infra.browser.uicore@default:default,org.eclipse.emf.facet.infra.browser@default:default,org.eclipse.emf.facet.infra.common.core@default:default,org.eclipse.emf.facet.infra.common.ui@default:default,org.eclipse.emf.facet.infra.facet.core@default:default,org.eclipse.emf.facet.infra.facet.edit@default:default,org.eclipse.emf.facet.infra.facet.editor@default:default,org.eclipse.emf.facet.infra.facet.ui@default:default,org.eclipse.emf.facet.infra.facet@default:default,org.eclipse.emf.facet.infra.query.core@default:default,org.eclipse.emf.facet.infra.query.edit@default:default,org.eclipse.emf.facet.infra.query.editor@default:default,org.eclipse.emf.facet.infra.query.ui@default:default,org.eclipse.emf.facet.infra.query@default:default,org.eclipse.emf.facet.query.java.core@default:default,org.eclipse.emf.facet.query.java.metamodel@default:default,org.eclipse.emf.facet.query.java@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.emf.catalog@default:default,org.eclipse.emf.facet.util.emf.core@default:default,org.eclipse.emf.facet.util.emf.ui@default:default,org.eclipse.emf.facet.util.ui@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.emf.facet.widgets.celleditors@default:default,org.eclipse.emf.facet.widgets@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmt.modisco.infra.common.core@default:default,org.eclipse.gmt.modisco.infra.common.ui@default:default,org.eclipse.gmt.modisco.infra.discoverymanager@default:default,org.eclipse.gmt.modisco.xml.discoverer@default:default,org.eclipse.gmt.modisco.xml@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.modisco.infra.discovery.core@default:default,org.eclipse.modisco.infra.discovery.ui@default:default,org.eclipse.modisco.infra.discovery@default:default,org.eclipse.modisco.xml.discoverer@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.common@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.l2@default:default,org.eclipse.uml2.uml.profile.l3@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.core.resourceloading.tests@default:false,org.eclipse.papyrus.core.tests@default:false,org.eclipse.papyrus.diagram.common.tests@default:false,org.eclipse.papyrus.diagram.tests@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.tests@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview.tests@default:default,org.eclipse.papyrus.uml.diagram.timing.tests@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.views.modelexplorer.newchild@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/Activator.java
index 45af84397ed..bd7eaf0199f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/Activator.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

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.timing.tests";

-

-	// 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(final 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(final BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 * 

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.timing.tests";
+
+	// 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(final 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(final BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 * 
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/AllTests.java
index f99d16f2906..1957e72276e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/AllTests.java
@@ -1,33 +1,33 @@
-/*******************************************************************************

- * 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:

- *   CEA LIST - Initial API and implementation

- *   Christian W. Damus - bug 464647

- *   

- *******************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.timing.tests;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;

-import org.eclipse.papyrus.uml.diagram.timing.tests.canonical.AllCanonicalTests;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-//@formatter:off

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		// canonical

-		AllCanonicalTests.class,

-})

-@DynamicClasses("org.eclipse.papyrus.uml.diagram.timing.test.AllGenTests")

-// @formatter:on

-public class AllTests {

-	// Junit 4 test case

-}

+/*******************************************************************************
+ * 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:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 464647
+ *   
+ *******************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.timing.tests;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;
+import org.eclipse.papyrus.uml.diagram.timing.tests.canonical.AllCanonicalTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+//@formatter:off
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		// canonical
+		AllCanonicalTests.class,
+})
+@DynamicClasses("org.eclipse.papyrus.uml.diagram.timing.test.AllGenTests")
+// @formatter:on
+public class AllTests {
+	// Junit 4 test case
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java
index 5d49c3ba394..9b9932c336e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java
@@ -1,616 +1,616 @@
-/*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import java.util.List;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.timing.custom.CreateTimingDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactStateInvariantEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.DestructionOccurrenceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineStateDefinitionCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineTimelineCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantVerticalLineEditPart;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionCompartmentEditPartTN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionEditPartTN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.MessageOccurrenceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.OccurrenceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.StateDefinitionEditPart;

-import org.eclipse.papyrus.uml.diagram.timing.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.timing.tests.generic.AbstractPapyrusTestCase;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.InteractionFragment;

-import org.eclipse.uml2.uml.MessageOccurrenceSpecification;

-import org.eclipse.uml2.uml.OccurrenceSpecification;

-import org.eclipse.uml2.uml.OpaqueExpression;

-import org.eclipse.uml2.uml.StateInvariant;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase {

-

-	private InteractionEditPartTN interactionEditPart;

-

-	private InteractionCompartmentEditPartTN interactionCompartment;

-

-	private FullLifelineEditPartCN fullLifelineEditPart;

-

-	private CompactLifelineEditPartCN compactLifelineEditPart;

-

-	private FullLifelineStateDefinitionCompartmentEditPartCN stateDefinitionCompartment;

-

-	private FullLifelineTimelineCompartmentEditPartCN fullLifelineTimelineCompartment;

-

-	private CompactLifelineCompartmentEditPartCN compactLifelineTimelineCompartment;

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateTimingDiagramCommand();

-	}

-

-	/** Creates the default Interaction (use this when only one Interaction will be used in a test) */

-	protected void createDefaultInteraction(final Point position, final Dimension size) {

-		this.interactionEditPart = createInteraction(position, size);

-		this.interactionCompartment = (InteractionCompartmentEditPartTN)EditPartUtils.findFirstChildEditPartWithId(this.interactionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);

-		assertNotNull("The interaction compartment was not found", this.interactionCompartment);

-	}

-

-	/** Creates the default Interaction (use this when only one Interaction will be used in a test) */

-	protected void createDefaultInteraction() {

-		createDefaultInteraction(new Point(0, 0), new Dimension(800, 600));

-	}

-

-	/**

-	 * Creates the default full Lifeline in the default Interaction (use this when only one Interaction and one Lifeline

-	 * will be used in a test)

-	 */

-	protected void createDefaultFullLifeline() {

-		this.fullLifelineEditPart = createFullLifeline(getDefaultInteractionEditPart());

-		this.stateDefinitionCompartment = (FullLifelineStateDefinitionCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(this.fullLifelineEditPart, FullLifelineStateDefinitionCompartmentEditPartCN.VISUAL_ID);

-		assertNotNull("The StateDefinition compartment must exist", this.stateDefinitionCompartment);

-		this.fullLifelineTimelineCompartment = (FullLifelineTimelineCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(this.fullLifelineEditPart, FullLifelineTimelineCompartmentEditPartCN.VISUAL_ID);

-		assertNotNull("The timeline compartment must exist", this.fullLifelineTimelineCompartment);

-	}

-

-	/**

-	 * Creates the default compact Lifeline in the default Interaction (use this when only one Interaction and one

-	 * Lifeline will be used in a test)

-	 */

-	protected void createDefaultCompactLifeline() {

-		this.compactLifelineEditPart = createCompactLifeline(getDefaultInteractionEditPart());

-		this.compactLifelineTimelineCompartment = (CompactLifelineCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(this.compactLifelineEditPart, CompactLifelineCompartmentEditPartCN.VISUAL_ID);

-		assertNotNull("The timeline compartment must exist", this.compactLifelineTimelineCompartment);

-	}

-

-	/** Creates 3 state definitions in the default Lifeline */

-	protected void createThreeStateDefinitionsInDefaultFullLifeline() {

-		createView(UMLElementTypes.Node_StateDefinitionShape, this.stateDefinitionCompartment);

-		createView(UMLElementTypes.Node_StateDefinitionShape, this.stateDefinitionCompartment);

-		createView(UMLElementTypes.Node_StateDefinitionShape, this.stateDefinitionCompartment);

-	}

-

-	/**

-	 * Creates a new StateDefinition in the default Lifeline using a Request.

-	 * 

-	 * @return the created StateDefinition's EditPart

-	 */

-	protected StateDefinitionEditPart createStateDefinitionInDefaultFullLifeline() {

-		return createStateDefinition(getDefaultFullLifelineEditPart());

-	}

-

-	/**

-	 * Creates a new StateDefinition in the given Lifeline using a Request.

-	 * 

-	 * @return the created StateDefinition's EditPart

-	 */

-	protected StateDefinitionEditPart createStateDefinition(final FullLifelineEditPartCN parentLifelineEditPart) {

-		final FullLifelineStateDefinitionCompartmentEditPartCN compartment = (FullLifelineStateDefinitionCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(parentLifelineEditPart, FullLifelineStateDefinitionCompartmentEditPartCN.VISUAL_ID);

-		final View stateDefinitionView = createView(UMLElementTypes.Node_StateDefinitionShape, compartment);

-		assertNotNull("The StateDefinition View should be created", stateDefinitionView);

-		return (StateDefinitionEditPart)findChildEditPartAssociatedToView(compartment, stateDefinitionView);

-	}

-

-	/**

-	 * Create a new full Lifeline in the default Interaction using a Request.

-	 * 

-	 * @return the created full Lifeline's EditPart

-	 */

-	protected FullLifelineEditPartCN createFullLifelineInDefaultInteraction() {

-		return createFullLifeline(getDefaultInteractionEditPart());

-	}

-

-	/**

-	 * Create a new full Lifeline in the given Interaction using a Request.

-	 * 

-	 * @return the created full Lifeline's EditPart

-	 */

-	protected FullLifelineEditPartCN createFullLifeline(final InteractionEditPartTN parentInteractionEditPart) {

-		final EditPart compartment = EditPartUtils.findFirstChildEditPartWithId(parentInteractionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);

-		assertNotNull("The compartment must not be null", compartment);

-		final View view = createView(UMLElementTypes.Lifeline_FullShape, compartment);

-		assertNotNull("The FullLifeline View should be created", view);

-		return (FullLifelineEditPartCN)findChildEditPartAssociatedToView(compartment, view);

-	}

-

-	/**

-	 * Create a new compact Lifeline in the default Interaction using a Request.

-	 * 

-	 * @return the created compact Lifeline's EditPart

-	 */

-	protected CompactLifelineEditPartCN createCompactLifelineInDefaultInteraction() {

-		return createCompactLifeline(getDefaultInteractionEditPart());

-	}

-

-	/**

-	 * Create a new compact Lifeline in the given Interaction using a Request.

-	 * 

-	 * @return the created compact Lifeline's EditPart

-	 */

-	protected CompactLifelineEditPartCN createCompactLifeline(final InteractionEditPartTN parentInteractionEditPart) {

-		final EditPart compartment = EditPartUtils.findFirstChildEditPartWithId(parentInteractionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);

-		assertNotNull("The compartment must not be null", compartment);

-		final View view = createView(UMLElementTypes.Lifeline_CompactShape, compartment);

-		assertNotNull("The CompactLifeline View should be created", view);

-		return (CompactLifelineEditPartCN)findChildEditPartAssociatedToView(compartment, view);

-	}

-

-	/**

-	 * Create a new Interaction in the default diagram using a Request.

-	 * 

-	 * @param location

-	 *        the position for the new Interaction

-	 * @param dimension

-	 *        the size of the new Interaction

-	 * @return the created Interaction's EditPart

-	 */

-	protected InteractionEditPartTN createInteraction(final Point location, final Dimension dimension) {

-		createView(UMLElementTypes.Interaction_Shape, location, dimension, getDiagramEditPart());

-		final InteractionEditPartTN interactionEditPart = (InteractionEditPartTN)EditPartUtils.findFirstChildEditPartWithId(getDiagramEditPart(), InteractionEditPartTN.VISUAL_ID);

-		assertNotNull("The interaction EditPart was not found under the diagram EditPart", interactionEditPart);

-		final InteractionCompartmentEditPartTN interactionCompartment = (InteractionCompartmentEditPartTN)EditPartUtils.findFirstChildEditPartWithId(interactionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);

-		assertNotNull("The interaction compartment was not found", interactionCompartment);

-		return interactionEditPart;

-	}

-

-	/**

-	 * Create a new Interaction with a default size in the default diagram using a Request.

-	 * 

-	 * @return the created Interaction's EditPart

-	 */

-	protected InteractionEditPartTN createInteraction() {

-		return createInteraction(new Point(0, 0), new Dimension(800, 400));

-	}

-

-	/**

-	 * Create three occurrence specifications in the default Lifeline:

-	 * <ul>

-	 * <li>click at 1/4 on the single StateInvariant (automatically created at the beginning; takes the whole width)

-	 * <li>click at 1/3 on the just created second StateInvariant (that takes 3/4 of the width)

-	 * <li>click at 1/2 on the just created second StateInvariant (that takes 1/2 of the width)

-	 * <li>this results in three regularly spaced occurrence specifications

-	 * <ul>

-	 * 

-	 */

-	protected void createThreeOccurrenceSpecificationsInDefaultFullLifeline() {

-		createOccurrenceSpecificationInLastFullStateInvariantWithRatio(1, 1.0 / 4.0);

-		createOccurrenceSpecificationInLastFullStateInvariantWithRatio(2, 1.0 / 3.0);

-		createOccurrenceSpecificationInLastFullStateInvariantWithRatio(3, 1.0 / 2.0);

-	}

-

-	/**

-	 * Create three occurrence specifications in the default Lifeline:

-	 * <ul>

-	 * <li>click at 1/4 on the single StateInvariant (automatically created at the beginning; takes the whole width)

-	 * <li>click at 1/3 on the just created second StateInvariant (that takes 3/4 of the width)

-	 * <li>click at 1/2 on the just created second StateInvariant (that takes 1/2 of the width)

-	 * <li>this results in three regularly spaced occurrence specifications

-	 * <ul>

-	 * 

-	 */

-	protected void createThreeOccurrenceSpecificationsInDefaultCompactLifeline() {

-		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(1, 1.0 / 4.0);

-		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(2, 1.0 / 3.0);

-		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(3, 1.0 / 2.0);

-	}

-

-	/**

-	 * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default Lifeline

-	 * 

-	 * @param expectedNumberOfStateInvariants

-	 *        the number of state invariants that is expected (for checking)

-	 * @param xPos

-	 *        the position starting from the left of the StateInvariant

-	 */

-	protected void createOccurrenceSpecificationInLastFullStateInvariantAtAbsolutePos(final int expectedNumberOfStateInvariants, final int xPos) {

-		// we need to wait for GMF to do its layout in order to have correct coordinates

-		flushEventLoop();

-		final FullStateInvariantEditPartCN lastStateInvariant = getAndAssertLastFullStateInvariant(expectedNumberOfStateInvariants);

-		final Rectangle bounds = getAbsoluteBounds(lastStateInvariant);

-		assertTrue("position out of bounds", xPos < bounds.width);

-		flushEventLoop();

-		sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + xPos, bounds.y));

-	}

-

-	/**

-	 * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default Lifeline

-	 * 

-	 * @param expectedNumberOfStateInvariants

-	 *        the number of state invariants that is expected (for checking)

-	 * @param xPos

-	 *        the position starting from the left of the StateInvariant

-	 */

-	protected void createOccurrenceSpecificationInLastCompactStateInvariantAtAbsolutePos(final int expectedNumberOfStateInvariants, final int xPos) {

-		// we need to wait for GMF to do its layout in order to have correct coordinates

-		flushEventLoop();

-		final CompactStateInvariantEditPartCN lastStateInvariant = getAndAssertLastCompactStateInvariant(expectedNumberOfStateInvariants);

-		final Rectangle bounds = getAbsoluteBounds(lastStateInvariant);

-		assertTrue("position out of bounds", xPos < bounds.width);

-		sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + xPos, bounds.y));

-	}

-

-	/**

-	 * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default full Lifeline

-	 * 

-	 * @param expectedNumberOfStateInvariants

-	 *        the number of state invariants that is expected (for checking)

-	 * @param ratio

-	 *        where to click in the StateInvariant (0.0 = beginning; 1.0 = end)

-	 */

-	protected void createOccurrenceSpecificationInLastFullStateInvariantWithRatio(final int expectedNumberOfStateInvariants, final double ratio) {

-		assertTrue("invalid ratio", ratio >= 0.0 && ratio <= 1.0);

-		// we need to wait for GMF to do its layout in order to have correct coordinates

-		flushEventLoop();

-		final FullStateInvariantEditPartCN lastStateInvariant = getAndAssertLastFullStateInvariant(expectedNumberOfStateInvariants);

-		final Rectangle bounds = getAbsoluteBounds(lastStateInvariant);

-		sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + (int)(bounds.width * ratio), bounds.y));

-	}

-

-	/**

-	 * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default compact Lifeline

-	 * 

-	 * @param expectedNumberOfStateInvariants

-	 *        the number of state invariants that is expected (for checking)

-	 * @param ratio

-	 *        where to click in the StateInvariant (0.0 = beginning; 1.0 = end)

-	 */

-	protected void createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(final int expectedNumberOfStateInvariants, final double ratio) {

-		assertTrue("invalid ratio", ratio >= 0.0 && ratio <= 1.0);

-		// we need to wait for GMF to do its layout in order to have correct coordinates

-		flushEventLoop();

-		final CompactStateInvariantEditPartCN lastStateInvariant = getAndAssertLastCompactStateInvariant(expectedNumberOfStateInvariants);

-		final Rectangle bounds = getAbsoluteBounds(lastStateInvariant);

-		sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + (int)(bounds.width * ratio), bounds.y));

-	}

-

-	private FullStateInvariantEditPartCN getAndAssertLastFullStateInvariant(final int expectedNumberOfStateInvariants) {

-		final List<FullStateInvariantEditPartCN> stateInvariants = findStateInvariantsInDefaultFullLifeline();

-		assertEquals("Wrong number of StateInvariants", expectedNumberOfStateInvariants, stateInvariants.size());

-		final FullStateInvariantEditPartCN lastStateInvariant = stateInvariants.get(expectedNumberOfStateInvariants - 1);

-		return lastStateInvariant;

-	}

-

-	private CompactStateInvariantEditPartCN getAndAssertLastCompactStateInvariant(final int expectedNumberOfStateInvariants) {

-		final List<CompactStateInvariantEditPartCN> stateInvariants = findStateInvariantsInDefaultCompactLifeline();

-		assertEquals("Wrong number of StateInvariants", expectedNumberOfStateInvariants, stateInvariants.size());

-		final CompactStateInvariantEditPartCN lastStateInvariant = stateInvariants.get(expectedNumberOfStateInvariants - 1);

-		return lastStateInvariant;

-	}

-

-	/** @return all OccurrenceSpecification EditParts found in the default Lifeline */

-	@SuppressWarnings("unchecked")

-	protected List<OccurrenceSpecificationEditPartCN> findOccurrenceSpecificationsInDefaultFullLifeline() {

-		return (List<OccurrenceSpecificationEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), OccurrenceSpecificationEditPartCN.VISUAL_ID);

-	}

-

-	/** @return all OccurrenceSpecification EditParts found in the default Lifeline */

-	@SuppressWarnings("unchecked")

-	protected List<OccurrenceSpecificationEditPartCN> findOccurrenceSpecificationsInDefaultCompactLifeline() {

-		return (List<OccurrenceSpecificationEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultCompactLifelineEditPart(), OccurrenceSpecificationEditPartCN.VISUAL_ID);

-	}

-

-	/** @return all StateInvariant EditParts found in the default Lifeline */

-	@SuppressWarnings("unchecked")

-	protected List<FullStateInvariantEditPartCN> findStateInvariantsInDefaultFullLifeline() {

-		return (List<FullStateInvariantEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);

-	}

-

-	/** @return all StateInvariant EditParts found in the default Lifeline */

-	@SuppressWarnings("unchecked")

-	protected List<CompactStateInvariantEditPartCN> findStateInvariantsInDefaultCompactLifeline() {

-		return (List<CompactStateInvariantEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultCompactLifelineEditPart(), CompactStateInvariantEditPartCN.VISUAL_ID);

-	}

-

-	/** @return all StateDefinition EditParts found in the default Lifeline */

-	@SuppressWarnings("unchecked")

-	protected List<StateDefinitionEditPart> findStateDefinitions() {

-		return (List<StateDefinitionEditPart>)EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), StateDefinitionEditPart.VISUAL_ID);

-	}

-

-	/**

-	 * Check that the fragments in the default interaction are ordered following the given pattern.

-	 * 

-	 * @param pattern

-	 *        the pattern, where "o" means OccurrenceSpecification, and "-" means StateInvariant

-	 */

-	protected void checkInteractionFragmentsWithPattern(final String expectedPattern) {

-		final String fragmentsStringPattern = computeInteractionFragmentsStringPattern();

-		assertEquals("The timeline does not follow the expected pattern", expectedPattern, fragmentsStringPattern);

-	}

-

-	protected String computeInteractionFragmentsStringPattern() {

-		final StringBuilder pattern = new StringBuilder();

-		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();

-		final EList<InteractionFragment> fragments = interaction.getFragments();

-		for(final InteractionFragment fragment : fragments) {

-			if(fragment instanceof StateInvariant) {

-				pattern.append("-");

-			} else if(fragment instanceof DestructionOccurrenceSpecification) {

-				pattern.append("x");

-			} else if(fragment instanceof MessageOccurrenceSpecification) {

-				pattern.append("m");

-			} else if(fragment instanceof OccurrenceSpecification) {

-				pattern.append("o");

-			}

-		}

-		return pattern.toString();

-	}

-

-	protected InteractionCompartmentEditPartTN getDefaultInteractionCompartment() {

-		return this.interactionCompartment;

-	}

-

-	protected InteractionEditPartTN getDefaultInteractionEditPart() {

-		return this.interactionEditPart;

-	}

-

-	protected FullLifelineEditPartCN getDefaultFullLifelineEditPart() {

-		return this.fullLifelineEditPart;

-	}

-

-	protected FullLifelineStateDefinitionCompartmentEditPartCN getDefaultStateDefinitionCompartment() {

-		return this.stateDefinitionCompartment;

-	}

-

-	protected FullLifelineTimelineCompartmentEditPartCN getDefaultFullLifelineTimelineCompartment() {

-		return this.fullLifelineTimelineCompartment;

-	}

-

-	protected CompactLifelineEditPartCN getDefaultCompactLifelineEditPart() {

-		return this.compactLifelineEditPart;

-	}

-

-	protected CompactLifelineCompartmentEditPartCN getDefaultCompactLifelineTimelineCompartment() {

-		return this.compactLifelineTimelineCompartment;

-	}

-

-	/**

-	 * Click in the middle of the given compact StateInvariant with the OccurrenceSpecification tool in order to create

-	 * an OccurrenceSpecification over it.

-	 * 

-	 * @param compactStateInvariant

-	 *        the StateInvariant on which to create an OccurrenceSpecification

-	 * @param bottom

-	 *        whether to click at the bottom of the StateInvariant, instead of at the top

-	 */

-	protected void createOccurrenceSpecificationOverCompactStateInvariant(final CompactStateInvariantEditPartCN compactStateInvariant, final boolean bottom) {

-		final Rectangle bounds = getBounds(compactStateInvariant);

-		final Point point = new Point(bounds.x + bounds.width / 2, bounds.y + (bottom ? bounds.height - 2 : 2));

-		compactStateInvariant.getFigure().getParent().translateToAbsolute(point);

-		clickTool("createOccurrenceSpecificationCreationTool", point);

-	}

-

-	protected void checkFullTimelinePattern(final String expectedPattern) {

-		final String timelineStringPattern = computeFullTimelineStringPattern();

-		assertEquals("The timeline does not follow the expected pattern", expectedPattern, timelineStringPattern);

-	}

-

-	protected String computeFullTimelineStringPattern() {

-		flushEventLoop();

-		final StringBuilder pattern = new StringBuilder();

-		final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment();

-		@SuppressWarnings("unchecked")

-		final List<EditPart> children = timelineCompartment.getChildren();

-		for(final EditPart editPart : children) {

-			if(editPart instanceof FullStateInvariantEditPartCN) {

-				outputFullStateInvariantPattern((FullStateInvariantEditPartCN)editPart, pattern);

-			} else if(editPart instanceof OccurrenceSpecificationEditPartCN) {

-				outputFullOccurrenceSpecificationPattern((OccurrenceSpecificationEditPartCN)editPart, pattern);

-			} else if(editPart instanceof FullStateInvariantVerticalLineEditPart) {

-				pattern.append("VerticalLine;");

-			} else {

-				fail("unexpected element");

-			}

-		}

-		return pattern.toString();

-	}

-

-	private static void outputFullStateInvariantPattern(final FullStateInvariantEditPartCN editPart, final StringBuilder pattern) {

-		final View view = (View)editPart.getModel();

-		assertNotNull("The EditPart must have a View", view);

-		final StateInvariant stateInvariant = (StateInvariant)view.getElement();

-		assertNotNull("The View must have a semantic element", view);

-		final Constraint constraint = stateInvariant.getInvariant();

-		assertNotNull("The StateInvariant must have a Constraint", constraint);

-		final ValueSpecification specification = constraint.getSpecification();

-		assertNotNull("The Constraint must have a ValueSpecification", specification);

-		assertTrue("The ValueSpecification must be an OpaqueExpression", specification instanceof OpaqueExpression);

-		final OpaqueExpression opaqueExpression = (OpaqueExpression)specification;

-		assertNotNull("The OpaqueExpression must not have a null list of bodies", opaqueExpression.getBodies());

-		assertEquals("The OpaqueExpression must have one Body", 1, opaqueExpression.getBodies().size());

-		pattern.append("StateInvariant(").append(opaqueExpression.getBodies().get(0)).append(");");

-	}

-

-	private static void outputFullOccurrenceSpecificationPattern(final OccurrenceSpecificationEditPartCN editPart, final StringBuilder pattern) {

-		final View view = (View)editPart.getModel();

-		assertNotNull("The EditPart must have a View", view);

-		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)view.getElement();

-		assertNotNull("The View must have a semantic element", occurrenceSpecification);

-		final String name = occurrenceSpecification.getName();

-		pattern.append("OccurrenceSpecification(").append(name).append(");");

-	}

-

-	protected void checkCompactTimelinePattern(final String expectedPattern) {

-		final String timelineStringPattern = computeCompactTimelineStringPattern();

-		assertEquals("The timeline does not follow the expected pattern", expectedPattern, timelineStringPattern);

-	}

-

-	protected String computeCompactTimelineStringPattern() {

-		flushEventLoop();

-		final StringBuilder pattern = new StringBuilder();

-		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();

-		@SuppressWarnings("unchecked")

-		final List<EditPart> children = timelineCompartment.getChildren();

-		for(final EditPart editPart : children) {

-			if(editPart instanceof CompactStateInvariantEditPartCN) {

-				outputCompactStateInvariantPattern((CompactStateInvariantEditPartCN)editPart, pattern);

-			} else if(editPart instanceof OccurrenceSpecificationEditPartCN) {

-				outputCompactOccurrenceSpecificationPattern((OccurrenceSpecificationEditPartCN)editPart, pattern);

-			} else {

-				fail("unexpected element");

-			}

-		}

-		return pattern.toString();

-	}

-

-	private static void outputCompactStateInvariantPattern(final CompactStateInvariantEditPartCN editPart, final StringBuilder pattern) {

-		final View view = (View)editPart.getModel();

-		assertNotNull("The EditPart must have a View", view);

-		final StateInvariant stateInvariant = (StateInvariant)view.getElement();

-		assertNotNull("The View must have a semantic element", view);

-		final Constraint constraint = stateInvariant.getInvariant();

-		assertNotNull("The StateInvariant must have a Constraint", constraint);

-		final ValueSpecification specification = constraint.getSpecification();

-		assertNotNull("The Constraint must have a ValueSpecification", specification);

-		assertTrue("The ValueSpecification must be an OpaqueExpression", specification instanceof OpaqueExpression);

-		final OpaqueExpression opaqueExpression = (OpaqueExpression)specification;

-		assertNotNull("The OpaqueExpression must not have a null list of bodies", opaqueExpression.getBodies());

-		if(opaqueExpression.getBodies().isEmpty()) {

-			pattern.append("StateInvariant(unnamed);");

-		} else {

-			pattern.append("StateInvariant(").append(opaqueExpression.getBodies().get(0)).append(");");

-		}

-	}

-

-	private static void outputCompactOccurrenceSpecificationPattern(final OccurrenceSpecificationEditPartCN editPart, final StringBuilder pattern) {

-		final View view = (View)editPart.getModel();

-		assertNotNull("The EditPart must have a View", view);

-		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)view.getElement();

-		assertNotNull("The View must have a semantic element", occurrenceSpecification);

-		final String name = occurrenceSpecification.getName();

-		pattern.append("OccurrenceSpecification(").append(name).append(");");

-	}

-

-	protected void checkSimpleFullTimelinePattern(final String expectedPattern) {

-		final String timelineStringPattern = computeSimpleFullTimelineStringPattern();

-		assertEquals("The timeline does not follow the expected pattern", expectedPattern, timelineStringPattern);

-	}

-

-	protected String computeSimpleFullTimelineStringPattern() {

-		flushEventLoop();

-		final StringBuilder pattern = new StringBuilder();

-		final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment();

-		@SuppressWarnings("unchecked")

-		final List<EditPart> children = timelineCompartment.getChildren();

-		for(final EditPart editPart : children) {

-			if(editPart instanceof FullStateInvariantEditPartCN) {

-				pattern.append("-");

-			} else if(editPart instanceof OccurrenceSpecificationEditPartCN) {

-				pattern.append("o");

-			} else if(editPart instanceof MessageOccurrenceSpecificationEditPartCN) {

-				pattern.append("m");

-			} else if(editPart instanceof DestructionOccurrenceSpecificationEditPartCN) {

-				pattern.append("x");

-			} else if(editPart instanceof FullStateInvariantVerticalLineEditPart) {

-				pattern.append("|");

-			} else {

-				fail("unexpected element");

-			}

-		}

-		return pattern.toString();

-	}

-

-	/**

-	 * Check that the timeline contains the expected elements in the expected order.

-	 * 

-	 * @param expectedPattern

-	 *        a pattern where

-	 *        <ul>

-	 *        <li>"o" represents an OccurrenceSpecification

-	 *        <li>"-" represents a StateInvariant

-	 *        </ul>

-	 */

-	protected void checkSimpleCompactTimelinePattern(final String expectedPattern) {

-		final String timelineStringPattern = computeSimpleCompactTimelineStringPattern();

-		assertEquals("The timeline does not follow the expected pattern", expectedPattern, timelineStringPattern);

-	}

-

-	protected String computeSimpleCompactTimelineStringPattern() {

-		flushEventLoop();

-		final StringBuilder pattern = new StringBuilder();

-		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();

-		@SuppressWarnings("unchecked")

-		final List<EditPart> children = timelineCompartment.getChildren();

-		for(final EditPart editPart : children) {

-			if(editPart instanceof CompactStateInvariantEditPartCN) {

-				pattern.append("-");

-			} else if(editPart instanceof OccurrenceSpecificationEditPartCN) {

-				pattern.append("o");

-			} else if(editPart instanceof MessageOccurrenceSpecificationEditPartCN) {

-				pattern.append("m");

-			} else if(editPart instanceof DestructionOccurrenceSpecificationEditPartCN) {

-				pattern.append("x");

-			} else {

-				fail("unexpected element");

-			}

-		}

-		return pattern.toString();

-	}

-

-	/**

-	 * Test that the modifications can all be undone and redone, and that the dirty state is consistent throughout the

-	 * undo/redo operations.

-	 * 

-	 * @param nElementsToUndo

-	 *        the number of elements that should be undoable before reaching the non-dirty state

-	 */

-	protected void testDirtyStateForFullUndoRedo(final int nElementsToUndo) {

-		assertTrue("The editor should be dirty after all the modifications", this.diagramEditor.isDirty());

-		for(int i = 0; i < nElementsToUndo; i++) {

-			undoOnUIThread();

-			// editor should be dirty for all states except the initial state

-			if(i == nElementsToUndo - 1) {

-				assertFalse("The editor should not be dirty after we undid all previous modifications", this.diagramEditor.isDirty());

-			} else {

-				assertTrue("The editor should be dirty until we undo all previous modifications", this.diagramEditor.isDirty());

-			}

-		}

-		for(int i = 0; i < nElementsToUndo; i++) {

-			redoOnUIThread();

-			assertTrue("The editor should be dirty after we redo", this.diagramEditor.isDirty());

-		}

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.timing.custom.CreateTimingDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactStateInvariantEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.DestructionOccurrenceSpecificationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineStateDefinitionCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineTimelineCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantVerticalLineEditPart;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionCompartmentEditPartTN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionEditPartTN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.MessageOccurrenceSpecificationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.OccurrenceSpecificationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.StateDefinitionEditPart;
+import org.eclipse.papyrus.uml.diagram.timing.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.timing.tests.generic.AbstractPapyrusTestCase;
+import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.InteractionFragment;
+import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
+import org.eclipse.uml2.uml.OccurrenceSpecification;
+import org.eclipse.uml2.uml.OpaqueExpression;
+import org.eclipse.uml2.uml.StateInvariant;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase {
+
+	private InteractionEditPartTN interactionEditPart;
+
+	private InteractionCompartmentEditPartTN interactionCompartment;
+
+	private FullLifelineEditPartCN fullLifelineEditPart;
+
+	private CompactLifelineEditPartCN compactLifelineEditPart;
+
+	private FullLifelineStateDefinitionCompartmentEditPartCN stateDefinitionCompartment;
+
+	private FullLifelineTimelineCompartmentEditPartCN fullLifelineTimelineCompartment;
+
+	private CompactLifelineCompartmentEditPartCN compactLifelineTimelineCompartment;
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateTimingDiagramCommand();
+	}
+
+	/** Creates the default Interaction (use this when only one Interaction will be used in a test) */
+	protected void createDefaultInteraction(final Point position, final Dimension size) {
+		this.interactionEditPart = createInteraction(position, size);
+		this.interactionCompartment = (InteractionCompartmentEditPartTN)EditPartUtils.findFirstChildEditPartWithId(this.interactionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);
+		assertNotNull("The interaction compartment was not found", this.interactionCompartment);
+	}
+
+	/** Creates the default Interaction (use this when only one Interaction will be used in a test) */
+	protected void createDefaultInteraction() {
+		createDefaultInteraction(new Point(0, 0), new Dimension(800, 600));
+	}
+
+	/**
+	 * Creates the default full Lifeline in the default Interaction (use this when only one Interaction and one Lifeline
+	 * will be used in a test)
+	 */
+	protected void createDefaultFullLifeline() {
+		this.fullLifelineEditPart = createFullLifeline(getDefaultInteractionEditPart());
+		this.stateDefinitionCompartment = (FullLifelineStateDefinitionCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(this.fullLifelineEditPart, FullLifelineStateDefinitionCompartmentEditPartCN.VISUAL_ID);
+		assertNotNull("The StateDefinition compartment must exist", this.stateDefinitionCompartment);
+		this.fullLifelineTimelineCompartment = (FullLifelineTimelineCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(this.fullLifelineEditPart, FullLifelineTimelineCompartmentEditPartCN.VISUAL_ID);
+		assertNotNull("The timeline compartment must exist", this.fullLifelineTimelineCompartment);
+	}
+
+	/**
+	 * Creates the default compact Lifeline in the default Interaction (use this when only one Interaction and one
+	 * Lifeline will be used in a test)
+	 */
+	protected void createDefaultCompactLifeline() {
+		this.compactLifelineEditPart = createCompactLifeline(getDefaultInteractionEditPart());
+		this.compactLifelineTimelineCompartment = (CompactLifelineCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(this.compactLifelineEditPart, CompactLifelineCompartmentEditPartCN.VISUAL_ID);
+		assertNotNull("The timeline compartment must exist", this.compactLifelineTimelineCompartment);
+	}
+
+	/** Creates 3 state definitions in the default Lifeline */
+	protected void createThreeStateDefinitionsInDefaultFullLifeline() {
+		createView(UMLElementTypes.Node_StateDefinitionShape, this.stateDefinitionCompartment);
+		createView(UMLElementTypes.Node_StateDefinitionShape, this.stateDefinitionCompartment);
+		createView(UMLElementTypes.Node_StateDefinitionShape, this.stateDefinitionCompartment);
+	}
+
+	/**
+	 * Creates a new StateDefinition in the default Lifeline using a Request.
+	 * 
+	 * @return the created StateDefinition's EditPart
+	 */
+	protected StateDefinitionEditPart createStateDefinitionInDefaultFullLifeline() {
+		return createStateDefinition(getDefaultFullLifelineEditPart());
+	}
+
+	/**
+	 * Creates a new StateDefinition in the given Lifeline using a Request.
+	 * 
+	 * @return the created StateDefinition's EditPart
+	 */
+	protected StateDefinitionEditPart createStateDefinition(final FullLifelineEditPartCN parentLifelineEditPart) {
+		final FullLifelineStateDefinitionCompartmentEditPartCN compartment = (FullLifelineStateDefinitionCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(parentLifelineEditPart, FullLifelineStateDefinitionCompartmentEditPartCN.VISUAL_ID);
+		final View stateDefinitionView = createView(UMLElementTypes.Node_StateDefinitionShape, compartment);
+		assertNotNull("The StateDefinition View should be created", stateDefinitionView);
+		return (StateDefinitionEditPart)findChildEditPartAssociatedToView(compartment, stateDefinitionView);
+	}
+
+	/**
+	 * Create a new full Lifeline in the default Interaction using a Request.
+	 * 
+	 * @return the created full Lifeline's EditPart
+	 */
+	protected FullLifelineEditPartCN createFullLifelineInDefaultInteraction() {
+		return createFullLifeline(getDefaultInteractionEditPart());
+	}
+
+	/**
+	 * Create a new full Lifeline in the given Interaction using a Request.
+	 * 
+	 * @return the created full Lifeline's EditPart
+	 */
+	protected FullLifelineEditPartCN createFullLifeline(final InteractionEditPartTN parentInteractionEditPart) {
+		final EditPart compartment = EditPartUtils.findFirstChildEditPartWithId(parentInteractionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);
+		assertNotNull("The compartment must not be null", compartment);
+		final View view = createView(UMLElementTypes.Lifeline_FullShape, compartment);
+		assertNotNull("The FullLifeline View should be created", view);
+		return (FullLifelineEditPartCN)findChildEditPartAssociatedToView(compartment, view);
+	}
+
+	/**
+	 * Create a new compact Lifeline in the default Interaction using a Request.
+	 * 
+	 * @return the created compact Lifeline's EditPart
+	 */
+	protected CompactLifelineEditPartCN createCompactLifelineInDefaultInteraction() {
+		return createCompactLifeline(getDefaultInteractionEditPart());
+	}
+
+	/**
+	 * Create a new compact Lifeline in the given Interaction using a Request.
+	 * 
+	 * @return the created compact Lifeline's EditPart
+	 */
+	protected CompactLifelineEditPartCN createCompactLifeline(final InteractionEditPartTN parentInteractionEditPart) {
+		final EditPart compartment = EditPartUtils.findFirstChildEditPartWithId(parentInteractionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);
+		assertNotNull("The compartment must not be null", compartment);
+		final View view = createView(UMLElementTypes.Lifeline_CompactShape, compartment);
+		assertNotNull("The CompactLifeline View should be created", view);
+		return (CompactLifelineEditPartCN)findChildEditPartAssociatedToView(compartment, view);
+	}
+
+	/**
+	 * Create a new Interaction in the default diagram using a Request.
+	 * 
+	 * @param location
+	 *        the position for the new Interaction
+	 * @param dimension
+	 *        the size of the new Interaction
+	 * @return the created Interaction's EditPart
+	 */
+	protected InteractionEditPartTN createInteraction(final Point location, final Dimension dimension) {
+		createView(UMLElementTypes.Interaction_Shape, location, dimension, getDiagramEditPart());
+		final InteractionEditPartTN interactionEditPart = (InteractionEditPartTN)EditPartUtils.findFirstChildEditPartWithId(getDiagramEditPart(), InteractionEditPartTN.VISUAL_ID);
+		assertNotNull("The interaction EditPart was not found under the diagram EditPart", interactionEditPart);
+		final InteractionCompartmentEditPartTN interactionCompartment = (InteractionCompartmentEditPartTN)EditPartUtils.findFirstChildEditPartWithId(interactionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);
+		assertNotNull("The interaction compartment was not found", interactionCompartment);
+		return interactionEditPart;
+	}
+
+	/**
+	 * Create a new Interaction with a default size in the default diagram using a Request.
+	 * 
+	 * @return the created Interaction's EditPart
+	 */
+	protected InteractionEditPartTN createInteraction() {
+		return createInteraction(new Point(0, 0), new Dimension(800, 400));
+	}
+
+	/**
+	 * Create three occurrence specifications in the default Lifeline:
+	 * <ul>
+	 * <li>click at 1/4 on the single StateInvariant (automatically created at the beginning; takes the whole width)
+	 * <li>click at 1/3 on the just created second StateInvariant (that takes 3/4 of the width)
+	 * <li>click at 1/2 on the just created second StateInvariant (that takes 1/2 of the width)
+	 * <li>this results in three regularly spaced occurrence specifications
+	 * <ul>
+	 * 
+	 */
+	protected void createThreeOccurrenceSpecificationsInDefaultFullLifeline() {
+		createOccurrenceSpecificationInLastFullStateInvariantWithRatio(1, 1.0 / 4.0);
+		createOccurrenceSpecificationInLastFullStateInvariantWithRatio(2, 1.0 / 3.0);
+		createOccurrenceSpecificationInLastFullStateInvariantWithRatio(3, 1.0 / 2.0);
+	}
+
+	/**
+	 * Create three occurrence specifications in the default Lifeline:
+	 * <ul>
+	 * <li>click at 1/4 on the single StateInvariant (automatically created at the beginning; takes the whole width)
+	 * <li>click at 1/3 on the just created second StateInvariant (that takes 3/4 of the width)
+	 * <li>click at 1/2 on the just created second StateInvariant (that takes 1/2 of the width)
+	 * <li>this results in three regularly spaced occurrence specifications
+	 * <ul>
+	 * 
+	 */
+	protected void createThreeOccurrenceSpecificationsInDefaultCompactLifeline() {
+		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(1, 1.0 / 4.0);
+		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(2, 1.0 / 3.0);
+		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(3, 1.0 / 2.0);
+	}
+
+	/**
+	 * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default Lifeline
+	 * 
+	 * @param expectedNumberOfStateInvariants
+	 *        the number of state invariants that is expected (for checking)
+	 * @param xPos
+	 *        the position starting from the left of the StateInvariant
+	 */
+	protected void createOccurrenceSpecificationInLastFullStateInvariantAtAbsolutePos(final int expectedNumberOfStateInvariants, final int xPos) {
+		// we need to wait for GMF to do its layout in order to have correct coordinates
+		flushEventLoop();
+		final FullStateInvariantEditPartCN lastStateInvariant = getAndAssertLastFullStateInvariant(expectedNumberOfStateInvariants);
+		final Rectangle bounds = getAbsoluteBounds(lastStateInvariant);
+		assertTrue("position out of bounds", xPos < bounds.width);
+		flushEventLoop();
+		sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + xPos, bounds.y));
+	}
+
+	/**
+	 * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default Lifeline
+	 * 
+	 * @param expectedNumberOfStateInvariants
+	 *        the number of state invariants that is expected (for checking)
+	 * @param xPos
+	 *        the position starting from the left of the StateInvariant
+	 */
+	protected void createOccurrenceSpecificationInLastCompactStateInvariantAtAbsolutePos(final int expectedNumberOfStateInvariants, final int xPos) {
+		// we need to wait for GMF to do its layout in order to have correct coordinates
+		flushEventLoop();
+		final CompactStateInvariantEditPartCN lastStateInvariant = getAndAssertLastCompactStateInvariant(expectedNumberOfStateInvariants);
+		final Rectangle bounds = getAbsoluteBounds(lastStateInvariant);
+		assertTrue("position out of bounds", xPos < bounds.width);
+		sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + xPos, bounds.y));
+	}
+
+	/**
+	 * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default full Lifeline
+	 * 
+	 * @param expectedNumberOfStateInvariants
+	 *        the number of state invariants that is expected (for checking)
+	 * @param ratio
+	 *        where to click in the StateInvariant (0.0 = beginning; 1.0 = end)
+	 */
+	protected void createOccurrenceSpecificationInLastFullStateInvariantWithRatio(final int expectedNumberOfStateInvariants, final double ratio) {
+		assertTrue("invalid ratio", ratio >= 0.0 && ratio <= 1.0);
+		// we need to wait for GMF to do its layout in order to have correct coordinates
+		flushEventLoop();
+		final FullStateInvariantEditPartCN lastStateInvariant = getAndAssertLastFullStateInvariant(expectedNumberOfStateInvariants);
+		final Rectangle bounds = getAbsoluteBounds(lastStateInvariant);
+		sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + (int)(bounds.width * ratio), bounds.y));
+	}
+
+	/**
+	 * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default compact Lifeline
+	 * 
+	 * @param expectedNumberOfStateInvariants
+	 *        the number of state invariants that is expected (for checking)
+	 * @param ratio
+	 *        where to click in the StateInvariant (0.0 = beginning; 1.0 = end)
+	 */
+	protected void createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(final int expectedNumberOfStateInvariants, final double ratio) {
+		assertTrue("invalid ratio", ratio >= 0.0 && ratio <= 1.0);
+		// we need to wait for GMF to do its layout in order to have correct coordinates
+		flushEventLoop();
+		final CompactStateInvariantEditPartCN lastStateInvariant = getAndAssertLastCompactStateInvariant(expectedNumberOfStateInvariants);
+		final Rectangle bounds = getAbsoluteBounds(lastStateInvariant);
+		sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + (int)(bounds.width * ratio), bounds.y));
+	}
+
+	private FullStateInvariantEditPartCN getAndAssertLastFullStateInvariant(final int expectedNumberOfStateInvariants) {
+		final List<FullStateInvariantEditPartCN> stateInvariants = findStateInvariantsInDefaultFullLifeline();
+		assertEquals("Wrong number of StateInvariants", expectedNumberOfStateInvariants, stateInvariants.size());
+		final FullStateInvariantEditPartCN lastStateInvariant = stateInvariants.get(expectedNumberOfStateInvariants - 1);
+		return lastStateInvariant;
+	}
+
+	private CompactStateInvariantEditPartCN getAndAssertLastCompactStateInvariant(final int expectedNumberOfStateInvariants) {
+		final List<CompactStateInvariantEditPartCN> stateInvariants = findStateInvariantsInDefaultCompactLifeline();
+		assertEquals("Wrong number of StateInvariants", expectedNumberOfStateInvariants, stateInvariants.size());
+		final CompactStateInvariantEditPartCN lastStateInvariant = stateInvariants.get(expectedNumberOfStateInvariants - 1);
+		return lastStateInvariant;
+	}
+
+	/** @return all OccurrenceSpecification EditParts found in the default Lifeline */
+	@SuppressWarnings("unchecked")
+	protected List<OccurrenceSpecificationEditPartCN> findOccurrenceSpecificationsInDefaultFullLifeline() {
+		return (List<OccurrenceSpecificationEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), OccurrenceSpecificationEditPartCN.VISUAL_ID);
+	}
+
+	/** @return all OccurrenceSpecification EditParts found in the default Lifeline */
+	@SuppressWarnings("unchecked")
+	protected List<OccurrenceSpecificationEditPartCN> findOccurrenceSpecificationsInDefaultCompactLifeline() {
+		return (List<OccurrenceSpecificationEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultCompactLifelineEditPart(), OccurrenceSpecificationEditPartCN.VISUAL_ID);
+	}
+
+	/** @return all StateInvariant EditParts found in the default Lifeline */
+	@SuppressWarnings("unchecked")
+	protected List<FullStateInvariantEditPartCN> findStateInvariantsInDefaultFullLifeline() {
+		return (List<FullStateInvariantEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);
+	}
+
+	/** @return all StateInvariant EditParts found in the default Lifeline */
+	@SuppressWarnings("unchecked")
+	protected List<CompactStateInvariantEditPartCN> findStateInvariantsInDefaultCompactLifeline() {
+		return (List<CompactStateInvariantEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultCompactLifelineEditPart(), CompactStateInvariantEditPartCN.VISUAL_ID);
+	}
+
+	/** @return all StateDefinition EditParts found in the default Lifeline */
+	@SuppressWarnings("unchecked")
+	protected List<StateDefinitionEditPart> findStateDefinitions() {
+		return (List<StateDefinitionEditPart>)EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), StateDefinitionEditPart.VISUAL_ID);
+	}
+
+	/**
+	 * Check that the fragments in the default interaction are ordered following the given pattern.
+	 * 
+	 * @param pattern
+	 *        the pattern, where "o" means OccurrenceSpecification, and "-" means StateInvariant
+	 */
+	protected void checkInteractionFragmentsWithPattern(final String expectedPattern) {
+		final String fragmentsStringPattern = computeInteractionFragmentsStringPattern();
+		assertEquals("The timeline does not follow the expected pattern", expectedPattern, fragmentsStringPattern);
+	}
+
+	protected String computeInteractionFragmentsStringPattern() {
+		final StringBuilder pattern = new StringBuilder();
+		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();
+		final EList<InteractionFragment> fragments = interaction.getFragments();
+		for(final InteractionFragment fragment : fragments) {
+			if(fragment instanceof StateInvariant) {
+				pattern.append("-");
+			} else if(fragment instanceof DestructionOccurrenceSpecification) {
+				pattern.append("x");
+			} else if(fragment instanceof MessageOccurrenceSpecification) {
+				pattern.append("m");
+			} else if(fragment instanceof OccurrenceSpecification) {
+				pattern.append("o");
+			}
+		}
+		return pattern.toString();
+	}
+
+	protected InteractionCompartmentEditPartTN getDefaultInteractionCompartment() {
+		return this.interactionCompartment;
+	}
+
+	protected InteractionEditPartTN getDefaultInteractionEditPart() {
+		return this.interactionEditPart;
+	}
+
+	protected FullLifelineEditPartCN getDefaultFullLifelineEditPart() {
+		return this.fullLifelineEditPart;
+	}
+
+	protected FullLifelineStateDefinitionCompartmentEditPartCN getDefaultStateDefinitionCompartment() {
+		return this.stateDefinitionCompartment;
+	}
+
+	protected FullLifelineTimelineCompartmentEditPartCN getDefaultFullLifelineTimelineCompartment() {
+		return this.fullLifelineTimelineCompartment;
+	}
+
+	protected CompactLifelineEditPartCN getDefaultCompactLifelineEditPart() {
+		return this.compactLifelineEditPart;
+	}
+
+	protected CompactLifelineCompartmentEditPartCN getDefaultCompactLifelineTimelineCompartment() {
+		return this.compactLifelineTimelineCompartment;
+	}
+
+	/**
+	 * Click in the middle of the given compact StateInvariant with the OccurrenceSpecification tool in order to create
+	 * an OccurrenceSpecification over it.
+	 * 
+	 * @param compactStateInvariant
+	 *        the StateInvariant on which to create an OccurrenceSpecification
+	 * @param bottom
+	 *        whether to click at the bottom of the StateInvariant, instead of at the top
+	 */
+	protected void createOccurrenceSpecificationOverCompactStateInvariant(final CompactStateInvariantEditPartCN compactStateInvariant, final boolean bottom) {
+		final Rectangle bounds = getBounds(compactStateInvariant);
+		final Point point = new Point(bounds.x + bounds.width / 2, bounds.y + (bottom ? bounds.height - 2 : 2));
+		compactStateInvariant.getFigure().getParent().translateToAbsolute(point);
+		clickTool("createOccurrenceSpecificationCreationTool", point);
+	}
+
+	protected void checkFullTimelinePattern(final String expectedPattern) {
+		final String timelineStringPattern = computeFullTimelineStringPattern();
+		assertEquals("The timeline does not follow the expected pattern", expectedPattern, timelineStringPattern);
+	}
+
+	protected String computeFullTimelineStringPattern() {
+		flushEventLoop();
+		final StringBuilder pattern = new StringBuilder();
+		final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment();
+		@SuppressWarnings("unchecked")
+		final List<EditPart> children = timelineCompartment.getChildren();
+		for(final EditPart editPart : children) {
+			if(editPart instanceof FullStateInvariantEditPartCN) {
+				outputFullStateInvariantPattern((FullStateInvariantEditPartCN)editPart, pattern);
+			} else if(editPart instanceof OccurrenceSpecificationEditPartCN) {
+				outputFullOccurrenceSpecificationPattern((OccurrenceSpecificationEditPartCN)editPart, pattern);
+			} else if(editPart instanceof FullStateInvariantVerticalLineEditPart) {
+				pattern.append("VerticalLine;");
+			} else {
+				fail("unexpected element");
+			}
+		}
+		return pattern.toString();
+	}
+
+	private static void outputFullStateInvariantPattern(final FullStateInvariantEditPartCN editPart, final StringBuilder pattern) {
+		final View view = (View)editPart.getModel();
+		assertNotNull("The EditPart must have a View", view);
+		final StateInvariant stateInvariant = (StateInvariant)view.getElement();
+		assertNotNull("The View must have a semantic element", view);
+		final Constraint constraint = stateInvariant.getInvariant();
+		assertNotNull("The StateInvariant must have a Constraint", constraint);
+		final ValueSpecification specification = constraint.getSpecification();
+		assertNotNull("The Constraint must have a ValueSpecification", specification);
+		assertTrue("The ValueSpecification must be an OpaqueExpression", specification instanceof OpaqueExpression);
+		final OpaqueExpression opaqueExpression = (OpaqueExpression)specification;
+		assertNotNull("The OpaqueExpression must not have a null list of bodies", opaqueExpression.getBodies());
+		assertEquals("The OpaqueExpression must have one Body", 1, opaqueExpression.getBodies().size());
+		pattern.append("StateInvariant(").append(opaqueExpression.getBodies().get(0)).append(");");
+	}
+
+	private static void outputFullOccurrenceSpecificationPattern(final OccurrenceSpecificationEditPartCN editPart, final StringBuilder pattern) {
+		final View view = (View)editPart.getModel();
+		assertNotNull("The EditPart must have a View", view);
+		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)view.getElement();
+		assertNotNull("The View must have a semantic element", occurrenceSpecification);
+		final String name = occurrenceSpecification.getName();
+		pattern.append("OccurrenceSpecification(").append(name).append(");");
+	}
+
+	protected void checkCompactTimelinePattern(final String expectedPattern) {
+		final String timelineStringPattern = computeCompactTimelineStringPattern();
+		assertEquals("The timeline does not follow the expected pattern", expectedPattern, timelineStringPattern);
+	}
+
+	protected String computeCompactTimelineStringPattern() {
+		flushEventLoop();
+		final StringBuilder pattern = new StringBuilder();
+		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();
+		@SuppressWarnings("unchecked")
+		final List<EditPart> children = timelineCompartment.getChildren();
+		for(final EditPart editPart : children) {
+			if(editPart instanceof CompactStateInvariantEditPartCN) {
+				outputCompactStateInvariantPattern((CompactStateInvariantEditPartCN)editPart, pattern);
+			} else if(editPart instanceof OccurrenceSpecificationEditPartCN) {
+				outputCompactOccurrenceSpecificationPattern((OccurrenceSpecificationEditPartCN)editPart, pattern);
+			} else {
+				fail("unexpected element");
+			}
+		}
+		return pattern.toString();
+	}
+
+	private static void outputCompactStateInvariantPattern(final CompactStateInvariantEditPartCN editPart, final StringBuilder pattern) {
+		final View view = (View)editPart.getModel();
+		assertNotNull("The EditPart must have a View", view);
+		final StateInvariant stateInvariant = (StateInvariant)view.getElement();
+		assertNotNull("The View must have a semantic element", view);
+		final Constraint constraint = stateInvariant.getInvariant();
+		assertNotNull("The StateInvariant must have a Constraint", constraint);
+		final ValueSpecification specification = constraint.getSpecification();
+		assertNotNull("The Constraint must have a ValueSpecification", specification);
+		assertTrue("The ValueSpecification must be an OpaqueExpression", specification instanceof OpaqueExpression);
+		final OpaqueExpression opaqueExpression = (OpaqueExpression)specification;
+		assertNotNull("The OpaqueExpression must not have a null list of bodies", opaqueExpression.getBodies());
+		if(opaqueExpression.getBodies().isEmpty()) {
+			pattern.append("StateInvariant(unnamed);");
+		} else {
+			pattern.append("StateInvariant(").append(opaqueExpression.getBodies().get(0)).append(");");
+		}
+	}
+
+	private static void outputCompactOccurrenceSpecificationPattern(final OccurrenceSpecificationEditPartCN editPart, final StringBuilder pattern) {
+		final View view = (View)editPart.getModel();
+		assertNotNull("The EditPart must have a View", view);
+		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)view.getElement();
+		assertNotNull("The View must have a semantic element", occurrenceSpecification);
+		final String name = occurrenceSpecification.getName();
+		pattern.append("OccurrenceSpecification(").append(name).append(");");
+	}
+
+	protected void checkSimpleFullTimelinePattern(final String expectedPattern) {
+		final String timelineStringPattern = computeSimpleFullTimelineStringPattern();
+		assertEquals("The timeline does not follow the expected pattern", expectedPattern, timelineStringPattern);
+	}
+
+	protected String computeSimpleFullTimelineStringPattern() {
+		flushEventLoop();
+		final StringBuilder pattern = new StringBuilder();
+		final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment();
+		@SuppressWarnings("unchecked")
+		final List<EditPart> children = timelineCompartment.getChildren();
+		for(final EditPart editPart : children) {
+			if(editPart instanceof FullStateInvariantEditPartCN) {
+				pattern.append("-");
+			} else if(editPart instanceof OccurrenceSpecificationEditPartCN) {
+				pattern.append("o");
+			} else if(editPart instanceof MessageOccurrenceSpecificationEditPartCN) {
+				pattern.append("m");
+			} else if(editPart instanceof DestructionOccurrenceSpecificationEditPartCN) {
+				pattern.append("x");
+			} else if(editPart instanceof FullStateInvariantVerticalLineEditPart) {
+				pattern.append("|");
+			} else {
+				fail("unexpected element");
+			}
+		}
+		return pattern.toString();
+	}
+
+	/**
+	 * Check that the timeline contains the expected elements in the expected order.
+	 * 
+	 * @param expectedPattern
+	 *        a pattern where
+	 *        <ul>
+	 *        <li>"o" represents an OccurrenceSpecification
+	 *        <li>"-" represents a StateInvariant
+	 *        </ul>
+	 */
+	protected void checkSimpleCompactTimelinePattern(final String expectedPattern) {
+		final String timelineStringPattern = computeSimpleCompactTimelineStringPattern();
+		assertEquals("The timeline does not follow the expected pattern", expectedPattern, timelineStringPattern);
+	}
+
+	protected String computeSimpleCompactTimelineStringPattern() {
+		flushEventLoop();
+		final StringBuilder pattern = new StringBuilder();
+		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();
+		@SuppressWarnings("unchecked")
+		final List<EditPart> children = timelineCompartment.getChildren();
+		for(final EditPart editPart : children) {
+			if(editPart instanceof CompactStateInvariantEditPartCN) {
+				pattern.append("-");
+			} else if(editPart instanceof OccurrenceSpecificationEditPartCN) {
+				pattern.append("o");
+			} else if(editPart instanceof MessageOccurrenceSpecificationEditPartCN) {
+				pattern.append("m");
+			} else if(editPart instanceof DestructionOccurrenceSpecificationEditPartCN) {
+				pattern.append("x");
+			} else {
+				fail("unexpected element");
+			}
+		}
+		return pattern.toString();
+	}
+
+	/**
+	 * Test that the modifications can all be undone and redone, and that the dirty state is consistent throughout the
+	 * undo/redo operations.
+	 * 
+	 * @param nElementsToUndo
+	 *        the number of elements that should be undoable before reaching the non-dirty state
+	 */
+	protected void testDirtyStateForFullUndoRedo(final int nElementsToUndo) {
+		assertTrue("The editor should be dirty after all the modifications", this.diagramEditor.isDirty());
+		for(int i = 0; i < nElementsToUndo; i++) {
+			undoOnUIThread();
+			// editor should be dirty for all states except the initial state
+			if(i == nElementsToUndo - 1) {
+				assertFalse("The editor should not be dirty after we undid all previous modifications", this.diagramEditor.isDirty());
+			} else {
+				assertTrue("The editor should be dirty until we undo all previous modifications", this.diagramEditor.isDirty());
+			}
+		}
+		for(int i = 0; i < nElementsToUndo; i++) {
+			redoOnUIThread();
+			assertTrue("The editor should be dirty after we redo", this.diagramEditor.isDirty());
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AllCanonicalTests.java
index fcdce7dad49..fb41555d7ba 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AllCanonicalTests.java
@@ -1,29 +1,29 @@
-/*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-//@formatter:off

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({ TestTimingDiagramInteraction.class, TestTimingDiagramFullLifeline.class, TestTimingDiagramCompactLifeline.class,

-

-TestTimingDiagramFullStateInvariant.class, TestTimingDiagramCompactStateInvariant.class,

-

-TestTimingDiagramFullOccurrenceSpecification.class, TestTimingDiagramCompactOccurrenceSpecification.class,

-

-TestTimingDiagramStateDefinition.class, TestTimingDiagramFullLifelineLayout.class,

-

-TestTimingDiagramMessages.class, })

-//@formatter:on

-public class AllCanonicalTests {

-	// Junit 4 test case

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+//@formatter:off
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({ TestTimingDiagramInteraction.class, TestTimingDiagramFullLifeline.class, TestTimingDiagramCompactLifeline.class,
+
+TestTimingDiagramFullStateInvariant.class, TestTimingDiagramCompactStateInvariant.class,
+
+TestTimingDiagramFullOccurrenceSpecification.class, TestTimingDiagramCompactOccurrenceSpecification.class,
+
+TestTimingDiagramStateDefinition.class, TestTimingDiagramFullLifelineLayout.class,
+
+TestTimingDiagramMessages.class, })
+//@formatter:on
+public class AllCanonicalTests {
+	// Junit 4 test case
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java
index ad09f2b1bbc..d5fb803a106 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java
@@ -1,97 +1,97 @@
-/*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.List;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.tools.CellEditorLocator;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.timing.custom.LifelineVerticalLabelCellEditorLocator;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineNameEditPart;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.UMLEditPartFactory;

-import org.eclipse.papyrus.uml.diagram.timing.providers.UMLElementTypes;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.NamedElement;

-import org.junit.Test;

-

-public class TestTimingDiagramCompactLifeline extends AbstractTimingDiagramTestCase {

-

-	@Override

-	public void setUp() throws Exception {

-		// create the project, model and diagram

-		super.setUp();

-		createDefaultInteraction();

-	}

-

-	@Test

-	public void testCreateLifeline() {

-		createCompactLifelineInDefaultInteraction();

-	}

-

-	@Test

-	public void testHideLifeline() {

-		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

-		testHide(lifelineEditPart);

-	}

-

-	@Test

-	public void testDeleteLifeline() {

-		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

-		testDelete(lifelineEditPart);

-	}

-

-	@Test

-	public void testDropLifeline() {

-		// create a compact Lifeline and hide its View, so as to be able to drop it after that

-		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

-		final Lifeline lifeline = (Lifeline)((View)lifelineEditPart.getModel()).getElement();

-		assertNotNull("The lifeline should not be null", lifeline);

-		testHide(lifelineEditPart);

-		testDrop(getDefaultInteractionCompartment(), getDefaultInteractionCompartment(), lifeline);

-	}

-

-	@Test

-	public void testCellEditorLocator() {

-		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

-		final CompactLifelineNameEditPart compactLifelineNameEditPart = (CompactLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, CompactLifelineNameEditPart.VISUAL_ID);

-		assertNotNull("The CompactLifelineNameEditPart was not found", compactLifelineNameEditPart);

-		final CellEditorLocator textCellEditorLocator = UMLEditPartFactory.getTextCellEditorLocator(compactLifelineNameEditPart);

-		assertTrue("The cell editor locator must be the one specific to the vertical label", textCellEditorLocator instanceof LifelineVerticalLabelCellEditorLocator);

-	}

-

-	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")

-	@Test

-	public void testEditLifelineName() {

-		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

-		final CompactLifelineNameEditPart compactLifelineNameEditPart = (CompactLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, CompactLifelineNameEditPart.VISUAL_ID);

-		final NamedElement namedElement = (Lifeline)((View)lifelineEditPart.getModel()).getElement();

-		testSetNameWithDirectEditRequest(compactLifelineNameEditPart, namedElement);

-	}

-

-	@Test

-	public void create3LifelinesTest() {

-		final EditPart interactionCompartment = getDefaultInteractionCompartment();

-		assertNotNull("The interaction compartment was not found", interactionCompartment);

-		createView(UMLElementTypes.Lifeline_CompactShape, interactionCompartment);

-		createView(UMLElementTypes.Lifeline_CompactShape, interactionCompartment);

-		createView(UMLElementTypes.Lifeline_CompactShape, interactionCompartment);

-		assertEquals("The interaction compartment should only contain the 3 lifelines", 3, interactionCompartment.getChildren().size());

-		final List<? extends EditPart> editParts = EditPartUtils.findChildEditPartsWithId(interactionCompartment, CompactLifelineEditPartCN.VISUAL_ID);

-		assertEquals("The interaction compartment should contain 3 lifelines", 3, editParts.size());

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.timing.custom.LifelineVerticalLabelCellEditorLocator;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.UMLEditPartFactory;
+import org.eclipse.papyrus.uml.diagram.timing.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.NamedElement;
+import org.junit.Test;
+
+public class TestTimingDiagramCompactLifeline extends AbstractTimingDiagramTestCase {
+
+	@Override
+	public void setUp() throws Exception {
+		// create the project, model and diagram
+		super.setUp();
+		createDefaultInteraction();
+	}
+
+	@Test
+	public void testCreateLifeline() {
+		createCompactLifelineInDefaultInteraction();
+	}
+
+	@Test
+	public void testHideLifeline() {
+		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();
+		testHide(lifelineEditPart);
+	}
+
+	@Test
+	public void testDeleteLifeline() {
+		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();
+		testDelete(lifelineEditPart);
+	}
+
+	@Test
+	public void testDropLifeline() {
+		// create a compact Lifeline and hide its View, so as to be able to drop it after that
+		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();
+		final Lifeline lifeline = (Lifeline)((View)lifelineEditPart.getModel()).getElement();
+		assertNotNull("The lifeline should not be null", lifeline);
+		testHide(lifelineEditPart);
+		testDrop(getDefaultInteractionCompartment(), getDefaultInteractionCompartment(), lifeline);
+	}
+
+	@Test
+	public void testCellEditorLocator() {
+		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();
+		final CompactLifelineNameEditPart compactLifelineNameEditPart = (CompactLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, CompactLifelineNameEditPart.VISUAL_ID);
+		assertNotNull("The CompactLifelineNameEditPart was not found", compactLifelineNameEditPart);
+		final CellEditorLocator textCellEditorLocator = UMLEditPartFactory.getTextCellEditorLocator(compactLifelineNameEditPart);
+		assertTrue("The cell editor locator must be the one specific to the vertical label", textCellEditorLocator instanceof LifelineVerticalLabelCellEditorLocator);
+	}
+
+	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")
+	@Test
+	public void testEditLifelineName() {
+		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();
+		final CompactLifelineNameEditPart compactLifelineNameEditPart = (CompactLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, CompactLifelineNameEditPart.VISUAL_ID);
+		final NamedElement namedElement = (Lifeline)((View)lifelineEditPart.getModel()).getElement();
+		testSetNameWithDirectEditRequest(compactLifelineNameEditPart, namedElement);
+	}
+
+	@Test
+	public void create3LifelinesTest() {
+		final EditPart interactionCompartment = getDefaultInteractionCompartment();
+		assertNotNull("The interaction compartment was not found", interactionCompartment);
+		createView(UMLElementTypes.Lifeline_CompactShape, interactionCompartment);
+		createView(UMLElementTypes.Lifeline_CompactShape, interactionCompartment);
+		createView(UMLElementTypes.Lifeline_CompactShape, interactionCompartment);
+		assertEquals("The interaction compartment should only contain the 3 lifelines", 3, interactionCompartment.getChildren().size());
+		final List<? extends EditPart> editParts = EditPartUtils.findChildEditPartsWithId(interactionCompartment, CompactLifelineEditPartCN.VISUAL_ID);
+		assertEquals("The interaction compartment should contain 3 lifelines", 3, editParts.size());
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactOccurrenceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactOccurrenceSpecification.java
index 038ce64fc8f..f016c13bad8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactOccurrenceSpecification.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactOccurrenceSpecification.java
@@ -1,330 +1,330 @@
-/*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactStateInvariantEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.OccurrenceSpecificationEditPartCN;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.OccurrenceSpecification;

-import org.eclipse.uml2.uml.StateInvariant;

-import org.junit.Test;

-

-public class TestTimingDiagramCompactOccurrenceSpecification extends AbstractTimingDiagramTestCase {

-

-	@Override

-	public void setUp() throws Exception {

-		// create the project, model and diagram

-		super.setUp();

-		createDefaultInteraction();

-		createDefaultCompactLifeline();

-	}

-

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testCreateThreeOccurrenceSpecifications() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		final View interactionView = (View)getDefaultInteractionEditPart().getModel();

-		final Interaction interaction = (Interaction)interactionView.getElement();

-		assertTrue("The interaction should be in a Model", isInModel(interaction));

-		// We created 3 OccurrenceSpecifications. The model starts and ends with a StateInvariant, and when creating an

-		// OccurrenceSpecification, we split a StateInvariant in two and insert the OccurrenceSpecification.

-		// So, it should look like : "-o-o-o-" (with "-" for StateInvariant and "o" for OccurrenceSpecification)

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-	}

-

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testDeleteOccurrenceSpecification() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecifications = findOccurrenceSpecificationsInDefaultCompactLifeline();

-		assertEquals("Wrong number of OccurrenceSpecifications", 3, occurrenceSpecifications.size());

-		final OccurrenceSpecificationEditPartCN middleOccurrence = occurrenceSpecifications.get(1);

-

-		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)((View)middleOccurrence.getModel()).getElement();

-		assertTrue("The OccurrenceSpecification should be in a Model", isInModel(occurrenceSpecification));

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-

-		// destroy the middle OccurrenceSpecification

-		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		final Command command = middleOccurrence.getCommand(destroyElementRequest);

-		checkCommand(command);

-		execute(command);

-		assertEquals("There should be one less OccurrenceSpecification", 2, findOccurrenceSpecificationsInDefaultCompactLifeline().size());

-		assertFalse("The OccurrenceSpecification should not be in the Model after deleting it", isInModel(occurrenceSpecification));

-		checkInteractionFragmentsWithPattern("-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-");

-

-		// test undo

-		undo();

-		assertEquals("The OccurrenceSpecification should be back after the undo", 3, findOccurrenceSpecificationsInDefaultCompactLifeline().size());

-		assertTrue("The OccurrenceSpecification should be back in the Model after undoing the deletion", isInModel(occurrenceSpecification));

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-

-		// test redo

-		redo();

-		assertEquals("The OccurrenceSpecification should be removed after the redo", 2, findOccurrenceSpecificationsInDefaultCompactLifeline().size());

-		assertFalse("The OccurrenceSpecification should not be in the Model after redoing the deletion", isInModel(occurrenceSpecification));

-		checkInteractionFragmentsWithPattern("-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-");

-	}

-

-	@Test

-	public void testCreateOccurrenceSpecificationWithDoubleClick() {

-		final CompactStateInvariantEditPartCN stateInvariantEditPart = (CompactStateInvariantEditPartCN)EditPartUtils.findFirstChildEditPartWithId(getDefaultCompactLifelineEditPart(), CompactStateInvariantEditPartCN.VISUAL_ID);

-		assertNotNull("A StateInvariant must always exist", stateInvariantEditPart);

-		assertEquals("There must always be only one StateInvariant initially", 1, findStateInvariantsInDefaultCompactLifeline().size());

-		final StateInvariant stateInvariant = (StateInvariant)((View)stateInvariantEditPart.getModel()).getElement();

-		assertNotNull("The StateInvariant must not be null", stateInvariant);

-

-		final IFigure figure = stateInvariantEditPart.getFigure();

-		final Rectangle bounds = new Rectangle(figure.getBounds());

-		figure.getParent().translateToAbsolute(bounds);

-

-		// click at the center of the StateInvariant line

-		final int x = bounds.x + bounds.width / 2;

-		final int y = bounds.y + bounds.height / 2;

-

-		// send the open request (corresponding to a double-click)

-		sendOpenSelectionRequest(stateInvariantEditPart, new Point(x, y));

-

-		checkCreatedStateInvariants();

-		checkCreatedOccurrenceSpecification();

-

-		// test undo

-		undoOnUIThread();

-		assertEquals("There must be one StateInvariant after undo", 1, findStateInvariantsInDefaultCompactLifeline().size());

-		assertEquals("There must be no OccurrenceSpecification after undo", 0, findOccurrenceSpecificationsInDefaultCompactLifeline().size());

-

-		// test redo

-		redoOnUIThread();

-		assertEquals("There must be two StateInvariants after redo", 2, findStateInvariantsInDefaultCompactLifeline().size());

-		checkCreatedOccurrenceSpecification();

-	}

-

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testMoveOccurrenceSpecification() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		flushEventLoop();

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();

-		assertEquals("Wrong number of OccurrenceSpecifications", 3, occurrenceSpecificationEditParts.size());

-

-		final OccurrenceSpecificationEditPartCN first = occurrenceSpecificationEditParts.get(0);

-		final OccurrenceSpecificationEditPartCN second = occurrenceSpecificationEditParts.get(1);

-		final OccurrenceSpecificationEditPartCN third = occurrenceSpecificationEditParts.get(2);

-

-		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();

-

-		final int minX = getBounds(first).x;

-		final int maxX = getBounds(third).x;

-

-		// shift to the left

-		Rectangle boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(-9, 0));

-		Rectangle boundsAfter = getBounds(second);

-		assertEquals("The Figure should have been moved 9 pixels to the left", boundsBefore.x - 9, boundsAfter.x);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-

-		// shift to the right

-		boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(13, 0));

-		boundsAfter = getBounds(second);

-		assertEquals("The Figure should have been moved 13 pixels to the right", boundsBefore.x + 13, boundsAfter.x);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-

-		// try to move past the previous OccurrenceSpecification (should be forbidden)

-		boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(-(boundsBefore.x - minX + 10), 0));

-		boundsAfter = getBounds(second);

-		assertTrue("The Figure should be constrained, but still move", boundsAfter.x < boundsBefore.x);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-

-		// try to move past the following OccurrenceSpecification (should be forbidden)

-		boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(maxX - boundsBefore.x + 10, 0));

-		boundsAfter = getBounds(second);

-		assertTrue("The Figure should be constrained, but still move", boundsAfter.x > boundsBefore.x);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-

-		// try to move horizontally and vertically at the same time (should be constrained to an horizontal-only move)

-		boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(-17, 123));

-		boundsAfter = getBounds(second);

-		assertEquals("The Figure should have been moved 17 pixels to the left", boundsBefore.x - 17, boundsAfter.x);

-		assertEquals("The Figure should not move vertically", boundsBefore.y, boundsAfter.y);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-	}

-

-	/**

-	 * When moving several OccurrenceSpecifications, we don't want the previous positions of the elements to constrain

-	 * the future positions of the elements being moved.

-	 */

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testMoveAdjacentOccurrenceSpecifications() {

-		// create two OccurrenceSpecifications close to each other

-		createOccurrenceSpecificationInLastCompactStateInvariantAtAbsolutePos(1, 100);

-		createOccurrenceSpecificationInLastCompactStateInvariantAtAbsolutePos(2, 10);

-		flushEventLoop();

-

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();

-		assertEquals("Wrong number of OccurrenceSpecifications", 2, occurrenceSpecificationEditParts.size());

-

-		final OccurrenceSpecificationEditPartCN first = occurrenceSpecificationEditParts.get(0);

-		final OccurrenceSpecificationEditPartCN second = occurrenceSpecificationEditParts.get(1);

-		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();

-

-		// shift both to the left

-		final Rectangle firstBefore = getBounds(first);

-		final Rectangle secondBefore = getBounds(second);

-		moveEditParts(Arrays.asList(first, second), timelineCompartment, new Point(-50, 0));

-		final Rectangle firstAfter = getBounds(first);

-		final Rectangle secondAfter = getBounds(second);

-		assertEquals("The first Figure should have been moved 50 pixels to the left", firstBefore.x - 50, firstAfter.x);

-		assertEquals("The second Figure should have been moved 50 pixels to the left", secondBefore.x - 50, secondAfter.x);

-	}

-

-	protected static void checkBounds(final Rectangle boundsAfter, final int minX, final int maxX) {

-		assertTrue("The second OccurrenceSpecification should always be after the first", boundsAfter.x > minX);

-		assertTrue("The second OccurrenceSpecification should always be before the third", boundsAfter.x < maxX);

-	}

-

-	@Test

-	public void testFullUndoRedo() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		// 3 OccurrenceSpecifications + 1 Lifeline + 1 Interaction

-		final int nElementsToUndo = 5;

-		testDirtyStateForFullUndoRedo(nElementsToUndo);

-	}

-

-	@FailingTest("To be verified. Seems to fail on both Hudson and standard user environment")

-	@Test

-	public void testCreateOccurrenceSpecificationOnCompactStateInvariant() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		flushEventLoop();

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-

-		final List<CompactStateInvariantEditPartCN> stateInvariantsEditParts = findStateInvariantsInDefaultCompactLifeline();

-		assertEquals("Wrong number of StateInvariants", 4, stateInvariantsEditParts.size());

-		final CompactStateInvariantEditPartCN s1 = stateInvariantsEditParts.get(0);

-		final CompactStateInvariantEditPartCN s2 = stateInvariantsEditParts.get(1);

-		final CompactStateInvariantEditPartCN s3 = stateInvariantsEditParts.get(2);

-		final CompactStateInvariantEditPartCN s4 = stateInvariantsEditParts.get(3);

-

-		createOccurrenceSpecificationOverCompactStateInvariant(s1, false);

-		createOccurrenceSpecificationOverCompactStateInvariant(s2, true);

-		createOccurrenceSpecificationOverCompactStateInvariant(s3, false);

-		createOccurrenceSpecificationOverCompactStateInvariant(s4, true);

-		flushEventLoop();

-		checkSimpleCompactTimelinePattern("-oo-oo-oo-o");

-

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();

-		assertEquals("Wrong number of OccurrenceSpecifications", 7, occurrenceSpecificationEditParts.size());

-

-		final OccurrenceSpecificationEditPartCN o1 = occurrenceSpecificationEditParts.get(0);

-		final OccurrenceSpecificationEditPartCN o2 = occurrenceSpecificationEditParts.get(1);

-		final OccurrenceSpecificationEditPartCN o3 = occurrenceSpecificationEditParts.get(2);

-		final OccurrenceSpecificationEditPartCN o4 = occurrenceSpecificationEditParts.get(3);

-		final OccurrenceSpecificationEditPartCN o5 = occurrenceSpecificationEditParts.get(4);

-		final OccurrenceSpecificationEditPartCN o6 = occurrenceSpecificationEditParts.get(5);

-		final OccurrenceSpecificationEditPartCN o7 = occurrenceSpecificationEditParts.get(6);

-

-		checkOccurrenceIsMiddleXTopYOfStateInvariant(o1, s1);

-		checkOccurrenceIsRightXMiddleYOfStateInvariant(o2, s1);

-		checkOccurrenceIsMiddleXBottomYOfStateInvariant(o3, s2);

-		checkOccurrenceIsRightXMiddleYOfStateInvariant(o4, s2);

-		checkOccurrenceIsMiddleXTopYOfStateInvariant(o5, s3);

-		checkOccurrenceIsRightXMiddleYOfStateInvariant(o6, s3);

-		checkOccurrenceIsMiddleXBottomYOfStateInvariant(o7, s4);

-	}

-

-	private static void checkOccurrenceIsMiddleXTopYOfStateInvariant(final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart, final CompactStateInvariantEditPartCN stateInvariantEditPart) {

-		final Rectangle oBounds = getBounds(occurrenceSpecificationEditPart);

-		final Rectangle sBounds = getBounds(stateInvariantEditPart);

-		assertTrue("The occurrence should be located vertically near the top of the state invariant", Math.abs(oBounds.y - sBounds.y) <= 5);

-		assertTrue("The occurrence should be located horizontally near the middle of the state invariant", Math.abs(oBounds.x - (sBounds.x + sBounds.width / 2)) <= 5);

-	}

-

-	private static void checkOccurrenceIsMiddleXBottomYOfStateInvariant(final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart, final CompactStateInvariantEditPartCN stateInvariantEditPart) {

-		final Rectangle oBounds = getBounds(occurrenceSpecificationEditPart);

-		final Rectangle sBounds = getBounds(stateInvariantEditPart);

-		assertTrue("The occurrence should be located vertically near the top of the state invariant", Math.abs(oBounds.y - (sBounds.y + sBounds.height)) <= 5);

-		assertTrue("The occurrence should be located horizontally near the middle of the state invariant", Math.abs(oBounds.x - (sBounds.x + sBounds.width / 2)) <= 5);

-	}

-

-	private static void checkOccurrenceIsRightXMiddleYOfStateInvariant(final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart, final CompactStateInvariantEditPartCN stateInvariantEditPart) {

-		final Rectangle oBounds = getBounds(occurrenceSpecificationEditPart);

-		final Rectangle sBounds = getBounds(stateInvariantEditPart);

-		assertTrue("The occurrence should be located vertically near the middle of the state invariant", Math.abs(oBounds.y - (sBounds.y + sBounds.height / 2)) <= 5);

-		assertTrue("The occurrence should be located horizontally near the right of the state invariant", Math.abs(oBounds.x - (sBounds.x + sBounds.width)) <= 5);

-	}

-

-	protected void checkCreatedStateInvariants() {

-		// check the StateInvariants

-		final List<CompactStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultCompactLifeline();

-		assertEquals("There must be two StateInvariants after creating an OccurrenceSpecification", 2, stateInvariantEditParts.size());

-		checkStateInvariant(stateInvariantEditParts.get(0));

-		checkStateInvariant(stateInvariantEditParts.get(1));

-	}

-

-	private void checkCreatedOccurrenceSpecification() {

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();

-		assertEquals("There must be one OccurrenceSpecification", 1, occurrenceSpecificationEditParts.size());

-		final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart = occurrenceSpecificationEditParts.get(0);

-		final View occurrenceSpecificationView = (View)occurrenceSpecificationEditPart.getModel();

-		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)occurrenceSpecificationView.getElement();

-		assertNotNull("The OccurrenceSpecification must not be null", occurrenceSpecification);

-		assertTrue("The OccurrenceSpecification must be in the model", isInModel(occurrenceSpecification));

-		assertEquals("The OccurrenceSpecification must cover one Lifeline", 1, occurrenceSpecification.getCovereds().size());

-		final Lifeline lifeline = (Lifeline)((View)getDefaultCompactLifelineEditPart().getModel()).getElement();

-		assertEquals("The OccurrenceSpecification must cover the Lifeline", lifeline, occurrenceSpecification.getCovereds().get(0));

-		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();

-		assertTrue("The OccurrenceSpecification must be in the Interaction", interaction.getFragments().contains(occurrenceSpecification));

-	}

-

-	private void checkStateInvariant(final CompactStateInvariantEditPartCN stateInvariantEditPartCN) {

-		final View stateInvariantView = (View)stateInvariantEditPartCN.getModel();

-		final StateInvariant stateInvariant = (StateInvariant)stateInvariantView.getElement();

-		assertNotNull("The StateInvariant must not be null", stateInvariant);

-		assertTrue("The StateInvariant must be in the model", isInModel(stateInvariant));

-		assertEquals("The StateInvariant must cover one Lifeline", 1, stateInvariant.getCovereds().size());

-		final Lifeline lifeline = (Lifeline)((View)getDefaultCompactLifelineEditPart().getModel()).getElement();

-		assertEquals("The StateInvariant must cover the Lifeline", lifeline, stateInvariant.getCovereds().get(0));

-		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();

-		assertTrue("The StateInvariant must be in the Interaction", interaction.getFragments().contains(stateInvariant));

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactStateInvariantEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.OccurrenceSpecificationEditPartCN;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.OccurrenceSpecification;
+import org.eclipse.uml2.uml.StateInvariant;
+import org.junit.Test;
+
+public class TestTimingDiagramCompactOccurrenceSpecification extends AbstractTimingDiagramTestCase {
+
+	@Override
+	public void setUp() throws Exception {
+		// create the project, model and diagram
+		super.setUp();
+		createDefaultInteraction();
+		createDefaultCompactLifeline();
+	}
+
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testCreateThreeOccurrenceSpecifications() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		final View interactionView = (View)getDefaultInteractionEditPart().getModel();
+		final Interaction interaction = (Interaction)interactionView.getElement();
+		assertTrue("The interaction should be in a Model", isInModel(interaction));
+		// We created 3 OccurrenceSpecifications. The model starts and ends with a StateInvariant, and when creating an
+		// OccurrenceSpecification, we split a StateInvariant in two and insert the OccurrenceSpecification.
+		// So, it should look like : "-o-o-o-" (with "-" for StateInvariant and "o" for OccurrenceSpecification)
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+	}
+
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testDeleteOccurrenceSpecification() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecifications = findOccurrenceSpecificationsInDefaultCompactLifeline();
+		assertEquals("Wrong number of OccurrenceSpecifications", 3, occurrenceSpecifications.size());
+		final OccurrenceSpecificationEditPartCN middleOccurrence = occurrenceSpecifications.get(1);
+
+		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)((View)middleOccurrence.getModel()).getElement();
+		assertTrue("The OccurrenceSpecification should be in a Model", isInModel(occurrenceSpecification));
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+
+		// destroy the middle OccurrenceSpecification
+		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		final Command command = middleOccurrence.getCommand(destroyElementRequest);
+		checkCommand(command);
+		execute(command);
+		assertEquals("There should be one less OccurrenceSpecification", 2, findOccurrenceSpecificationsInDefaultCompactLifeline().size());
+		assertFalse("The OccurrenceSpecification should not be in the Model after deleting it", isInModel(occurrenceSpecification));
+		checkInteractionFragmentsWithPattern("-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-");
+
+		// test undo
+		undo();
+		assertEquals("The OccurrenceSpecification should be back after the undo", 3, findOccurrenceSpecificationsInDefaultCompactLifeline().size());
+		assertTrue("The OccurrenceSpecification should be back in the Model after undoing the deletion", isInModel(occurrenceSpecification));
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+
+		// test redo
+		redo();
+		assertEquals("The OccurrenceSpecification should be removed after the redo", 2, findOccurrenceSpecificationsInDefaultCompactLifeline().size());
+		assertFalse("The OccurrenceSpecification should not be in the Model after redoing the deletion", isInModel(occurrenceSpecification));
+		checkInteractionFragmentsWithPattern("-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-");
+	}
+
+	@Test
+	public void testCreateOccurrenceSpecificationWithDoubleClick() {
+		final CompactStateInvariantEditPartCN stateInvariantEditPart = (CompactStateInvariantEditPartCN)EditPartUtils.findFirstChildEditPartWithId(getDefaultCompactLifelineEditPart(), CompactStateInvariantEditPartCN.VISUAL_ID);
+		assertNotNull("A StateInvariant must always exist", stateInvariantEditPart);
+		assertEquals("There must always be only one StateInvariant initially", 1, findStateInvariantsInDefaultCompactLifeline().size());
+		final StateInvariant stateInvariant = (StateInvariant)((View)stateInvariantEditPart.getModel()).getElement();
+		assertNotNull("The StateInvariant must not be null", stateInvariant);
+
+		final IFigure figure = stateInvariantEditPart.getFigure();
+		final Rectangle bounds = new Rectangle(figure.getBounds());
+		figure.getParent().translateToAbsolute(bounds);
+
+		// click at the center of the StateInvariant line
+		final int x = bounds.x + bounds.width / 2;
+		final int y = bounds.y + bounds.height / 2;
+
+		// send the open request (corresponding to a double-click)
+		sendOpenSelectionRequest(stateInvariantEditPart, new Point(x, y));
+
+		checkCreatedStateInvariants();
+		checkCreatedOccurrenceSpecification();
+
+		// test undo
+		undoOnUIThread();
+		assertEquals("There must be one StateInvariant after undo", 1, findStateInvariantsInDefaultCompactLifeline().size());
+		assertEquals("There must be no OccurrenceSpecification after undo", 0, findOccurrenceSpecificationsInDefaultCompactLifeline().size());
+
+		// test redo
+		redoOnUIThread();
+		assertEquals("There must be two StateInvariants after redo", 2, findStateInvariantsInDefaultCompactLifeline().size());
+		checkCreatedOccurrenceSpecification();
+	}
+
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testMoveOccurrenceSpecification() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		flushEventLoop();
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();
+		assertEquals("Wrong number of OccurrenceSpecifications", 3, occurrenceSpecificationEditParts.size());
+
+		final OccurrenceSpecificationEditPartCN first = occurrenceSpecificationEditParts.get(0);
+		final OccurrenceSpecificationEditPartCN second = occurrenceSpecificationEditParts.get(1);
+		final OccurrenceSpecificationEditPartCN third = occurrenceSpecificationEditParts.get(2);
+
+		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();
+
+		final int minX = getBounds(first).x;
+		final int maxX = getBounds(third).x;
+
+		// shift to the left
+		Rectangle boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(-9, 0));
+		Rectangle boundsAfter = getBounds(second);
+		assertEquals("The Figure should have been moved 9 pixels to the left", boundsBefore.x - 9, boundsAfter.x);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+
+		// shift to the right
+		boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(13, 0));
+		boundsAfter = getBounds(second);
+		assertEquals("The Figure should have been moved 13 pixels to the right", boundsBefore.x + 13, boundsAfter.x);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+
+		// try to move past the previous OccurrenceSpecification (should be forbidden)
+		boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(-(boundsBefore.x - minX + 10), 0));
+		boundsAfter = getBounds(second);
+		assertTrue("The Figure should be constrained, but still move", boundsAfter.x < boundsBefore.x);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+
+		// try to move past the following OccurrenceSpecification (should be forbidden)
+		boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(maxX - boundsBefore.x + 10, 0));
+		boundsAfter = getBounds(second);
+		assertTrue("The Figure should be constrained, but still move", boundsAfter.x > boundsBefore.x);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+
+		// try to move horizontally and vertically at the same time (should be constrained to an horizontal-only move)
+		boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(-17, 123));
+		boundsAfter = getBounds(second);
+		assertEquals("The Figure should have been moved 17 pixels to the left", boundsBefore.x - 17, boundsAfter.x);
+		assertEquals("The Figure should not move vertically", boundsBefore.y, boundsAfter.y);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+	}
+
+	/**
+	 * When moving several OccurrenceSpecifications, we don't want the previous positions of the elements to constrain
+	 * the future positions of the elements being moved.
+	 */
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testMoveAdjacentOccurrenceSpecifications() {
+		// create two OccurrenceSpecifications close to each other
+		createOccurrenceSpecificationInLastCompactStateInvariantAtAbsolutePos(1, 100);
+		createOccurrenceSpecificationInLastCompactStateInvariantAtAbsolutePos(2, 10);
+		flushEventLoop();
+
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();
+		assertEquals("Wrong number of OccurrenceSpecifications", 2, occurrenceSpecificationEditParts.size());
+
+		final OccurrenceSpecificationEditPartCN first = occurrenceSpecificationEditParts.get(0);
+		final OccurrenceSpecificationEditPartCN second = occurrenceSpecificationEditParts.get(1);
+		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();
+
+		// shift both to the left
+		final Rectangle firstBefore = getBounds(first);
+		final Rectangle secondBefore = getBounds(second);
+		moveEditParts(Arrays.asList(first, second), timelineCompartment, new Point(-50, 0));
+		final Rectangle firstAfter = getBounds(first);
+		final Rectangle secondAfter = getBounds(second);
+		assertEquals("The first Figure should have been moved 50 pixels to the left", firstBefore.x - 50, firstAfter.x);
+		assertEquals("The second Figure should have been moved 50 pixels to the left", secondBefore.x - 50, secondAfter.x);
+	}
+
+	protected static void checkBounds(final Rectangle boundsAfter, final int minX, final int maxX) {
+		assertTrue("The second OccurrenceSpecification should always be after the first", boundsAfter.x > minX);
+		assertTrue("The second OccurrenceSpecification should always be before the third", boundsAfter.x < maxX);
+	}
+
+	@Test
+	public void testFullUndoRedo() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		// 3 OccurrenceSpecifications + 1 Lifeline + 1 Interaction
+		final int nElementsToUndo = 5;
+		testDirtyStateForFullUndoRedo(nElementsToUndo);
+	}
+
+	@FailingTest("To be verified. Seems to fail on both Hudson and standard user environment")
+	@Test
+	public void testCreateOccurrenceSpecificationOnCompactStateInvariant() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		flushEventLoop();
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+
+		final List<CompactStateInvariantEditPartCN> stateInvariantsEditParts = findStateInvariantsInDefaultCompactLifeline();
+		assertEquals("Wrong number of StateInvariants", 4, stateInvariantsEditParts.size());
+		final CompactStateInvariantEditPartCN s1 = stateInvariantsEditParts.get(0);
+		final CompactStateInvariantEditPartCN s2 = stateInvariantsEditParts.get(1);
+		final CompactStateInvariantEditPartCN s3 = stateInvariantsEditParts.get(2);
+		final CompactStateInvariantEditPartCN s4 = stateInvariantsEditParts.get(3);
+
+		createOccurrenceSpecificationOverCompactStateInvariant(s1, false);
+		createOccurrenceSpecificationOverCompactStateInvariant(s2, true);
+		createOccurrenceSpecificationOverCompactStateInvariant(s3, false);
+		createOccurrenceSpecificationOverCompactStateInvariant(s4, true);
+		flushEventLoop();
+		checkSimpleCompactTimelinePattern("-oo-oo-oo-o");
+
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();
+		assertEquals("Wrong number of OccurrenceSpecifications", 7, occurrenceSpecificationEditParts.size());
+
+		final OccurrenceSpecificationEditPartCN o1 = occurrenceSpecificationEditParts.get(0);
+		final OccurrenceSpecificationEditPartCN o2 = occurrenceSpecificationEditParts.get(1);
+		final OccurrenceSpecificationEditPartCN o3 = occurrenceSpecificationEditParts.get(2);
+		final OccurrenceSpecificationEditPartCN o4 = occurrenceSpecificationEditParts.get(3);
+		final OccurrenceSpecificationEditPartCN o5 = occurrenceSpecificationEditParts.get(4);
+		final OccurrenceSpecificationEditPartCN o6 = occurrenceSpecificationEditParts.get(5);
+		final OccurrenceSpecificationEditPartCN o7 = occurrenceSpecificationEditParts.get(6);
+
+		checkOccurrenceIsMiddleXTopYOfStateInvariant(o1, s1);
+		checkOccurrenceIsRightXMiddleYOfStateInvariant(o2, s1);
+		checkOccurrenceIsMiddleXBottomYOfStateInvariant(o3, s2);
+		checkOccurrenceIsRightXMiddleYOfStateInvariant(o4, s2);
+		checkOccurrenceIsMiddleXTopYOfStateInvariant(o5, s3);
+		checkOccurrenceIsRightXMiddleYOfStateInvariant(o6, s3);
+		checkOccurrenceIsMiddleXBottomYOfStateInvariant(o7, s4);
+	}
+
+	private static void checkOccurrenceIsMiddleXTopYOfStateInvariant(final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart, final CompactStateInvariantEditPartCN stateInvariantEditPart) {
+		final Rectangle oBounds = getBounds(occurrenceSpecificationEditPart);
+		final Rectangle sBounds = getBounds(stateInvariantEditPart);
+		assertTrue("The occurrence should be located vertically near the top of the state invariant", Math.abs(oBounds.y - sBounds.y) <= 5);
+		assertTrue("The occurrence should be located horizontally near the middle of the state invariant", Math.abs(oBounds.x - (sBounds.x + sBounds.width / 2)) <= 5);
+	}
+
+	private static void checkOccurrenceIsMiddleXBottomYOfStateInvariant(final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart, final CompactStateInvariantEditPartCN stateInvariantEditPart) {
+		final Rectangle oBounds = getBounds(occurrenceSpecificationEditPart);
+		final Rectangle sBounds = getBounds(stateInvariantEditPart);
+		assertTrue("The occurrence should be located vertically near the top of the state invariant", Math.abs(oBounds.y - (sBounds.y + sBounds.height)) <= 5);
+		assertTrue("The occurrence should be located horizontally near the middle of the state invariant", Math.abs(oBounds.x - (sBounds.x + sBounds.width / 2)) <= 5);
+	}
+
+	private static void checkOccurrenceIsRightXMiddleYOfStateInvariant(final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart, final CompactStateInvariantEditPartCN stateInvariantEditPart) {
+		final Rectangle oBounds = getBounds(occurrenceSpecificationEditPart);
+		final Rectangle sBounds = getBounds(stateInvariantEditPart);
+		assertTrue("The occurrence should be located vertically near the middle of the state invariant", Math.abs(oBounds.y - (sBounds.y + sBounds.height / 2)) <= 5);
+		assertTrue("The occurrence should be located horizontally near the right of the state invariant", Math.abs(oBounds.x - (sBounds.x + sBounds.width)) <= 5);
+	}
+
+	protected void checkCreatedStateInvariants() {
+		// check the StateInvariants
+		final List<CompactStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultCompactLifeline();
+		assertEquals("There must be two StateInvariants after creating an OccurrenceSpecification", 2, stateInvariantEditParts.size());
+		checkStateInvariant(stateInvariantEditParts.get(0));
+		checkStateInvariant(stateInvariantEditParts.get(1));
+	}
+
+	private void checkCreatedOccurrenceSpecification() {
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();
+		assertEquals("There must be one OccurrenceSpecification", 1, occurrenceSpecificationEditParts.size());
+		final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart = occurrenceSpecificationEditParts.get(0);
+		final View occurrenceSpecificationView = (View)occurrenceSpecificationEditPart.getModel();
+		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)occurrenceSpecificationView.getElement();
+		assertNotNull("The OccurrenceSpecification must not be null", occurrenceSpecification);
+		assertTrue("The OccurrenceSpecification must be in the model", isInModel(occurrenceSpecification));
+		assertEquals("The OccurrenceSpecification must cover one Lifeline", 1, occurrenceSpecification.getCovereds().size());
+		final Lifeline lifeline = (Lifeline)((View)getDefaultCompactLifelineEditPart().getModel()).getElement();
+		assertEquals("The OccurrenceSpecification must cover the Lifeline", lifeline, occurrenceSpecification.getCovereds().get(0));
+		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();
+		assertTrue("The OccurrenceSpecification must be in the Interaction", interaction.getFragments().contains(occurrenceSpecification));
+	}
+
+	private void checkStateInvariant(final CompactStateInvariantEditPartCN stateInvariantEditPartCN) {
+		final View stateInvariantView = (View)stateInvariantEditPartCN.getModel();
+		final StateInvariant stateInvariant = (StateInvariant)stateInvariantView.getElement();
+		assertNotNull("The StateInvariant must not be null", stateInvariant);
+		assertTrue("The StateInvariant must be in the model", isInModel(stateInvariant));
+		assertEquals("The StateInvariant must cover one Lifeline", 1, stateInvariant.getCovereds().size());
+		final Lifeline lifeline = (Lifeline)((View)getDefaultCompactLifelineEditPart().getModel()).getElement();
+		assertEquals("The StateInvariant must cover the Lifeline", lifeline, stateInvariant.getCovereds().get(0));
+		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();
+		assertTrue("The StateInvariant must be in the Interaction", interaction.getFragments().contains(stateInvariant));
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactStateInvariant.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactStateInvariant.java
index 06d813d89dd..d4a6e7e9874 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactStateInvariant.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactStateInvariant.java
@@ -1,241 +1,241 @@
-/*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.List;

-

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.StateInvariantUtils;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactStateInvariantEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactStateInvariantNameEditPart;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.OccurrenceSpecificationEditPartCN;

-import org.eclipse.uml2.uml.StateInvariant;

-import org.junit.Test;

-

-public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagramTestCase {

-

-	@Override

-	public void setUp() throws Exception {

-		// create the project, model and diagram

-		super.setUp();

-		createDefaultInteraction();

-		createDefaultCompactLifeline();

-	}

-

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testCutCompactStateInvariants() {

-		final List<CompactStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultCompactLifeline();

-		assertEquals("We should have one StateInvariant at the beginning of this test", 1, stateInvariantEditParts.size());

-		checkCompactTimelinePattern("StateInvariant(unnamed);");

-		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(1, 1.0 / 4.0);

-		checkCompactTimelinePattern("StateInvariant(unnamed);OccurrenceSpecification(<unnamed>_To_<unnamed>);StateInvariant(unnamed);");

-		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(2, 1.0 / 3.0);

-		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(3, 1.0 / 2.0);

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-		checkCompactTimelinePattern("StateInvariant(unnamed);OccurrenceSpecification(<unnamed>_To_<unnamed>);StateInvariant(unnamed);" + "OccurrenceSpecification(<unnamed>_To_<unnamed>);StateInvariant(unnamed);OccurrenceSpecification(<unnamed>_To_<unnamed>);StateInvariant(unnamed);");

-	}

-

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testEditCompactStateInvariantName() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-		final List<CompactStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultCompactLifeline();

-		assertEquals("We should have four StateInvariants", 4, stateInvariantEditParts.size());

-		int i = 1;

-		for(final CompactStateInvariantEditPartCN stateInvariantEditPart : stateInvariantEditParts) {

-			final CompactStateInvariantNameEditPart nameEditPart = (CompactStateInvariantNameEditPart)EditPartUtils.findFirstChildEditPartWithId(stateInvariantEditPart, CompactStateInvariantNameEditPart.VISUAL_ID);

-			assertNotNull("The name edit part must not be null", nameEditPart);

-			final StateInvariant stateInvariant = (StateInvariant)((View)stateInvariantEditPart.getModel()).getElement();

-			testSetNameWithDirectEditRequest(nameEditPart, stateInvariant, new INameProvider<StateInvariant>() {

-

-				@Override

-				public String getName(final StateInvariant stateInvariant) {

-					return StateInvariantUtils.getInnerStateInvariantName(stateInvariant);

-				}

-			});

-			setNameWithDirectEditRequest(nameEditPart, "state" + (i % 2 + 1));

-			i++;

-		}

-		checkCompactTimelinePattern("StateInvariant(state2);OccurrenceSpecification(state2_1_To_state1_1);StateInvariant(state1);" + "OccurrenceSpecification(state1_1_To_state2_2);StateInvariant(state2);OccurrenceSpecification(state2_2_To_state1_2);StateInvariant(state1);");

-	}

-

-	@Test

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	public void testDeleteStateInvariants() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-		final CompactStateInvariantEditPartCN compactStateInvariantEditPart = findStateInvariantsInDefaultCompactLifeline().get(1);

-		executeDestroyCommand(compactStateInvariantEditPart);

-		checkInteractionFragmentsWithPattern("-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-");

-		undoOnUIThread();

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-		redoOnUIThread();

-		checkInteractionFragmentsWithPattern("-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-");

-	}

-

-	@FailingTest("To be verified. Seems to be failing in all environments; not related to the DirectEdit issue")

-	@Test

-	public void testDeleteStateInvariantsWithOccurrencesOnTop() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-		final CompactStateInvariantEditPartCN s1 = findStateInvariantsInDefaultCompactLifeline().get(0);

-		final CompactStateInvariantEditPartCN s2 = findStateInvariantsInDefaultCompactLifeline().get(1);

-		final CompactStateInvariantEditPartCN s3 = findStateInvariantsInDefaultCompactLifeline().get(2);

-		final CompactStateInvariantEditPartCN s4 = findStateInvariantsInDefaultCompactLifeline().get(3);

-		createOccurrenceSpecificationOverCompactStateInvariant(s1, true);

-		createOccurrenceSpecificationOverCompactStateInvariant(s2, false);

-		createOccurrenceSpecificationOverCompactStateInvariant(s3, false);

-		createOccurrenceSpecificationOverCompactStateInvariant(s4, true);

-		flushEventLoop();

-		checkInteractionFragmentsWithPattern("-oo-oo-oo-o");

-		checkSimpleCompactTimelinePattern("-oo-oo-oo-o");

-

-		executeDestroyCommand(s1);

-		checkInteractionFragmentsWithPattern("-oo-oo-o");

-		checkSimpleCompactTimelinePattern("-oo-oo-o");

-		undoOnUIThread();

-		checkInteractionFragmentsWithPattern("-oo-oo-oo-o");

-		checkSimpleCompactTimelinePattern("-oo-oo-oo-o");

-		redoOnUIThread();

-		checkInteractionFragmentsWithPattern("-oo-oo-o");

-		checkSimpleCompactTimelinePattern("-oo-oo-o");

-

-		executeDestroyCommand(s4);

-		checkInteractionFragmentsWithPattern("-oo-o");

-		checkSimpleCompactTimelinePattern("-oo-o");

-

-		executeDestroyCommand(s2);

-		checkInteractionFragmentsWithPattern("-o");

-		checkSimpleCompactTimelinePattern("-o");

-	}

-

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testHideStateInvariants() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-		final CompactStateInvariantEditPartCN compactStateInvariantEditPart = findStateInvariantsInDefaultCompactLifeline().get(1);

-		executeHideCommand(compactStateInvariantEditPart);

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-");

-		undoOnUIThread();

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-		redoOnUIThread();

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleCompactTimelinePattern("-o-o-");

-	}

-

-	@Test

-	public void testCannotDeleteLastStateInvariant() {

-		checkInteractionFragmentsWithPattern("-");

-		checkSimpleCompactTimelinePattern("-");

-		final CompactStateInvariantEditPartCN compactStateInvariantEditPart = findStateInvariantsInDefaultCompactLifeline().get(0);

-		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		final Command command = compactStateInvariantEditPart.getCommand(destroyElementRequest);

-		assertFalse("We shouldn't be able to delete the last state invariant", command.canExecute());

-	}

-

-	@Test

-	public void testCannotHideLastStateInvariant() {

-		checkInteractionFragmentsWithPattern("-");

-		checkSimpleCompactTimelinePattern("-");

-		final CompactStateInvariantEditPartCN compactStateInvariantEditPart = findStateInvariantsInDefaultCompactLifeline().get(0);

-		final GroupRequest deleteViewRequest = new GroupRequest(org.eclipse.gef.RequestConstants.REQ_DELETE);

-		deleteViewRequest.setEditParts(compactStateInvariantEditPart);

-		final Command command = compactStateInvariantEditPart.getCommand(deleteViewRequest);

-		assertFalse("We shouldn't be able to hide the last state invariant", command.canExecute());

-	}

-

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testResizeCompactStateInvariant() {

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-		flushEventLoop();

-		checkSimpleCompactTimelinePattern("-o-o-o-");

-

-		final List<CompactStateInvariantEditPartCN> stateInvariantsEditParts = findStateInvariantsInDefaultCompactLifeline();

-		assertEquals("Wrong number of StateInvariants", 4, stateInvariantsEditParts.size());

-		final CompactStateInvariantEditPartCN s2 = stateInvariantsEditParts.get(1);

-		final CompactStateInvariantEditPartCN s3 = stateInvariantsEditParts.get(2);

-

-		createOccurrenceSpecificationOverCompactStateInvariant(s2, false);

-		createOccurrenceSpecificationOverCompactStateInvariant(s3, true);

-		flushEventLoop();

-		checkSimpleCompactTimelinePattern("-o-oo-oo-");

-

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();

-		assertEquals("Wrong number of OccurrenceSpecifications", 5, occurrenceSpecificationEditParts.size());

-

-		final OccurrenceSpecificationEditPartCN o1 = occurrenceSpecificationEditParts.get(0);

-		final OccurrenceSpecificationEditPartCN o2 = occurrenceSpecificationEditParts.get(1);

-		final OccurrenceSpecificationEditPartCN o3 = occurrenceSpecificationEditParts.get(2);

-		final OccurrenceSpecificationEditPartCN o4 = occurrenceSpecificationEditParts.get(3);

-		final OccurrenceSpecificationEditPartCN o5 = occurrenceSpecificationEditParts.get(4);

-

-		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();

-

-		// test shrink

-		testResizeCompactStateInvariant(s2, -9, o1, o2, o3, o4, o5, timelineCompartment);

-		// test grow

-		testResizeCompactStateInvariant(s2, 42, o1, o2, o3, o4, o5, timelineCompartment);

-	}

-

-	private void testResizeCompactStateInvariant(final CompactStateInvariantEditPartCN s2, final int widthDelta, final OccurrenceSpecificationEditPartCN o1, final OccurrenceSpecificationEditPartCN o2, final OccurrenceSpecificationEditPartCN o3, final OccurrenceSpecificationEditPartCN o4, final OccurrenceSpecificationEditPartCN o5, final CompactLifelineCompartmentEditPartCN timelineCompartment) {

-		final Rectangle o1Before = getBounds(o1);

-		final Rectangle o2Before = getBounds(o2);

-		final Rectangle o3Before = getBounds(o3);

-		final Rectangle o4Before = getBounds(o4);

-		final Rectangle o5Before = getBounds(o5);

-		final Rectangle boundsBefore = getBounds(s2);

-		resizeEditPart(s2, timelineCompartment, new Dimension(widthDelta, 0), PositionConstants.EAST);

-		final Rectangle o1After = getBounds(o1);

-		final Rectangle o2After = getBounds(o2);

-		final Rectangle o3After = getBounds(o3);

-		final Rectangle o4After = getBounds(o4);

-		final Rectangle o5After = getBounds(o5);

-		final Rectangle boundsAfter = getBounds(s2);

-		assertEquals("The Figure should have been resized horizontally", boundsBefore.width + widthDelta, boundsAfter.width);

-		assertEquals("The OccurrenceSpecification before it shouldn't have moved", o1Before.x, o1After.x);

-		assertEquals("The OccurrenceSpecification on top of it shouldn't have moved", o2Before.x, o2After.x);

-		assertEquals("The OccurrenceSpecifications after it should have moved", o3Before.x + widthDelta, o3After.x);

-		assertEquals("The OccurrenceSpecifications on the bottom of another state shouldn't have moved", o4Before.x, o4After.x);

-		assertEquals("The OccurrenceSpecifications after it should have moved", o5Before.x + widthDelta, o5After.x);

-		testUndoRedoChangeBoundsEditPart(s2, boundsBefore);

-	}

-

-	protected static void checkBounds(final Rectangle boundsAfter, final int minX, final int maxX) {

-		assertTrue("The second OccurrenceSpecification should always be after the first", boundsAfter.x > minX);

-		assertTrue("The second OccurrenceSpecification should always be before the third", boundsAfter.x < maxX);

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.StateInvariantUtils;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactStateInvariantEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactStateInvariantNameEditPart;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.OccurrenceSpecificationEditPartCN;
+import org.eclipse.uml2.uml.StateInvariant;
+import org.junit.Test;
+
+public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagramTestCase {
+
+	@Override
+	public void setUp() throws Exception {
+		// create the project, model and diagram
+		super.setUp();
+		createDefaultInteraction();
+		createDefaultCompactLifeline();
+	}
+
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testCutCompactStateInvariants() {
+		final List<CompactStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultCompactLifeline();
+		assertEquals("We should have one StateInvariant at the beginning of this test", 1, stateInvariantEditParts.size());
+		checkCompactTimelinePattern("StateInvariant(unnamed);");
+		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(1, 1.0 / 4.0);
+		checkCompactTimelinePattern("StateInvariant(unnamed);OccurrenceSpecification(<unnamed>_To_<unnamed>);StateInvariant(unnamed);");
+		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(2, 1.0 / 3.0);
+		createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(3, 1.0 / 2.0);
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+		checkCompactTimelinePattern("StateInvariant(unnamed);OccurrenceSpecification(<unnamed>_To_<unnamed>);StateInvariant(unnamed);" + "OccurrenceSpecification(<unnamed>_To_<unnamed>);StateInvariant(unnamed);OccurrenceSpecification(<unnamed>_To_<unnamed>);StateInvariant(unnamed);");
+	}
+
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testEditCompactStateInvariantName() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+		final List<CompactStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultCompactLifeline();
+		assertEquals("We should have four StateInvariants", 4, stateInvariantEditParts.size());
+		int i = 1;
+		for(final CompactStateInvariantEditPartCN stateInvariantEditPart : stateInvariantEditParts) {
+			final CompactStateInvariantNameEditPart nameEditPart = (CompactStateInvariantNameEditPart)EditPartUtils.findFirstChildEditPartWithId(stateInvariantEditPart, CompactStateInvariantNameEditPart.VISUAL_ID);
+			assertNotNull("The name edit part must not be null", nameEditPart);
+			final StateInvariant stateInvariant = (StateInvariant)((View)stateInvariantEditPart.getModel()).getElement();
+			testSetNameWithDirectEditRequest(nameEditPart, stateInvariant, new INameProvider<StateInvariant>() {
+
+				@Override
+				public String getName(final StateInvariant stateInvariant) {
+					return StateInvariantUtils.getInnerStateInvariantName(stateInvariant);
+				}
+			});
+			setNameWithDirectEditRequest(nameEditPart, "state" + (i % 2 + 1));
+			i++;
+		}
+		checkCompactTimelinePattern("StateInvariant(state2);OccurrenceSpecification(state2_1_To_state1_1);StateInvariant(state1);" + "OccurrenceSpecification(state1_1_To_state2_2);StateInvariant(state2);OccurrenceSpecification(state2_2_To_state1_2);StateInvariant(state1);");
+	}
+
+	@Test
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	public void testDeleteStateInvariants() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+		final CompactStateInvariantEditPartCN compactStateInvariantEditPart = findStateInvariantsInDefaultCompactLifeline().get(1);
+		executeDestroyCommand(compactStateInvariantEditPart);
+		checkInteractionFragmentsWithPattern("-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-");
+		undoOnUIThread();
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+		redoOnUIThread();
+		checkInteractionFragmentsWithPattern("-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-");
+	}
+
+	@FailingTest("To be verified. Seems to be failing in all environments; not related to the DirectEdit issue")
+	@Test
+	public void testDeleteStateInvariantsWithOccurrencesOnTop() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+		final CompactStateInvariantEditPartCN s1 = findStateInvariantsInDefaultCompactLifeline().get(0);
+		final CompactStateInvariantEditPartCN s2 = findStateInvariantsInDefaultCompactLifeline().get(1);
+		final CompactStateInvariantEditPartCN s3 = findStateInvariantsInDefaultCompactLifeline().get(2);
+		final CompactStateInvariantEditPartCN s4 = findStateInvariantsInDefaultCompactLifeline().get(3);
+		createOccurrenceSpecificationOverCompactStateInvariant(s1, true);
+		createOccurrenceSpecificationOverCompactStateInvariant(s2, false);
+		createOccurrenceSpecificationOverCompactStateInvariant(s3, false);
+		createOccurrenceSpecificationOverCompactStateInvariant(s4, true);
+		flushEventLoop();
+		checkInteractionFragmentsWithPattern("-oo-oo-oo-o");
+		checkSimpleCompactTimelinePattern("-oo-oo-oo-o");
+
+		executeDestroyCommand(s1);
+		checkInteractionFragmentsWithPattern("-oo-oo-o");
+		checkSimpleCompactTimelinePattern("-oo-oo-o");
+		undoOnUIThread();
+		checkInteractionFragmentsWithPattern("-oo-oo-oo-o");
+		checkSimpleCompactTimelinePattern("-oo-oo-oo-o");
+		redoOnUIThread();
+		checkInteractionFragmentsWithPattern("-oo-oo-o");
+		checkSimpleCompactTimelinePattern("-oo-oo-o");
+
+		executeDestroyCommand(s4);
+		checkInteractionFragmentsWithPattern("-oo-o");
+		checkSimpleCompactTimelinePattern("-oo-o");
+
+		executeDestroyCommand(s2);
+		checkInteractionFragmentsWithPattern("-o");
+		checkSimpleCompactTimelinePattern("-o");
+	}
+
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testHideStateInvariants() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+		final CompactStateInvariantEditPartCN compactStateInvariantEditPart = findStateInvariantsInDefaultCompactLifeline().get(1);
+		executeHideCommand(compactStateInvariantEditPart);
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-");
+		undoOnUIThread();
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+		redoOnUIThread();
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleCompactTimelinePattern("-o-o-");
+	}
+
+	@Test
+	public void testCannotDeleteLastStateInvariant() {
+		checkInteractionFragmentsWithPattern("-");
+		checkSimpleCompactTimelinePattern("-");
+		final CompactStateInvariantEditPartCN compactStateInvariantEditPart = findStateInvariantsInDefaultCompactLifeline().get(0);
+		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		final Command command = compactStateInvariantEditPart.getCommand(destroyElementRequest);
+		assertFalse("We shouldn't be able to delete the last state invariant", command.canExecute());
+	}
+
+	@Test
+	public void testCannotHideLastStateInvariant() {
+		checkInteractionFragmentsWithPattern("-");
+		checkSimpleCompactTimelinePattern("-");
+		final CompactStateInvariantEditPartCN compactStateInvariantEditPart = findStateInvariantsInDefaultCompactLifeline().get(0);
+		final GroupRequest deleteViewRequest = new GroupRequest(org.eclipse.gef.RequestConstants.REQ_DELETE);
+		deleteViewRequest.setEditParts(compactStateInvariantEditPart);
+		final Command command = compactStateInvariantEditPart.getCommand(deleteViewRequest);
+		assertFalse("We shouldn't be able to hide the last state invariant", command.canExecute());
+	}
+
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testResizeCompactStateInvariant() {
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+		flushEventLoop();
+		checkSimpleCompactTimelinePattern("-o-o-o-");
+
+		final List<CompactStateInvariantEditPartCN> stateInvariantsEditParts = findStateInvariantsInDefaultCompactLifeline();
+		assertEquals("Wrong number of StateInvariants", 4, stateInvariantsEditParts.size());
+		final CompactStateInvariantEditPartCN s2 = stateInvariantsEditParts.get(1);
+		final CompactStateInvariantEditPartCN s3 = stateInvariantsEditParts.get(2);
+
+		createOccurrenceSpecificationOverCompactStateInvariant(s2, false);
+		createOccurrenceSpecificationOverCompactStateInvariant(s3, true);
+		flushEventLoop();
+		checkSimpleCompactTimelinePattern("-o-oo-oo-");
+
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultCompactLifeline();
+		assertEquals("Wrong number of OccurrenceSpecifications", 5, occurrenceSpecificationEditParts.size());
+
+		final OccurrenceSpecificationEditPartCN o1 = occurrenceSpecificationEditParts.get(0);
+		final OccurrenceSpecificationEditPartCN o2 = occurrenceSpecificationEditParts.get(1);
+		final OccurrenceSpecificationEditPartCN o3 = occurrenceSpecificationEditParts.get(2);
+		final OccurrenceSpecificationEditPartCN o4 = occurrenceSpecificationEditParts.get(3);
+		final OccurrenceSpecificationEditPartCN o5 = occurrenceSpecificationEditParts.get(4);
+
+		final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment();
+
+		// test shrink
+		testResizeCompactStateInvariant(s2, -9, o1, o2, o3, o4, o5, timelineCompartment);
+		// test grow
+		testResizeCompactStateInvariant(s2, 42, o1, o2, o3, o4, o5, timelineCompartment);
+	}
+
+	private void testResizeCompactStateInvariant(final CompactStateInvariantEditPartCN s2, final int widthDelta, final OccurrenceSpecificationEditPartCN o1, final OccurrenceSpecificationEditPartCN o2, final OccurrenceSpecificationEditPartCN o3, final OccurrenceSpecificationEditPartCN o4, final OccurrenceSpecificationEditPartCN o5, final CompactLifelineCompartmentEditPartCN timelineCompartment) {
+		final Rectangle o1Before = getBounds(o1);
+		final Rectangle o2Before = getBounds(o2);
+		final Rectangle o3Before = getBounds(o3);
+		final Rectangle o4Before = getBounds(o4);
+		final Rectangle o5Before = getBounds(o5);
+		final Rectangle boundsBefore = getBounds(s2);
+		resizeEditPart(s2, timelineCompartment, new Dimension(widthDelta, 0), PositionConstants.EAST);
+		final Rectangle o1After = getBounds(o1);
+		final Rectangle o2After = getBounds(o2);
+		final Rectangle o3After = getBounds(o3);
+		final Rectangle o4After = getBounds(o4);
+		final Rectangle o5After = getBounds(o5);
+		final Rectangle boundsAfter = getBounds(s2);
+		assertEquals("The Figure should have been resized horizontally", boundsBefore.width + widthDelta, boundsAfter.width);
+		assertEquals("The OccurrenceSpecification before it shouldn't have moved", o1Before.x, o1After.x);
+		assertEquals("The OccurrenceSpecification on top of it shouldn't have moved", o2Before.x, o2After.x);
+		assertEquals("The OccurrenceSpecifications after it should have moved", o3Before.x + widthDelta, o3After.x);
+		assertEquals("The OccurrenceSpecifications on the bottom of another state shouldn't have moved", o4Before.x, o4After.x);
+		assertEquals("The OccurrenceSpecifications after it should have moved", o5Before.x + widthDelta, o5After.x);
+		testUndoRedoChangeBoundsEditPart(s2, boundsBefore);
+	}
+
+	protected static void checkBounds(final Rectangle boundsAfter, final int minX, final int maxX) {
+		assertTrue("The second OccurrenceSpecification should always be after the first", boundsAfter.x > minX);
+		assertTrue("The second OccurrenceSpecification should always be before the third", boundsAfter.x < maxX);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java
index a6b38b006fb..d9445a3fc42 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java
@@ -1,97 +1,97 @@
-/*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.List;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.tools.CellEditorLocator;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.timing.custom.LifelineVerticalLabelCellEditorLocator;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineNameEditPart;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.UMLEditPartFactory;

-import org.eclipse.papyrus.uml.diagram.timing.providers.UMLElementTypes;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.NamedElement;

-import org.junit.Test;

-

-public class TestTimingDiagramFullLifeline extends AbstractTimingDiagramTestCase {

-

-	@Override

-	public void setUp() throws Exception {

-		// create the project, model and diagram

-		super.setUp();

-		createDefaultInteraction();

-	}

-

-	@Test

-	public void testCreateLifeline() {

-		createFullLifelineInDefaultInteraction();

-	}

-

-	@Test

-	public void testHideLifeline() {

-		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

-		testHide(lifelineEditPart);

-	}

-

-	@Test

-	public void testDeleteLifeline() {

-		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

-		testDelete(lifelineEditPart);

-	}

-

-	@Test

-	public void testDropLifeline() {

-		// create a Lifeline and hide its View, so as to be able to drop it after that

-		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

-		final Lifeline lifeline = (Lifeline)((View)lifelineEditPart.getModel()).getElement();

-		assertNotNull("The lifeline should not be null", lifeline);

-		testHide(lifelineEditPart);

-		testDrop(getDefaultInteractionCompartment(), getDefaultInteractionCompartment(), lifeline);

-	}

-

-	@Test

-	public void testCellEditorLocator() {

-		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

-		final FullLifelineNameEditPart fullLifelineNameEditPart = (FullLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, FullLifelineNameEditPart.VISUAL_ID);

-		assertNotNull("The FullLifelineNameEditPart was not found", fullLifelineNameEditPart);

-		final CellEditorLocator textCellEditorLocator = UMLEditPartFactory.getTextCellEditorLocator(fullLifelineNameEditPart);

-		assertTrue("The cell editor locator must be the one specific to the vertical label", textCellEditorLocator instanceof LifelineVerticalLabelCellEditorLocator);

-	}

-

-	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")

-	@Test

-	public void testEditLifelineName() {

-		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

-		final FullLifelineNameEditPart lifelineNameEditPart = (FullLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, FullLifelineNameEditPart.VISUAL_ID);

-		final NamedElement namedElement = (Lifeline)((View)lifelineEditPart.getModel()).getElement();

-		testSetNameWithDirectEditRequest(lifelineNameEditPart, namedElement);

-	}

-

-	@Test

-	public void create3LifelinesTest() {

-		final EditPart interactionCompartment = getDefaultInteractionCompartment();

-		assertNotNull("The interaction compartment was not found", interactionCompartment);

-		createView(UMLElementTypes.Lifeline_FullShape, interactionCompartment);

-		createView(UMLElementTypes.Lifeline_FullShape, interactionCompartment);

-		createView(UMLElementTypes.Lifeline_FullShape, interactionCompartment);

-		assertEquals("The interaction compartment should only contain the 3 lifelines", 3, interactionCompartment.getChildren().size());

-		final List<? extends EditPart> editParts = EditPartUtils.findChildEditPartsWithId(interactionCompartment, FullLifelineEditPartCN.VISUAL_ID);

-		assertEquals("The interaction compartment should contain 3 lifelines", 3, editParts.size());

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.timing.custom.LifelineVerticalLabelCellEditorLocator;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.UMLEditPartFactory;
+import org.eclipse.papyrus.uml.diagram.timing.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.NamedElement;
+import org.junit.Test;
+
+public class TestTimingDiagramFullLifeline extends AbstractTimingDiagramTestCase {
+
+	@Override
+	public void setUp() throws Exception {
+		// create the project, model and diagram
+		super.setUp();
+		createDefaultInteraction();
+	}
+
+	@Test
+	public void testCreateLifeline() {
+		createFullLifelineInDefaultInteraction();
+	}
+
+	@Test
+	public void testHideLifeline() {
+		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();
+		testHide(lifelineEditPart);
+	}
+
+	@Test
+	public void testDeleteLifeline() {
+		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();
+		testDelete(lifelineEditPart);
+	}
+
+	@Test
+	public void testDropLifeline() {
+		// create a Lifeline and hide its View, so as to be able to drop it after that
+		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();
+		final Lifeline lifeline = (Lifeline)((View)lifelineEditPart.getModel()).getElement();
+		assertNotNull("The lifeline should not be null", lifeline);
+		testHide(lifelineEditPart);
+		testDrop(getDefaultInteractionCompartment(), getDefaultInteractionCompartment(), lifeline);
+	}
+
+	@Test
+	public void testCellEditorLocator() {
+		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();
+		final FullLifelineNameEditPart fullLifelineNameEditPart = (FullLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, FullLifelineNameEditPart.VISUAL_ID);
+		assertNotNull("The FullLifelineNameEditPart was not found", fullLifelineNameEditPart);
+		final CellEditorLocator textCellEditorLocator = UMLEditPartFactory.getTextCellEditorLocator(fullLifelineNameEditPart);
+		assertTrue("The cell editor locator must be the one specific to the vertical label", textCellEditorLocator instanceof LifelineVerticalLabelCellEditorLocator);
+	}
+
+	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")
+	@Test
+	public void testEditLifelineName() {
+		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();
+		final FullLifelineNameEditPart lifelineNameEditPart = (FullLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, FullLifelineNameEditPart.VISUAL_ID);
+		final NamedElement namedElement = (Lifeline)((View)lifelineEditPart.getModel()).getElement();
+		testSetNameWithDirectEditRequest(lifelineNameEditPart, namedElement);
+	}
+
+	@Test
+	public void create3LifelinesTest() {
+		final EditPart interactionCompartment = getDefaultInteractionCompartment();
+		assertNotNull("The interaction compartment was not found", interactionCompartment);
+		createView(UMLElementTypes.Lifeline_FullShape, interactionCompartment);
+		createView(UMLElementTypes.Lifeline_FullShape, interactionCompartment);
+		createView(UMLElementTypes.Lifeline_FullShape, interactionCompartment);
+		assertEquals("The interaction compartment should only contain the 3 lifelines", 3, interactionCompartment.getChildren().size());
+		final List<? extends EditPart> editParts = EditPartUtils.findChildEditPartsWithId(interactionCompartment, FullLifelineEditPartCN.VISUAL_ID);
+		assertEquals("The interaction compartment should contain 3 lifelines", 3, editParts.size());
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifelineLayout.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifelineLayout.java
index 742005ce9c6..3c8b52f2592 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifelineLayout.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifelineLayout.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

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionEditPartTN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.StateDefinitionEditPart;

-import org.junit.Test;

-

-public class TestTimingDiagramFullLifelineLayout extends AbstractTimingDiagramTestCase {

-

-	/**

-	 * This tests the layout of StateDefinitions, with some error margins in order to accommodate possible future

-	 * modifications of the layout.

-	 */

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testStateDefinitionsLayout() {

-		final Point interactionLocation = new Point(12, 17);

-		final Dimension interactionSize = new Dimension(867, 729);

-		final InteractionEditPartTN interactionEditPart = createInteraction(interactionLocation, interactionSize);

-		assertBounds(interactionEditPart, interactionLocation, interactionSize, 0, 0, 0, 0);

-		final FullLifelineEditPartCN lifelineEditPart = createFullLifeline(interactionEditPart);

-		assertBounds(lifelineEditPart, new Rectangle(23, 45, 845, 694), 50, 50, 100, 100);

-		// a single StateDefinition: should be centered

-		final StateDefinitionEditPart stateDefinition1 = createStateDefinition(lifelineEditPart);

-		assertBounds(stateDefinition1, new Rectangle(84, 382, 40, 20), 50, 50, 30, 10);

-		// two StateDefinitions: should be regularly spaced

-		final StateDefinitionEditPart stateDefinition2 = createStateDefinition(lifelineEditPart);

-		assertBounds(stateDefinition1, new Rectangle(84, 266, 40, 20), 50, 50, 30, 10);

-		assertBounds(stateDefinition2, new Rectangle(84, 498, 40, 20), 50, 50, 30, 10);

-		// three StateDefinitions: should be regularly spaced

-		final StateDefinitionEditPart stateDefinition3 = createStateDefinition(lifelineEditPart);

-		assertBounds(stateDefinition1, new Rectangle(84, 151, 40, 20), 50, 50, 30, 10);

-		assertBounds(stateDefinition2, new Rectangle(84, 382, 40, 20), 50, 50, 30, 10);

-		assertBounds(stateDefinition3, new Rectangle(84, 613, 40, 20), 50, 50, 30, 10);

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionEditPartTN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.StateDefinitionEditPart;
+import org.junit.Test;
+
+public class TestTimingDiagramFullLifelineLayout extends AbstractTimingDiagramTestCase {
+
+	/**
+	 * This tests the layout of StateDefinitions, with some error margins in order to accommodate possible future
+	 * modifications of the layout.
+	 */
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testStateDefinitionsLayout() {
+		final Point interactionLocation = new Point(12, 17);
+		final Dimension interactionSize = new Dimension(867, 729);
+		final InteractionEditPartTN interactionEditPart = createInteraction(interactionLocation, interactionSize);
+		assertBounds(interactionEditPart, interactionLocation, interactionSize, 0, 0, 0, 0);
+		final FullLifelineEditPartCN lifelineEditPart = createFullLifeline(interactionEditPart);
+		assertBounds(lifelineEditPart, new Rectangle(23, 45, 845, 694), 50, 50, 100, 100);
+		// a single StateDefinition: should be centered
+		final StateDefinitionEditPart stateDefinition1 = createStateDefinition(lifelineEditPart);
+		assertBounds(stateDefinition1, new Rectangle(84, 382, 40, 20), 50, 50, 30, 10);
+		// two StateDefinitions: should be regularly spaced
+		final StateDefinitionEditPart stateDefinition2 = createStateDefinition(lifelineEditPart);
+		assertBounds(stateDefinition1, new Rectangle(84, 266, 40, 20), 50, 50, 30, 10);
+		assertBounds(stateDefinition2, new Rectangle(84, 498, 40, 20), 50, 50, 30, 10);
+		// three StateDefinitions: should be regularly spaced
+		final StateDefinitionEditPart stateDefinition3 = createStateDefinition(lifelineEditPart);
+		assertBounds(stateDefinition1, new Rectangle(84, 151, 40, 20), 50, 50, 30, 10);
+		assertBounds(stateDefinition2, new Rectangle(84, 382, 40, 20), 50, 50, 30, 10);
+		assertBounds(stateDefinition3, new Rectangle(84, 613, 40, 20), 50, 50, 30, 10);
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java
index edb3aeaf21e..a13a2648629 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java
@@ -1,297 +1,297 @@
-/*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineTimelineCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.OccurrenceSpecificationEditPartCN;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.OccurrenceSpecification;

-import org.eclipse.uml2.uml.StateInvariant;

-import org.junit.Ignore;

-import org.junit.Test;

-

-public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTimingDiagramTestCase {

-

-	@Override

-	public void setUp() throws Exception {

-		// create the project, model and diagram

-		super.setUp();

-		createDefaultInteraction();

-		createDefaultFullLifeline();

-		createThreeStateDefinitionsInDefaultFullLifeline();

-	}

-

-	@Test

-	public void testModelWithThreeOccurrenceSpecifications() {

-		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

-		final View interactionView = (View)getDefaultInteractionEditPart().getModel();

-		final Interaction interaction = (Interaction)interactionView.getElement();

-		assertTrue("The interaction should be in a Model", isInModel(interaction));

-		// We created 3 OccurrenceSpecifications. The model starts and ends with a StateInvariant, and when creating an

-		// OccurrenceSpecification, we split a StateInvariant in two and insert the OccurrenceSpecification.

-		// So, it should look like : "-o-o-o-" (with "-" for StateInvariant and "O" for OccurrenceSpecification)

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-	}

-

-	@Test

-	public void testDeleteOccurrenceSpecification() {

-		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecifications = findOccurrenceSpecificationsInDefaultFullLifeline();

-		assertEquals("Wrong number of OccurrenceSpecifications", 3, occurrenceSpecifications.size());

-		final OccurrenceSpecificationEditPartCN middleOccurrence = occurrenceSpecifications.get(1);

-

-		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)((View)middleOccurrence.getModel()).getElement();

-		assertTrue("The OccurrenceSpecification should be in a Model", isInModel(occurrenceSpecification));

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-

-		// destroy the middle OccurrenceSpecification

-		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		final Command command = middleOccurrence.getCommand(destroyElementRequest);

-		checkCommand(command);

-		execute(command);

-		assertEquals("There should be one less OccurrenceSpecification", 2, findOccurrenceSpecificationsInDefaultFullLifeline().size());

-		assertFalse("The OccurrenceSpecification should not be in the Model after deleting it", isInModel(occurrenceSpecification));

-		checkInteractionFragmentsWithPattern("-o-o-");

-

-		// test undo

-		undo();

-		assertEquals("The OccurrenceSpecification should be back after the undo", 3, findOccurrenceSpecificationsInDefaultFullLifeline().size());

-		assertTrue("The OccurrenceSpecification should be back in the Model after undoing the deletion", isInModel(occurrenceSpecification));

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-

-		// test redo

-		redo();

-		assertEquals("The OccurrenceSpecification should be removed after the redo", 2, findOccurrenceSpecificationsInDefaultFullLifeline().size());

-		assertFalse("The OccurrenceSpecification should not be in the Model after redoing the deletion", isInModel(occurrenceSpecification));

-		checkInteractionFragmentsWithPattern("-o-o-");

-	}

-

-	@Test

-	public void testCreateOccurrenceSpecificationWithDoubleClick() {

-		final FullStateInvariantEditPartCN stateInvariantEditPart = (FullStateInvariantEditPartCN)EditPartUtils.findFirstChildEditPartWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);

-		assertNotNull("A StateInvariant must always exist", stateInvariantEditPart);

-		assertEquals("There must always be only one StateInvariant initially", 1, findStateInvariantsInDefaultFullLifeline().size());

-		final StateInvariant stateInvariant = (StateInvariant)((View)stateInvariantEditPart.getModel()).getElement();

-		assertNotNull("The StateInvariant must not be null", stateInvariant);

-

-		final IFigure figure = stateInvariantEditPart.getFigure();

-		final Rectangle bounds = new Rectangle(figure.getBounds());

-		figure.getParent().translateToAbsolute(bounds);

-

-		// click at the center of the StateInvariant line

-		final int x = bounds.x + bounds.width / 2;

-		final int y = bounds.y + bounds.height / 2;

-

-		// send the open request (corresponding to a double-click)

-		sendOpenSelectionRequest(stateInvariantEditPart, new Point(x, y));

-		flushEventLoop();

-		checkCreatedStateInvariants();

-		flushEventLoop();

-		checkCreatedOccurrenceSpecification();

-

-		// test undo

-		undoOnUIThread();

-		assertEquals("There must be one StateInvariant after undo", 1, findStateInvariantsInDefaultFullLifeline().size());

-		assertEquals("There must be no OccurrenceSpecification after undo", 0, findOccurrenceSpecificationsInDefaultFullLifeline().size());

-

-		// test redo

-		redoOnUIThread();

-		assertEquals("There must be two StateInvariants after redo", 2, findStateInvariantsInDefaultFullLifeline().size());

-		checkCreatedOccurrenceSpecification();

-	}

-

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testCreateOccurrenceSpecificationWithPaletteTool() {

-		// let GMF do its layout (in order for the Figure coordinates to be set)

-		flushEventLoop();

-		final FullStateInvariantEditPartCN stateInvariantEditPart = (FullStateInvariantEditPartCN)EditPartUtils.findFirstChildEditPartWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);

-		assertNotNull("A StateInvariant must always exist", stateInvariantEditPart);

-

-		// use the OccurrenceSpecification creation tool to create a new OccurrenceSpecification

-		clickTool("createOccurrenceSpecificationCreationTool", stateInvariantEditPart);

-

-		checkCreatedStateInvariants();

-		checkCreatedOccurrenceSpecification();

-

-		// test undo

-		undoOnUIThread();

-		assertEquals("There must be one StateInvariant after undo", 1, findStateInvariantsInDefaultFullLifeline().size());

-		assertEquals("There must be no OccurrenceSpecification after undo", 0, findOccurrenceSpecificationsInDefaultFullLifeline().size());

-

-		// test redo

-		redoOnUIThread();

-		assertEquals("There must be two StateInvariants after redo", 2, findStateInvariantsInDefaultFullLifeline().size());

-		checkCreatedOccurrenceSpecification();

-	}

-

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testMoveOccurrenceSpecification() {

-		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

-		flushEventLoop();

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultFullLifeline();

-		assertEquals("Wrong number of OccurrenceSpecifications", 3, occurrenceSpecificationEditParts.size());

-

-		final OccurrenceSpecificationEditPartCN first = occurrenceSpecificationEditParts.get(0);

-		final OccurrenceSpecificationEditPartCN second = occurrenceSpecificationEditParts.get(1);

-		final OccurrenceSpecificationEditPartCN third = occurrenceSpecificationEditParts.get(2);

-

-		final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment();

-

-		final int minX = getBounds(first).x;

-		final int maxX = getBounds(third).x;

-

-		// shift to the left

-		Rectangle boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(-9, 0));

-		Rectangle boundsAfter = getBounds(second);

-		assertEquals("The Figure should have been moved 9 pixels to the left", boundsBefore.x - 9, boundsAfter.x);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-

-		// shift to the right

-		boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(13, 0));

-		boundsAfter = getBounds(second);

-		assertEquals("The Figure should have been moved 13 pixels to the right", boundsBefore.x + 13, boundsAfter.x);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-

-		// try to move past the previous OccurrenceSpecification (should be forbidden)

-		boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(-(boundsBefore.x - minX + 10), 0));

-		boundsAfter = getBounds(second);

-		assertTrue("The Figure should be constrained, but still move", boundsAfter.x < boundsBefore.x);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-

-		// try to move past the following OccurrenceSpecification (should be forbidden)

-		boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(maxX - boundsBefore.x + 10, 0));

-		boundsAfter = getBounds(second);

-		assertTrue("The Figure should be constrained, but still move", boundsAfter.x > boundsBefore.x);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-

-		// try to move horizontally and vertically at the same time (should be constrained to an horizontal-only move)

-		boundsBefore = getBounds(second);

-		moveEditPart(second, timelineCompartment, new Point(-17, 123));

-		boundsAfter = getBounds(second);

-		assertEquals("The Figure should have been moved 17 pixels to the left", boundsBefore.x - 17, boundsAfter.x);

-		assertEquals("The Figure should not move vertically", boundsBefore.y, boundsAfter.y);

-		checkBounds(boundsAfter, minX, maxX);

-		testUndoRedoChangeBoundsEditPart(second, boundsBefore);

-	}

-

-	/**

-	 * When moving several OccurrenceSpecifications, we don't want the previous positions of the elements to constrain

-	 * the future positions of the elements being moved.

-	 */

-	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test

-	public void testMoveAdjacentOccurrenceSpecifications() {

-		// create two OccurrenceSpecifications close to each other

-		createOccurrenceSpecificationInLastFullStateInvariantAtAbsolutePos(1, 100);

-		createOccurrenceSpecificationInLastFullStateInvariantAtAbsolutePos(2, 10);

-		flushEventLoop();

-

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultFullLifeline();

-		assertEquals("Wrong number of OccurrenceSpecifications", 2, occurrenceSpecificationEditParts.size());

-

-		final OccurrenceSpecificationEditPartCN first = occurrenceSpecificationEditParts.get(0);

-		final OccurrenceSpecificationEditPartCN second = occurrenceSpecificationEditParts.get(1);

-		final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment();

-

-		// shift both to the left

-		final Rectangle firstBefore = getBounds(first);

-		final Rectangle secondBefore = getBounds(second);

-		moveEditParts(Arrays.asList(first, second), timelineCompartment, new Point(-50, 0));

-		final Rectangle firstAfter = getBounds(first);

-		final Rectangle secondAfter = getBounds(second);

-		assertEquals("The first Figure should have been moved 50 pixels to the left", firstBefore.x - 50, firstAfter.x);

-		assertEquals("The second Figure should have been moved 50 pixels to the left", secondBefore.x - 50, secondAfter.x);

-	}

-

-	protected static void checkBounds(final Rectangle boundsAfter, final int minX, final int maxX) {

-		assertTrue("The second OccurrenceSpecification should always be after the first", boundsAfter.x > minX);

-		assertTrue("The second OccurrenceSpecification should always be before the third", boundsAfter.x < maxX);

-	}

-

-	@Ignore("Test is not implemented")

-	@Test

-	public void testMoveVerticalLine() {

-		// TODO: test that moving a vertical line moves the preceding occurrence specification

-	}

-

-	@Test

-	public void testFullUndoRedo() {

-		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

-		// 3 OccurrenceSpecifications + 3 StateDefinitions + 1 Lifeline + 1 Interaction

-		final int nElementsToUndo = 8;

-		testDirtyStateForFullUndoRedo(nElementsToUndo);

-	}

-

-	protected void checkCreatedStateInvariants() {

-		// check the StateInvariants

-		flushEventLoop();

-		final List<FullStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultFullLifeline();

-		assertEquals("There must be two StateInvariants after creating an OccurrenceSpecification", 2, stateInvariantEditParts.size());

-		checkStateInvariant(stateInvariantEditParts.get(0));

-		checkStateInvariant(stateInvariantEditParts.get(1));

-	}

-

-	private void checkCreatedOccurrenceSpecification() {

-		flushEventLoop();

-		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultFullLifeline();

-		assertEquals("There must be one OccurrenceSpecification", 1, occurrenceSpecificationEditParts.size());

-		final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart = occurrenceSpecificationEditParts.get(0);

-		final View occurrenceSpecificationView = (View)occurrenceSpecificationEditPart.getModel();

-		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)occurrenceSpecificationView.getElement();

-		assertNotNull("The OccurrenceSpecification must not be null", occurrenceSpecification);

-		assertTrue("The OccurrenceSpecification must be in the model", isInModel(occurrenceSpecification));

-		assertEquals("The OccurrenceSpecification must cover one Lifeline", 1, occurrenceSpecification.getCovereds().size());

-		final Lifeline lifeline = (Lifeline)((View)getDefaultFullLifelineEditPart().getModel()).getElement();

-		assertEquals("The OccurrenceSpecification must cover the Lifeline", lifeline, occurrenceSpecification.getCovereds().get(0));

-		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();

-		assertTrue("The OccurrenceSpecification must be in the Interaction", interaction.getFragments().contains(occurrenceSpecification));

-	}

-

-	private void checkStateInvariant(final FullStateInvariantEditPartCN fullStateInvariantEditPartCN) {

-		final View stateInvariantView = (View)fullStateInvariantEditPartCN.getModel();

-		final StateInvariant stateInvariant = (StateInvariant)stateInvariantView.getElement();

-		assertNotNull("The StateInvariant must not be null", stateInvariant);

-		assertTrue("The StateInvariant must be in the model", isInModel(stateInvariant));

-		assertEquals("The StateInvariant must cover one Lifeline", 1, stateInvariant.getCovereds().size());

-		final Lifeline lifeline = (Lifeline)((View)getDefaultFullLifelineEditPart().getModel()).getElement();

-		assertEquals("The StateInvariant must cover the Lifeline", lifeline, stateInvariant.getCovereds().get(0));

-		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();

-		assertTrue("The StateInvariant must be in the Interaction", interaction.getFragments().contains(stateInvariant));

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineTimelineCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.OccurrenceSpecificationEditPartCN;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.OccurrenceSpecification;
+import org.eclipse.uml2.uml.StateInvariant;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTimingDiagramTestCase {
+
+	@Override
+	public void setUp() throws Exception {
+		// create the project, model and diagram
+		super.setUp();
+		createDefaultInteraction();
+		createDefaultFullLifeline();
+		createThreeStateDefinitionsInDefaultFullLifeline();
+	}
+
+	@Test
+	public void testModelWithThreeOccurrenceSpecifications() {
+		createThreeOccurrenceSpecificationsInDefaultFullLifeline();
+		final View interactionView = (View)getDefaultInteractionEditPart().getModel();
+		final Interaction interaction = (Interaction)interactionView.getElement();
+		assertTrue("The interaction should be in a Model", isInModel(interaction));
+		// We created 3 OccurrenceSpecifications. The model starts and ends with a StateInvariant, and when creating an
+		// OccurrenceSpecification, we split a StateInvariant in two and insert the OccurrenceSpecification.
+		// So, it should look like : "-o-o-o-" (with "-" for StateInvariant and "O" for OccurrenceSpecification)
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+	}
+
+	@Test
+	public void testDeleteOccurrenceSpecification() {
+		createThreeOccurrenceSpecificationsInDefaultFullLifeline();
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecifications = findOccurrenceSpecificationsInDefaultFullLifeline();
+		assertEquals("Wrong number of OccurrenceSpecifications", 3, occurrenceSpecifications.size());
+		final OccurrenceSpecificationEditPartCN middleOccurrence = occurrenceSpecifications.get(1);
+
+		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)((View)middleOccurrence.getModel()).getElement();
+		assertTrue("The OccurrenceSpecification should be in a Model", isInModel(occurrenceSpecification));
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+
+		// destroy the middle OccurrenceSpecification
+		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		final Command command = middleOccurrence.getCommand(destroyElementRequest);
+		checkCommand(command);
+		execute(command);
+		assertEquals("There should be one less OccurrenceSpecification", 2, findOccurrenceSpecificationsInDefaultFullLifeline().size());
+		assertFalse("The OccurrenceSpecification should not be in the Model after deleting it", isInModel(occurrenceSpecification));
+		checkInteractionFragmentsWithPattern("-o-o-");
+
+		// test undo
+		undo();
+		assertEquals("The OccurrenceSpecification should be back after the undo", 3, findOccurrenceSpecificationsInDefaultFullLifeline().size());
+		assertTrue("The OccurrenceSpecification should be back in the Model after undoing the deletion", isInModel(occurrenceSpecification));
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+
+		// test redo
+		redo();
+		assertEquals("The OccurrenceSpecification should be removed after the redo", 2, findOccurrenceSpecificationsInDefaultFullLifeline().size());
+		assertFalse("The OccurrenceSpecification should not be in the Model after redoing the deletion", isInModel(occurrenceSpecification));
+		checkInteractionFragmentsWithPattern("-o-o-");
+	}
+
+	@Test
+	public void testCreateOccurrenceSpecificationWithDoubleClick() {
+		final FullStateInvariantEditPartCN stateInvariantEditPart = (FullStateInvariantEditPartCN)EditPartUtils.findFirstChildEditPartWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);
+		assertNotNull("A StateInvariant must always exist", stateInvariantEditPart);
+		assertEquals("There must always be only one StateInvariant initially", 1, findStateInvariantsInDefaultFullLifeline().size());
+		final StateInvariant stateInvariant = (StateInvariant)((View)stateInvariantEditPart.getModel()).getElement();
+		assertNotNull("The StateInvariant must not be null", stateInvariant);
+
+		final IFigure figure = stateInvariantEditPart.getFigure();
+		final Rectangle bounds = new Rectangle(figure.getBounds());
+		figure.getParent().translateToAbsolute(bounds);
+
+		// click at the center of the StateInvariant line
+		final int x = bounds.x + bounds.width / 2;
+		final int y = bounds.y + bounds.height / 2;
+
+		// send the open request (corresponding to a double-click)
+		sendOpenSelectionRequest(stateInvariantEditPart, new Point(x, y));
+		flushEventLoop();
+		checkCreatedStateInvariants();
+		flushEventLoop();
+		checkCreatedOccurrenceSpecification();
+
+		// test undo
+		undoOnUIThread();
+		assertEquals("There must be one StateInvariant after undo", 1, findStateInvariantsInDefaultFullLifeline().size());
+		assertEquals("There must be no OccurrenceSpecification after undo", 0, findOccurrenceSpecificationsInDefaultFullLifeline().size());
+
+		// test redo
+		redoOnUIThread();
+		assertEquals("There must be two StateInvariants after redo", 2, findStateInvariantsInDefaultFullLifeline().size());
+		checkCreatedOccurrenceSpecification();
+	}
+
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testCreateOccurrenceSpecificationWithPaletteTool() {
+		// let GMF do its layout (in order for the Figure coordinates to be set)
+		flushEventLoop();
+		final FullStateInvariantEditPartCN stateInvariantEditPart = (FullStateInvariantEditPartCN)EditPartUtils.findFirstChildEditPartWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);
+		assertNotNull("A StateInvariant must always exist", stateInvariantEditPart);
+
+		// use the OccurrenceSpecification creation tool to create a new OccurrenceSpecification
+		clickTool("createOccurrenceSpecificationCreationTool", stateInvariantEditPart);
+
+		checkCreatedStateInvariants();
+		checkCreatedOccurrenceSpecification();
+
+		// test undo
+		undoOnUIThread();
+		assertEquals("There must be one StateInvariant after undo", 1, findStateInvariantsInDefaultFullLifeline().size());
+		assertEquals("There must be no OccurrenceSpecification after undo", 0, findOccurrenceSpecificationsInDefaultFullLifeline().size());
+
+		// test redo
+		redoOnUIThread();
+		assertEquals("There must be two StateInvariants after redo", 2, findStateInvariantsInDefaultFullLifeline().size());
+		checkCreatedOccurrenceSpecification();
+	}
+
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testMoveOccurrenceSpecification() {
+		createThreeOccurrenceSpecificationsInDefaultFullLifeline();
+		flushEventLoop();
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultFullLifeline();
+		assertEquals("Wrong number of OccurrenceSpecifications", 3, occurrenceSpecificationEditParts.size());
+
+		final OccurrenceSpecificationEditPartCN first = occurrenceSpecificationEditParts.get(0);
+		final OccurrenceSpecificationEditPartCN second = occurrenceSpecificationEditParts.get(1);
+		final OccurrenceSpecificationEditPartCN third = occurrenceSpecificationEditParts.get(2);
+
+		final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment();
+
+		final int minX = getBounds(first).x;
+		final int maxX = getBounds(third).x;
+
+		// shift to the left
+		Rectangle boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(-9, 0));
+		Rectangle boundsAfter = getBounds(second);
+		assertEquals("The Figure should have been moved 9 pixels to the left", boundsBefore.x - 9, boundsAfter.x);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+
+		// shift to the right
+		boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(13, 0));
+		boundsAfter = getBounds(second);
+		assertEquals("The Figure should have been moved 13 pixels to the right", boundsBefore.x + 13, boundsAfter.x);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+
+		// try to move past the previous OccurrenceSpecification (should be forbidden)
+		boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(-(boundsBefore.x - minX + 10), 0));
+		boundsAfter = getBounds(second);
+		assertTrue("The Figure should be constrained, but still move", boundsAfter.x < boundsBefore.x);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+
+		// try to move past the following OccurrenceSpecification (should be forbidden)
+		boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(maxX - boundsBefore.x + 10, 0));
+		boundsAfter = getBounds(second);
+		assertTrue("The Figure should be constrained, but still move", boundsAfter.x > boundsBefore.x);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+
+		// try to move horizontally and vertically at the same time (should be constrained to an horizontal-only move)
+		boundsBefore = getBounds(second);
+		moveEditPart(second, timelineCompartment, new Point(-17, 123));
+		boundsAfter = getBounds(second);
+		assertEquals("The Figure should have been moved 17 pixels to the left", boundsBefore.x - 17, boundsAfter.x);
+		assertEquals("The Figure should not move vertically", boundsBefore.y, boundsAfter.y);
+		checkBounds(boundsAfter, minX, maxX);
+		testUndoRedoChangeBoundsEditPart(second, boundsBefore);
+	}
+
+	/**
+	 * When moving several OccurrenceSpecifications, we don't want the previous positions of the elements to constrain
+	 * the future positions of the elements being moved.
+	 */
+	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")
+	@Test
+	public void testMoveAdjacentOccurrenceSpecifications() {
+		// create two OccurrenceSpecifications close to each other
+		createOccurrenceSpecificationInLastFullStateInvariantAtAbsolutePos(1, 100);
+		createOccurrenceSpecificationInLastFullStateInvariantAtAbsolutePos(2, 10);
+		flushEventLoop();
+
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultFullLifeline();
+		assertEquals("Wrong number of OccurrenceSpecifications", 2, occurrenceSpecificationEditParts.size());
+
+		final OccurrenceSpecificationEditPartCN first = occurrenceSpecificationEditParts.get(0);
+		final OccurrenceSpecificationEditPartCN second = occurrenceSpecificationEditParts.get(1);
+		final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment();
+
+		// shift both to the left
+		final Rectangle firstBefore = getBounds(first);
+		final Rectangle secondBefore = getBounds(second);
+		moveEditParts(Arrays.asList(first, second), timelineCompartment, new Point(-50, 0));
+		final Rectangle firstAfter = getBounds(first);
+		final Rectangle secondAfter = getBounds(second);
+		assertEquals("The first Figure should have been moved 50 pixels to the left", firstBefore.x - 50, firstAfter.x);
+		assertEquals("The second Figure should have been moved 50 pixels to the left", secondBefore.x - 50, secondAfter.x);
+	}
+
+	protected static void checkBounds(final Rectangle boundsAfter, final int minX, final int maxX) {
+		assertTrue("The second OccurrenceSpecification should always be after the first", boundsAfter.x > minX);
+		assertTrue("The second OccurrenceSpecification should always be before the third", boundsAfter.x < maxX);
+	}
+
+	@Ignore("Test is not implemented")
+	@Test
+	public void testMoveVerticalLine() {
+		// TODO: test that moving a vertical line moves the preceding occurrence specification
+	}
+
+	@Test
+	public void testFullUndoRedo() {
+		createThreeOccurrenceSpecificationsInDefaultFullLifeline();
+		// 3 OccurrenceSpecifications + 3 StateDefinitions + 1 Lifeline + 1 Interaction
+		final int nElementsToUndo = 8;
+		testDirtyStateForFullUndoRedo(nElementsToUndo);
+	}
+
+	protected void checkCreatedStateInvariants() {
+		// check the StateInvariants
+		flushEventLoop();
+		final List<FullStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultFullLifeline();
+		assertEquals("There must be two StateInvariants after creating an OccurrenceSpecification", 2, stateInvariantEditParts.size());
+		checkStateInvariant(stateInvariantEditParts.get(0));
+		checkStateInvariant(stateInvariantEditParts.get(1));
+	}
+
+	private void checkCreatedOccurrenceSpecification() {
+		flushEventLoop();
+		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultFullLifeline();
+		assertEquals("There must be one OccurrenceSpecification", 1, occurrenceSpecificationEditParts.size());
+		final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart = occurrenceSpecificationEditParts.get(0);
+		final View occurrenceSpecificationView = (View)occurrenceSpecificationEditPart.getModel();
+		final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)occurrenceSpecificationView.getElement();
+		assertNotNull("The OccurrenceSpecification must not be null", occurrenceSpecification);
+		assertTrue("The OccurrenceSpecification must be in the model", isInModel(occurrenceSpecification));
+		assertEquals("The OccurrenceSpecification must cover one Lifeline", 1, occurrenceSpecification.getCovereds().size());
+		final Lifeline lifeline = (Lifeline)((View)getDefaultFullLifelineEditPart().getModel()).getElement();
+		assertEquals("The OccurrenceSpecification must cover the Lifeline", lifeline, occurrenceSpecification.getCovereds().get(0));
+		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();
+		assertTrue("The OccurrenceSpecification must be in the Interaction", interaction.getFragments().contains(occurrenceSpecification));
+	}
+
+	private void checkStateInvariant(final FullStateInvariantEditPartCN fullStateInvariantEditPartCN) {
+		final View stateInvariantView = (View)fullStateInvariantEditPartCN.getModel();
+		final StateInvariant stateInvariant = (StateInvariant)stateInvariantView.getElement();
+		assertNotNull("The StateInvariant must not be null", stateInvariant);
+		assertTrue("The StateInvariant must be in the model", isInModel(stateInvariant));
+		assertEquals("The StateInvariant must cover one Lifeline", 1, stateInvariant.getCovereds().size());
+		final Lifeline lifeline = (Lifeline)((View)getDefaultFullLifelineEditPart().getModel()).getElement();
+		assertEquals("The StateInvariant must cover the Lifeline", lifeline, stateInvariant.getCovereds().get(0));
+		final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement();
+		assertTrue("The StateInvariant must be in the Interaction", interaction.getFragments().contains(stateInvariant));
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullStateInvariant.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullStateInvariant.java
index 1b92996d7f8..8aa32e04d7b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullStateInvariant.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullStateInvariant.java
@@ -1,105 +1,105 @@
-/*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-

-import java.util.List;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.StateDefinitionEditPart;

-import org.junit.Test;

-

-public class TestTimingDiagramFullStateInvariant extends AbstractTimingDiagramTestCase {

-

-	@Override

-	public void setUp() throws Exception {

-		// create the project, model and diagram

-		super.setUp();

-		createDefaultInteraction(new Point(0, 0), new Dimension(800, 600));

-		createDefaultFullLifeline();

-		createThreeStateDefinitionsInDefaultFullLifeline();

-		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

-	}

-

-	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")

-	@Test

-	public void testMoveStateInvariants() {

-		final List<FullStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultFullLifeline();

-		assertEquals("We should have 4 StateInvariants at the beginning of this test", 4, stateInvariantEditParts.size());

-		final List<StateDefinitionEditPart> stateDefinitionEditParts = findStateDefinitions();

-		assertEquals("We should have 3 StateDefinitions at the beginning of this test", 3, stateDefinitionEditParts.size());

-

-		// computeTimelineStringPattern();

-		checkFullTimelinePattern("StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 1_2);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_2_To_State 1_3);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_3_To_State 1_4);VerticalLine;" + "StateInvariant(State 1);");

-

-		final Rectangle stateDefBounds1 = getAbsoluteBounds(stateDefinitionEditParts.get(0));

-		final Rectangle stateDefBounds2 = getAbsoluteBounds(stateDefinitionEditParts.get(1));

-		// final Rectangle stateDefBounds3 = getAbsoluteBounds(stateDefinitionEditParts.get(2));

-		final int distanceBetweenStates = stateDefBounds2.y - stateDefBounds1.y;

-

-		// final Rectangle stateInvBounds1 = getAbsoluteBounds(stateInvariantEditParts.get(0));

-		// final Rectangle stateInvBounds2 = getAbsoluteBounds(stateInvariantEditParts.get(1));

-		// final Rectangle stateInvBounds3 = getAbsoluteBounds(stateInvariantEditParts.get(2));

-		// final Rectangle stateInvBounds4 = getAbsoluteBounds(stateInvariantEditParts.get(3));

-

-		// TODO: check state invariant in front of state definitions

-

-		moveEditPart(stateInvariantEditParts.get(0), getDefaultFullLifelineTimelineCompartment(), new Point(0, distanceBetweenStates));

-		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 1_2);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_2_To_State 1_3);VerticalLine;StateInvariant(State 1);");

-		moveEditPart(stateInvariantEditParts.get(1), getDefaultFullLifelineTimelineCompartment(), new Point(0, 2 * distanceBetweenStates));

-		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 1_2);VerticalLine;StateInvariant(State 1);");

-		moveEditPart(stateInvariantEditParts.get(3), getDefaultFullLifelineTimelineCompartment(), new Point(0, distanceBetweenStates));

-		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 2_2);VerticalLine;StateInvariant(State 2);");

-		moveEditPart(stateInvariantEditParts.get(3), getDefaultFullLifelineTimelineCompartment(), new Point(0, distanceBetweenStates));

-		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 3_2);VerticalLine;StateInvariant(State 3);");

-		moveEditPart(stateInvariantEditParts.get(2), getDefaultFullLifelineTimelineCompartment(), new Point(0, 2 * distanceBetweenStates));

-		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 3_2);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_2_To_State 3_3);VerticalLine;StateInvariant(State 3);");

-		moveEditPart(stateInvariantEditParts.get(2), getDefaultFullLifelineTimelineCompartment(), new Point(0, -distanceBetweenStates));

-		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 2_2);VerticalLine;" + "StateInvariant(State 2);OccurrenceSpecification(State 2_2_To_State 3_2);VerticalLine;StateInvariant(State 3);");

-		moveEditPart(stateInvariantEditParts.get(1), getDefaultFullLifelineTimelineCompartment(), new Point(0, -2 * distanceBetweenStates));

-		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 2_2);VerticalLine;" + "StateInvariant(State 2);OccurrenceSpecification(State 2_2_To_State 3_1);VerticalLine;StateInvariant(State 3);");

-	}

-

-	@Test

-	public void testDeleteStateInvariants() {

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleFullTimelinePattern("-o|-o|-o|-");

-		final FullStateInvariantEditPartCN stateInvariantEditPart = findStateInvariantsInDefaultFullLifeline().get(1);

-		executeDestroyCommand(stateInvariantEditPart);

-		checkInteractionFragmentsWithPattern("-o-o-");

-		checkSimpleFullTimelinePattern("-o|-o|-");

-		undoOnUIThread();

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleFullTimelinePattern("-o|-o|-o|-");

-		redoOnUIThread();

-		checkInteractionFragmentsWithPattern("-o-o-");

-		checkSimpleFullTimelinePattern("-o|-o|-");

-	}

-

-	@Test

-	public void testHideStateInvariants() {

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleFullTimelinePattern("-o|-o|-o|-");

-		final FullStateInvariantEditPartCN stateInvariantEditPart = findStateInvariantsInDefaultFullLifeline().get(1);

-		executeHideCommand(stateInvariantEditPart);

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleFullTimelinePattern("-o|-o|-");

-		undoOnUIThread();

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleFullTimelinePattern("-o|-o|-o|-");

-		redoOnUIThread();

-		checkInteractionFragmentsWithPattern("-o-o-o-");

-		checkSimpleFullTimelinePattern("-o|-o|-");

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.StateDefinitionEditPart;
+import org.junit.Test;
+
+public class TestTimingDiagramFullStateInvariant extends AbstractTimingDiagramTestCase {
+
+	@Override
+	public void setUp() throws Exception {
+		// create the project, model and diagram
+		super.setUp();
+		createDefaultInteraction(new Point(0, 0), new Dimension(800, 600));
+		createDefaultFullLifeline();
+		createThreeStateDefinitionsInDefaultFullLifeline();
+		createThreeOccurrenceSpecificationsInDefaultFullLifeline();
+	}
+
+	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")
+	@Test
+	public void testMoveStateInvariants() {
+		final List<FullStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultFullLifeline();
+		assertEquals("We should have 4 StateInvariants at the beginning of this test", 4, stateInvariantEditParts.size());
+		final List<StateDefinitionEditPart> stateDefinitionEditParts = findStateDefinitions();
+		assertEquals("We should have 3 StateDefinitions at the beginning of this test", 3, stateDefinitionEditParts.size());
+
+		// computeTimelineStringPattern();
+		checkFullTimelinePattern("StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 1_2);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_2_To_State 1_3);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_3_To_State 1_4);VerticalLine;" + "StateInvariant(State 1);");
+
+		final Rectangle stateDefBounds1 = getAbsoluteBounds(stateDefinitionEditParts.get(0));
+		final Rectangle stateDefBounds2 = getAbsoluteBounds(stateDefinitionEditParts.get(1));
+		// final Rectangle stateDefBounds3 = getAbsoluteBounds(stateDefinitionEditParts.get(2));
+		final int distanceBetweenStates = stateDefBounds2.y - stateDefBounds1.y;
+
+		// final Rectangle stateInvBounds1 = getAbsoluteBounds(stateInvariantEditParts.get(0));
+		// final Rectangle stateInvBounds2 = getAbsoluteBounds(stateInvariantEditParts.get(1));
+		// final Rectangle stateInvBounds3 = getAbsoluteBounds(stateInvariantEditParts.get(2));
+		// final Rectangle stateInvBounds4 = getAbsoluteBounds(stateInvariantEditParts.get(3));
+
+		// TODO: check state invariant in front of state definitions
+
+		moveEditPart(stateInvariantEditParts.get(0), getDefaultFullLifelineTimelineCompartment(), new Point(0, distanceBetweenStates));
+		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 1_2);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_2_To_State 1_3);VerticalLine;StateInvariant(State 1);");
+		moveEditPart(stateInvariantEditParts.get(1), getDefaultFullLifelineTimelineCompartment(), new Point(0, 2 * distanceBetweenStates));
+		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 1_2);VerticalLine;StateInvariant(State 1);");
+		moveEditPart(stateInvariantEditParts.get(3), getDefaultFullLifelineTimelineCompartment(), new Point(0, distanceBetweenStates));
+		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 2_2);VerticalLine;StateInvariant(State 2);");
+		moveEditPart(stateInvariantEditParts.get(3), getDefaultFullLifelineTimelineCompartment(), new Point(0, distanceBetweenStates));
+		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 3_2);VerticalLine;StateInvariant(State 3);");
+		moveEditPart(stateInvariantEditParts.get(2), getDefaultFullLifelineTimelineCompartment(), new Point(0, 2 * distanceBetweenStates));
+		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 3_2);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_2_To_State 3_3);VerticalLine;StateInvariant(State 3);");
+		moveEditPart(stateInvariantEditParts.get(2), getDefaultFullLifelineTimelineCompartment(), new Point(0, -distanceBetweenStates));
+		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 3_1);VerticalLine;" + "StateInvariant(State 3);OccurrenceSpecification(State 3_1_To_State 2_2);VerticalLine;" + "StateInvariant(State 2);OccurrenceSpecification(State 2_2_To_State 3_2);VerticalLine;StateInvariant(State 3);");
+		moveEditPart(stateInvariantEditParts.get(1), getDefaultFullLifelineTimelineCompartment(), new Point(0, -2 * distanceBetweenStates));
+		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 2_2);VerticalLine;" + "StateInvariant(State 2);OccurrenceSpecification(State 2_2_To_State 3_1);VerticalLine;StateInvariant(State 3);");
+	}
+
+	@Test
+	public void testDeleteStateInvariants() {
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleFullTimelinePattern("-o|-o|-o|-");
+		final FullStateInvariantEditPartCN stateInvariantEditPart = findStateInvariantsInDefaultFullLifeline().get(1);
+		executeDestroyCommand(stateInvariantEditPart);
+		checkInteractionFragmentsWithPattern("-o-o-");
+		checkSimpleFullTimelinePattern("-o|-o|-");
+		undoOnUIThread();
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleFullTimelinePattern("-o|-o|-o|-");
+		redoOnUIThread();
+		checkInteractionFragmentsWithPattern("-o-o-");
+		checkSimpleFullTimelinePattern("-o|-o|-");
+	}
+
+	@Test
+	public void testHideStateInvariants() {
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleFullTimelinePattern("-o|-o|-o|-");
+		final FullStateInvariantEditPartCN stateInvariantEditPart = findStateInvariantsInDefaultFullLifeline().get(1);
+		executeHideCommand(stateInvariantEditPart);
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleFullTimelinePattern("-o|-o|-");
+		undoOnUIThread();
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleFullTimelinePattern("-o|-o|-o|-");
+		redoOnUIThread();
+		checkInteractionFragmentsWithPattern("-o-o-o-");
+		checkSimpleFullTimelinePattern("-o|-o|-");
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramInteraction.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramInteraction.java
index 33d1aef3d33..3326c924f0a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramInteraction.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramInteraction.java
@@ -1,80 +1,80 @@
-/*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionEditPartTN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionNameEditPart;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.NamedElement;

-import org.junit.Test;

-

-public class TestTimingDiagramInteraction extends AbstractTimingDiagramTestCase {

-

-	@Override

-	public void setUp() throws Exception {

-		// create the project, model and diagram

-		super.setUp();

-	}

-

-	@Test

-	public void testCreateInteraction() {

-		createInteraction();

-	}

-

-	@Test

-	public void testHideInteraction() {

-		final InteractionEditPartTN interaction = createInteraction();

-		testHide(interaction);

-	}

-

-	@Test

-	public void testDeleteInteraction() {

-		final InteractionEditPartTN interaction = createInteraction();

-		testDelete(interaction);

-	}

-

-	@Test

-	public void testDropInteraction() {

-		// create an Interaction and hide its View, so as to be able to drop it after that

-		final InteractionEditPartTN interactionEditPart = createInteraction();

-		final Interaction interaction = (Interaction)((View)interactionEditPart.getModel()).getElement();

-		assertNotNull("The interaction should not be null", interaction);

-		hide(interactionEditPart);

-

-		testDrop(getDiagramEditPart(), getDiagramEditPart(), interaction);

-	}

-

-	@Test

-	public void testCreateThreeInteractions() {

-		final InteractionEditPartTN interaction1 = createInteraction();

-		final InteractionEditPartTN interaction2 = createInteraction();

-		final InteractionEditPartTN interaction3 = createInteraction();

-		assertEquals("The diagram should only contain the 3 interactions", 3, getDiagramEditPart().getChildren().size());

-		assertTrue("The first interaction should be found in the diagram", getDiagramEditPart().getChildren().contains(interaction1));

-		assertTrue("The second interaction should be found in the diagram", getDiagramEditPart().getChildren().contains(interaction2));

-		assertTrue("The third interaction should be found in the diagram", getDiagramEditPart().getChildren().contains(interaction3));

-	}

-

-	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")

-	@Test

-	public void testEditInteractionName() {

-		final InteractionEditPartTN interactionEditPart = createInteraction();

-		final InteractionNameEditPart interactionNameEditPart = (InteractionNameEditPart)EditPartUtils.findFirstChildEditPartWithId(interactionEditPart, InteractionNameEditPart.VISUAL_ID);

-		final NamedElement namedElement = (Interaction)((View)interactionEditPart.getModel()).getElement();

-		testSetNameWithDirectEditRequest(interactionNameEditPart, namedElement);

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionEditPartTN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.InteractionNameEditPart;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.NamedElement;
+import org.junit.Test;
+
+public class TestTimingDiagramInteraction extends AbstractTimingDiagramTestCase {
+
+	@Override
+	public void setUp() throws Exception {
+		// create the project, model and diagram
+		super.setUp();
+	}
+
+	@Test
+	public void testCreateInteraction() {
+		createInteraction();
+	}
+
+	@Test
+	public void testHideInteraction() {
+		final InteractionEditPartTN interaction = createInteraction();
+		testHide(interaction);
+	}
+
+	@Test
+	public void testDeleteInteraction() {
+		final InteractionEditPartTN interaction = createInteraction();
+		testDelete(interaction);
+	}
+
+	@Test
+	public void testDropInteraction() {
+		// create an Interaction and hide its View, so as to be able to drop it after that
+		final InteractionEditPartTN interactionEditPart = createInteraction();
+		final Interaction interaction = (Interaction)((View)interactionEditPart.getModel()).getElement();
+		assertNotNull("The interaction should not be null", interaction);
+		hide(interactionEditPart);
+
+		testDrop(getDiagramEditPart(), getDiagramEditPart(), interaction);
+	}
+
+	@Test
+	public void testCreateThreeInteractions() {
+		final InteractionEditPartTN interaction1 = createInteraction();
+		final InteractionEditPartTN interaction2 = createInteraction();
+		final InteractionEditPartTN interaction3 = createInteraction();
+		assertEquals("The diagram should only contain the 3 interactions", 3, getDiagramEditPart().getChildren().size());
+		assertTrue("The first interaction should be found in the diagram", getDiagramEditPart().getChildren().contains(interaction1));
+		assertTrue("The second interaction should be found in the diagram", getDiagramEditPart().getChildren().contains(interaction2));
+		assertTrue("The third interaction should be found in the diagram", getDiagramEditPart().getChildren().contains(interaction3));
+	}
+
+	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")
+	@Test
+	public void testEditInteractionName() {
+		final InteractionEditPartTN interactionEditPart = createInteraction();
+		final InteractionNameEditPart interactionNameEditPart = (InteractionNameEditPart)EditPartUtils.findFirstChildEditPartWithId(interactionEditPart, InteractionNameEditPart.VISUAL_ID);
+		final NamedElement namedElement = (Interaction)((View)interactionEditPart.getModel()).getElement();
+		testSetNameWithDirectEditRequest(interactionNameEditPart, namedElement);
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramMessages.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramMessages.java
index 643ce656644..1d1427ef7f0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramMessages.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramMessages.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

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.swt.widgets.Text;

-import org.junit.Test;

-

-public class TestTimingDiagramMessages extends AbstractTimingDiagramTestCase {

-

-	@Override

-	public void setUp() throws Exception {

-		// create the project, model and diagram

-		super.setUp();

-		createDefaultInteraction();

-		createDefaultFullLifeline();

-		createDefaultCompactLifeline();

-		createStateDefinitionInDefaultFullLifeline();

-		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

-		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

-	}

-

-	@FailingTest("To be verified: NPE on the text widget")

-	@Test

-	public void testCreateSyncMessage() {

-		clickTwiceWithTool("createMessageSyncCreationTool", findOccurrenceSpecificationsInDefaultFullLifeline().get(0), findOccurrenceSpecificationsInDefaultCompactLifeline().get(1));

-		final Text text = findVisibleTextWidgetOnDiagram();

-		setText(text, "abc");

-

-		checkSimpleFullTimelinePattern("-m|-o|-o|-");

-		checkSimpleCompactTimelinePattern("-o-m-o-");

-		checkInteractionFragmentsWithPattern("--m-o-o-o-m-o-");

-

-		// TODO: check covered fragments on lifelines

-		// TODO: check sync Message instance

-	}

-

-	@FailingTest("To be verified: NPE on the text widget")

-	@Test

-	public void testCreateAsyncMessage() {

-		clickTwiceWithTool("createMessageAsyncCreationTool", findOccurrenceSpecificationsInDefaultFullLifeline().get(0), findOccurrenceSpecificationsInDefaultCompactLifeline().get(1));

-		final Text text = findVisibleTextWidgetOnDiagram();

-		setText(text, "def");

-		// TODO: check async Message instance

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.swt.widgets.Text;
+import org.junit.Test;
+
+public class TestTimingDiagramMessages extends AbstractTimingDiagramTestCase {
+
+	@Override
+	public void setUp() throws Exception {
+		// create the project, model and diagram
+		super.setUp();
+		createDefaultInteraction();
+		createDefaultFullLifeline();
+		createDefaultCompactLifeline();
+		createStateDefinitionInDefaultFullLifeline();
+		createThreeOccurrenceSpecificationsInDefaultFullLifeline();
+		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();
+	}
+
+	@FailingTest("To be verified: NPE on the text widget")
+	@Test
+	public void testCreateSyncMessage() {
+		clickTwiceWithTool("createMessageSyncCreationTool", findOccurrenceSpecificationsInDefaultFullLifeline().get(0), findOccurrenceSpecificationsInDefaultCompactLifeline().get(1));
+		final Text text = findVisibleTextWidgetOnDiagram();
+		setText(text, "abc");
+
+		checkSimpleFullTimelinePattern("-m|-o|-o|-");
+		checkSimpleCompactTimelinePattern("-o-m-o-");
+		checkInteractionFragmentsWithPattern("--m-o-o-o-m-o-");
+
+		// TODO: check covered fragments on lifelines
+		// TODO: check sync Message instance
+	}
+
+	@FailingTest("To be verified: NPE on the text widget")
+	@Test
+	public void testCreateAsyncMessage() {
+		clickTwiceWithTool("createMessageAsyncCreationTool", findOccurrenceSpecificationsInDefaultFullLifeline().get(0), findOccurrenceSpecificationsInDefaultCompactLifeline().get(1));
+		final Text text = findVisibleTextWidgetOnDiagram();
+		setText(text, "def");
+		// TODO: check async Message instance
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramStateDefinition.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramStateDefinition.java
index cf7e43e9851..c7b830ea15a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramStateDefinition.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramStateDefinition.java
@@ -1,239 +1,239 @@
-/*******************************************************************************

- * 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:

- * 

- *   CEA LIST - Initial API and implementation

- *   Christian W. Damus (CEA) - fix deletion test to run on Mac OS X

- *    

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import java.util.Map.Entry;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.junit.framework.classification.FailingTest;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.StateDefinitionUtils;

-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.StateInvariantUtils;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineStateDefinitionCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantEditPartCN;

-import org.eclipse.papyrus.uml.diagram.timing.edit.parts.StateDefinitionLabelEditPart;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.StateInvariant;

-import org.junit.Test;

-

-public class TestTimingDiagramStateDefinition extends AbstractTimingDiagramTestCase {

-

-	@Override

-	public void setUp() throws Exception {

-		// create the project, model and diagram

-		super.setUp();

-		createDefaultInteraction();

-		createDefaultFullLifeline();

-	}

-

-	@Test

-	public void testCreateStateDefinition() {

-		final EditPart stateDefinition = createStateDefinitionInDefaultFullLifeline();

-		final EditPart stateInvariantEditPart = EditPartUtils.findFirstChildEditPartWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);

-		assertNotNull("A StateInvariant must be created with the first StateDefinition", stateInvariantEditPart);

-		final StateInvariant stateInvariant = (StateInvariant)((View)stateInvariantEditPart.getModel()).getElement();

-		assertNotNull("The StateInvariant must not be null", stateInvariant);

-		final String stateInvariantId = StateInvariantUtils.getStateInvariantId(stateInvariant);

-		assertNotNull("The StateInvariant id must not be null", stateInvariantId);

-		final String stateDefinitionViewID = StateDefinitionUtils.getStateDefinitionViewID((View)stateDefinition.getModel());

-		assertEquals("The ids of the StateDefinition and the StateInvariant must be equal", stateDefinitionViewID, stateInvariantId);

-

-	}

-

-	@Test

-	public void testCreateMultipleStateDefinitions() {

-		createStateDefinitionInDefaultFullLifeline();

-		expectNStateDefinitions(1);

-		createStateDefinitionInDefaultFullLifeline();

-		expectNStateDefinitions(2);

-		undoOnUIThread();

-		expectNStateDefinitions(1);

-		redoOnUIThread();

-		expectNStateDefinitions(2);

-		createStateDefinitionInDefaultFullLifeline();

-		expectNStateDefinitions(3);

-		undoOnUIThread();

-		expectNStateDefinitions(2);

-		redoOnUIThread();

-		expectNStateDefinitions(3);

-	}

-

-	private void expectNStateDefinitions(final int numberOfExpectedStateDefinitions) {

-		assertEquals("There must be " + numberOfExpectedStateDefinitions + " StateDefinitionEditPart", numberOfExpectedStateDefinitions, findStateDefinitions().size());

-	}

-

-	/**

-	 * Creates a new StateDefinition by clicking using the StateDefinition palette tool (this is important to test

-	 * because we customized this tool).

-	 */

-	@FailingTest("To be verified. Seems to be related to the DirectEdit issue (Text widget not found)")

-	@Test

-	public void testCreateStateDefinitionWithPaletteTool() {

-		final FullLifelineStateDefinitionCompartmentEditPartCN stateDefinitionCompartment = getDefaultStateDefinitionCompartment();

-		// let GMF do its layout

-		flushEventLoop();

-		final int nChildrenBefore = stateDefinitionCompartment.getChildren().size();

-		final Rectangle bounds = stateDefinitionCompartment.getFigure().getBounds();

-		stateDefinitionCompartment.getFigure().getParent().translateToAbsolute(bounds);

-		// click center at the top of the compartment

-		final Point point = new Point(bounds.x + bounds.width / 2, bounds.y + 1);

-		// use the StateDefinition creation tool to create a new StateDefinition

-		clickTool("createStateDefinitionCreationTool", point);

-		final Text text = findVisibleTextWidgetOnDiagram();

-		assertEquals("The state definition compartment should contain one more child", nChildrenBefore + 1, stateDefinitionCompartment.getChildren().size());

-		assertNotNull("A Text cell editor should appear after creating a StateDefinition", text);

-		final String newName = "state " + System.currentTimeMillis();

-		setText(text, newName);

-		checkStateDefinition(newName);

-	}

-

-	/**

-	 * Check that there is a StateDefinition with the given name.

-	 *

-	 * @param expectedName

-	 *        the name of a StateDefinition that should exist.

-	 */

-	protected void checkStateDefinition(final String expectedName) {

-		final View lifelineView = (View)getDefaultFullLifelineEditPart().getModel();

-		final Lifeline lifeline = (Lifeline)lifelineView.getElement();

-		final EAnnotation stateDefinitionsEAnnotation = StateDefinitionUtils.getStateDefinitionsEAnnotation(lifeline);

-		assertNotNull("The lifeline should have an EAnnotation for the state definitions", stateDefinitionsEAnnotation);

-

-		// find the entry corresponding to the new StateDefinition

-		Entry<String, String> newEntry = null;

-		final EMap<String, String> details = stateDefinitionsEAnnotation.getDetails();

-		for(final Entry<String, String> entry : details) {

-			if(expectedName.equals(entry.getValue())) {

-				newEntry = entry;

-				break;

-			}

-		}

-		assertNotNull("The Lifeline's EAnnotation should contain an entry for the StateDefinition", newEntry);

-		final String id = newEntry.getKey();

-		final View stateDefinitionView = StateDefinitionUtils.getStateDefinitionViewWithId(id, lifelineView);

-		final String stateDefinitionName = StateDefinitionUtils.getStateDefinitionName(stateDefinitionView);

-		assertEquals("getStateDefinitionName should return the name of the StateDefinition", expectedName, stateDefinitionName);

-	}

-

-	/** Check that no StateDefinition exists with the given name. */

-	protected void checkNoStateDefinition(final String unexpectedName) {

-		final View lifelineView = (View)getDefaultFullLifelineEditPart().getModel();

-		final Lifeline lifeline = (Lifeline)lifelineView.getElement();

-		final EAnnotation stateDefinitionsEAnnotation = StateDefinitionUtils.getStateDefinitionsEAnnotation(lifeline);

-		if(stateDefinitionsEAnnotation == null) {

-			return;

-		}

-		// find the entry corresponding to the new StateDefinition

-		final EMap<String, String> details = stateDefinitionsEAnnotation.getDetails();

-		for(final Entry<String, String> entry : details) {

-			if(unexpectedName.equals(entry.getValue())) {

-				fail("A StateDefinition with the given name exists");

-			}

-		}

-	}

-

-	@Test

-	public void testDeleteStateDefinition() {

-		final EditPart stateDefinition1 = createStateDefinitionInDefaultFullLifeline();

-		final EditPart stateDefinition2 = createStateDefinitionInDefaultFullLifeline();

-		final EditPart stateDefinition3 = createStateDefinitionInDefaultFullLifeline();

-

-		final GroupRequest deleteRequest1 = new GroupRequest(RequestConstants.REQ_DELETE);

-		deleteRequest1.setEditParts(stateDefinition1);

-		final Command command1 = stateDefinition1.getCommand(deleteRequest1);

-		assertTrue("The first StateDefinition should not be deletable since a StateInvariant uses it", command1 instanceof UnexecutableCommand);

-

-		testDeleteStateDefinition(stateDefinition2, "second state definition for testDeleteStateDefinition");

-		testDeleteStateDefinition(stateDefinition3, "third state definition for testDeleteStateDefinition");

-	}

-

-	protected void testDeleteStateDefinition(final EditPart stateDefinition, final String name) {

-		// set a name before deleting so that we can then check whether it was really deleted/re-created

-		final View stateDefinitionView = (View)stateDefinition.getModel();

-		getCommandStack().execute(new RecordingCommand(getDiagramEditor().getEditingDomain()) {

-

-			@Override

-			protected void doExecute() {

-				StateDefinitionUtils.setStateDefinitionName(stateDefinitionView, name);

-			}

-		});

-		checkStateDefinition(name);

-

-		final FullLifelineStateDefinitionCompartmentEditPartCN stateDefinitionCompartment = getDefaultStateDefinitionCompartment();

-		final int sizeBefore = stateDefinitionCompartment.getChildren().size();

-

-		// this is actually a "hide" instead of a "delete", since StateDefinition has no UML semantic element

-		final GroupRequest deleteRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		deleteRequest.setEditParts(stateDefinition);

-		final Command command = stateDefinition.getCommand(deleteRequest);

-		checkCommand(command);

-		executeOnUIThread(command);

-		assertEquals("The StateDefinition compartment should now contain one less child", sizeBefore - 1, stateDefinitionCompartment.getChildren().size());

-		checkNoStateDefinition(name);

-		undoOnUIThread();

-		assertEquals("The child should be back after the undo", sizeBefore, stateDefinitionCompartment.getChildren().size());

-		checkStateDefinition(name);

-		redoOnUIThread();

-		assertEquals("The child should be removed after the redo", sizeBefore - 1, stateDefinitionCompartment.getChildren().size());

-		checkNoStateDefinition(name);

-	}

-

-	@FailingTest("To be verified. Seems to be related to the DirectEdit issue (Text widget not found)")

-	@Test

-	public void testEditStateDefinitionName() {

-		final EditPart stateDefinition = createStateDefinitionInDefaultFullLifeline();

-		final StateDefinitionLabelEditPart stateDefinitionLabelEditPart = getStateDefinitionLabelEditPart(stateDefinition);

-		// set first name

-		final String name1 = "test name 1 " + System.currentTimeMillis();

-		setNameWithDirectEditRequest(stateDefinitionLabelEditPart, name1);

-		checkStateDefinition(name1);

-		// set second name

-		final String name2 = "test name 2 " + System.currentTimeMillis();

-		setNameWithDirectEditRequest(stateDefinitionLabelEditPart, name2);

-		checkStateDefinition(name2);

-		checkNoStateDefinition(name1);

-		// test undo

-		undo();

-		checkStateDefinition(name1);

-		checkNoStateDefinition(name2);

-		// test redo

-		redo();

-		checkStateDefinition(name2);

-		checkNoStateDefinition(name1);

-

-		// TODO: check fragment names are updated when changing the state definition name

-	}

-

-	private static StateDefinitionLabelEditPart getStateDefinitionLabelEditPart(final EditPart stateDefinitionEditPart) {

-		final StateDefinitionLabelEditPart stateDefinitionLabelEditPart = (StateDefinitionLabelEditPart)EditPartUtils.findFirstChildEditPartWithId(stateDefinitionEditPart, StateDefinitionLabelEditPart.VISUAL_ID);

-		return stateDefinitionLabelEditPart;

-	}

-}

+/*******************************************************************************
+ * 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:
+ * 
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus (CEA) - fix deletion test to run on Mac OS X
+ *    
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Map.Entry;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.StateDefinitionUtils;
+import org.eclipse.papyrus.uml.diagram.timing.custom.utils.StateInvariantUtils;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullLifelineStateDefinitionCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantEditPartCN;
+import org.eclipse.papyrus.uml.diagram.timing.edit.parts.StateDefinitionLabelEditPart;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.StateInvariant;
+import org.junit.Test;
+
+public class TestTimingDiagramStateDefinition extends AbstractTimingDiagramTestCase {
+
+	@Override
+	public void setUp() throws Exception {
+		// create the project, model and diagram
+		super.setUp();
+		createDefaultInteraction();
+		createDefaultFullLifeline();
+	}
+
+	@Test
+	public void testCreateStateDefinition() {
+		final EditPart stateDefinition = createStateDefinitionInDefaultFullLifeline();
+		final EditPart stateInvariantEditPart = EditPartUtils.findFirstChildEditPartWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);
+		assertNotNull("A StateInvariant must be created with the first StateDefinition", stateInvariantEditPart);
+		final StateInvariant stateInvariant = (StateInvariant)((View)stateInvariantEditPart.getModel()).getElement();
+		assertNotNull("The StateInvariant must not be null", stateInvariant);
+		final String stateInvariantId = StateInvariantUtils.getStateInvariantId(stateInvariant);
+		assertNotNull("The StateInvariant id must not be null", stateInvariantId);
+		final String stateDefinitionViewID = StateDefinitionUtils.getStateDefinitionViewID((View)stateDefinition.getModel());
+		assertEquals("The ids of the StateDefinition and the StateInvariant must be equal", stateDefinitionViewID, stateInvariantId);
+
+	}
+
+	@Test
+	public void testCreateMultipleStateDefinitions() {
+		createStateDefinitionInDefaultFullLifeline();
+		expectNStateDefinitions(1);
+		createStateDefinitionInDefaultFullLifeline();
+		expectNStateDefinitions(2);
+		undoOnUIThread();
+		expectNStateDefinitions(1);
+		redoOnUIThread();
+		expectNStateDefinitions(2);
+		createStateDefinitionInDefaultFullLifeline();
+		expectNStateDefinitions(3);
+		undoOnUIThread();
+		expectNStateDefinitions(2);
+		redoOnUIThread();
+		expectNStateDefinitions(3);
+	}
+
+	private void expectNStateDefinitions(final int numberOfExpectedStateDefinitions) {
+		assertEquals("There must be " + numberOfExpectedStateDefinitions + " StateDefinitionEditPart", numberOfExpectedStateDefinitions, findStateDefinitions().size());
+	}
+
+	/**
+	 * Creates a new StateDefinition by clicking using the StateDefinition palette tool (this is important to test
+	 * because we customized this tool).
+	 */
+	@FailingTest("To be verified. Seems to be related to the DirectEdit issue (Text widget not found)")
+	@Test
+	public void testCreateStateDefinitionWithPaletteTool() {
+		final FullLifelineStateDefinitionCompartmentEditPartCN stateDefinitionCompartment = getDefaultStateDefinitionCompartment();
+		// let GMF do its layout
+		flushEventLoop();
+		final int nChildrenBefore = stateDefinitionCompartment.getChildren().size();
+		final Rectangle bounds = stateDefinitionCompartment.getFigure().getBounds();
+		stateDefinitionCompartment.getFigure().getParent().translateToAbsolute(bounds);
+		// click center at the top of the compartment
+		final Point point = new Point(bounds.x + bounds.width / 2, bounds.y + 1);
+		// use the StateDefinition creation tool to create a new StateDefinition
+		clickTool("createStateDefinitionCreationTool", point);
+		final Text text = findVisibleTextWidgetOnDiagram();
+		assertEquals("The state definition compartment should contain one more child", nChildrenBefore + 1, stateDefinitionCompartment.getChildren().size());
+		assertNotNull("A Text cell editor should appear after creating a StateDefinition", text);
+		final String newName = "state " + System.currentTimeMillis();
+		setText(text, newName);
+		checkStateDefinition(newName);
+	}
+
+	/**
+	 * Check that there is a StateDefinition with the given name.
+	 *
+	 * @param expectedName
+	 *        the name of a StateDefinition that should exist.
+	 */
+	protected void checkStateDefinition(final String expectedName) {
+		final View lifelineView = (View)getDefaultFullLifelineEditPart().getModel();
+		final Lifeline lifeline = (Lifeline)lifelineView.getElement();
+		final EAnnotation stateDefinitionsEAnnotation = StateDefinitionUtils.getStateDefinitionsEAnnotation(lifeline);
+		assertNotNull("The lifeline should have an EAnnotation for the state definitions", stateDefinitionsEAnnotation);
+
+		// find the entry corresponding to the new StateDefinition
+		Entry<String, String> newEntry = null;
+		final EMap<String, String> details = stateDefinitionsEAnnotation.getDetails();
+		for(final Entry<String, String> entry : details) {
+			if(expectedName.equals(entry.getValue())) {
+				newEntry = entry;
+				break;
+			}
+		}
+		assertNotNull("The Lifeline's EAnnotation should contain an entry for the StateDefinition", newEntry);
+		final String id = newEntry.getKey();
+		final View stateDefinitionView = StateDefinitionUtils.getStateDefinitionViewWithId(id, lifelineView);
+		final String stateDefinitionName = StateDefinitionUtils.getStateDefinitionName(stateDefinitionView);
+		assertEquals("getStateDefinitionName should return the name of the StateDefinition", expectedName, stateDefinitionName);
+	}
+
+	/** Check that no StateDefinition exists with the given name. */
+	protected void checkNoStateDefinition(final String unexpectedName) {
+		final View lifelineView = (View)getDefaultFullLifelineEditPart().getModel();
+		final Lifeline lifeline = (Lifeline)lifelineView.getElement();
+		final EAnnotation stateDefinitionsEAnnotation = StateDefinitionUtils.getStateDefinitionsEAnnotation(lifeline);
+		if(stateDefinitionsEAnnotation == null) {
+			return;
+		}
+		// find the entry corresponding to the new StateDefinition
+		final EMap<String, String> details = stateDefinitionsEAnnotation.getDetails();
+		for(final Entry<String, String> entry : details) {
+			if(unexpectedName.equals(entry.getValue())) {
+				fail("A StateDefinition with the given name exists");
+			}
+		}
+	}
+
+	@Test
+	public void testDeleteStateDefinition() {
+		final EditPart stateDefinition1 = createStateDefinitionInDefaultFullLifeline();
+		final EditPart stateDefinition2 = createStateDefinitionInDefaultFullLifeline();
+		final EditPart stateDefinition3 = createStateDefinitionInDefaultFullLifeline();
+
+		final GroupRequest deleteRequest1 = new GroupRequest(RequestConstants.REQ_DELETE);
+		deleteRequest1.setEditParts(stateDefinition1);
+		final Command command1 = stateDefinition1.getCommand(deleteRequest1);
+		assertTrue("The first StateDefinition should not be deletable since a StateInvariant uses it", command1 instanceof UnexecutableCommand);
+
+		testDeleteStateDefinition(stateDefinition2, "second state definition for testDeleteStateDefinition");
+		testDeleteStateDefinition(stateDefinition3, "third state definition for testDeleteStateDefinition");
+	}
+
+	protected void testDeleteStateDefinition(final EditPart stateDefinition, final String name) {
+		// set a name before deleting so that we can then check whether it was really deleted/re-created
+		final View stateDefinitionView = (View)stateDefinition.getModel();
+		getCommandStack().execute(new RecordingCommand(getDiagramEditor().getEditingDomain()) {
+
+			@Override
+			protected void doExecute() {
+				StateDefinitionUtils.setStateDefinitionName(stateDefinitionView, name);
+			}
+		});
+		checkStateDefinition(name);
+
+		final FullLifelineStateDefinitionCompartmentEditPartCN stateDefinitionCompartment = getDefaultStateDefinitionCompartment();
+		final int sizeBefore = stateDefinitionCompartment.getChildren().size();
+
+		// this is actually a "hide" instead of a "delete", since StateDefinition has no UML semantic element
+		final GroupRequest deleteRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		deleteRequest.setEditParts(stateDefinition);
+		final Command command = stateDefinition.getCommand(deleteRequest);
+		checkCommand(command);
+		executeOnUIThread(command);
+		assertEquals("The StateDefinition compartment should now contain one less child", sizeBefore - 1, stateDefinitionCompartment.getChildren().size());
+		checkNoStateDefinition(name);
+		undoOnUIThread();
+		assertEquals("The child should be back after the undo", sizeBefore, stateDefinitionCompartment.getChildren().size());
+		checkStateDefinition(name);
+		redoOnUIThread();
+		assertEquals("The child should be removed after the redo", sizeBefore - 1, stateDefinitionCompartment.getChildren().size());
+		checkNoStateDefinition(name);
+	}
+
+	@FailingTest("To be verified. Seems to be related to the DirectEdit issue (Text widget not found)")
+	@Test
+	public void testEditStateDefinitionName() {
+		final EditPart stateDefinition = createStateDefinitionInDefaultFullLifeline();
+		final StateDefinitionLabelEditPart stateDefinitionLabelEditPart = getStateDefinitionLabelEditPart(stateDefinition);
+		// set first name
+		final String name1 = "test name 1 " + System.currentTimeMillis();
+		setNameWithDirectEditRequest(stateDefinitionLabelEditPart, name1);
+		checkStateDefinition(name1);
+		// set second name
+		final String name2 = "test name 2 " + System.currentTimeMillis();
+		setNameWithDirectEditRequest(stateDefinitionLabelEditPart, name2);
+		checkStateDefinition(name2);
+		checkNoStateDefinition(name1);
+		// test undo
+		undo();
+		checkStateDefinition(name1);
+		checkNoStateDefinition(name2);
+		// test redo
+		redo();
+		checkStateDefinition(name2);
+		checkNoStateDefinition(name1);
+
+		// TODO: check fragment names are updated when changing the state definition name
+	}
+
+	private static StateDefinitionLabelEditPart getStateDefinitionLabelEditPart(final EditPart stateDefinitionEditPart) {
+		final StateDefinitionLabelEditPart stateDefinitionLabelEditPart = (StateDefinitionLabelEditPart)EditPartUtils.findFirstChildEditPartWithId(stateDefinitionEditPart, StateDefinitionLabelEditPart.VISUAL_ID);
+		return stateDefinitionLabelEditPart;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java
index 080d0e2d885..a082c3656e5 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java
@@ -1,1104 +1,1104 @@
-/*****************************************************************************

- * Copyright (c) 2009, 2014 CEA LIST and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 434993

- *  Christian W. Damus (CEA) - bug 436047

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.timing.tests.generic;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.commands.operations.IOperationHistory;

-import org.eclipse.core.commands.operations.IOperationHistoryListener;

-import org.eclipse.core.commands.operations.OperationHistoryEvent;

-import org.eclipse.core.commands.operations.OperationHistoryFactory;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.draw2d.FigureCanvas;

-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.Rectangle;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gef.EditDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.Tool;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.palette.PaletteContainer;

-import org.eclipse.gef.palette.ToolEntry;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gef.requests.SelectionRequest;

-import org.eclipse.gef.ui.palette.PaletteViewer;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;

-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.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.diagram.ui.util.INotationType;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;

-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbenchPreferenceConstants;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.intro.IIntroPart;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.NamedElement;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-

-// DiResourceSet is deprecated but we need it for CreateUMLModelCommand

-@SuppressWarnings({ "deprecation" })

-public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	protected PapyrusMultiDiagramEditor papyrusEditor;

-

-	protected DiResourceSet diResourceSet;

-

-	protected IProject project;

-

-	protected IFile file;

-

-	protected UmlGmfDiagramEditor diagramEditor = null;

-

-	protected DiagramEditPart diagramEditPart;

-

-	protected boolean operationFailed = false;

-

-	@Before

-	public void setUp() throws Exception {

-		Runnable closeIntroRunnable = new Runnable() {

-

-			@Override

-			public void run() {

-				IIntroPart introPart = PlatformUI.getWorkbench().getIntroManager().getIntro();

-				PlatformUI.getWorkbench().getIntroManager().closeIntro(introPart);

-			}

-		};

-		PlatformUI.getWorkbench().getDisplay().syncExec(closeIntroRunnable);

-

-		// add a listener for failed operations

-		OperationHistoryFactory.getOperationHistory().addOperationHistoryListener(new IOperationHistoryListener() {

-

-			@Override

-			public void historyNotification(final OperationHistoryEvent event) {

-				if (event.getEventType() == OperationHistoryEvent.OPERATION_NOT_OK) {

-					AbstractPapyrusTestCase.this.operationFailed = true;

-				}

-			}

-		});

-

-		// disable useless animations (slows down unit tests)

-		PlatformUI.getPreferenceStore().setValue(IWorkbenchPreferenceConstants.ENABLE_ANIMATIONS, false);

-		// maximize the workbench window

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				maximize();

-				// closeAllViewsAndEditors();

-			}

-		});

-		// create a project, model, diagram, and open the diagram in the associated Papyrus editor

-		projectCreation();

-	}

-

-	/**

-	 * Reset the "operation failed" state. Call this before executing each operation for which you want to test whether

-	 * if failed with {@link AbstractPapyrusTestCase#assertLastOperationSuccessful()}.

-	 */

-	protected void resetLastOperationFailedState() {

-		this.operationFailed = false;

-	}

-

-	/**

-	 * Asserts that no Command executed on the {@link IOperationHistory} since the last call to {@link AbstractPapyrusTestCase#resetLastOperationFailedState resetLastOperationFailedState} returned {@link OperationHistoryEvent#OPERATION_NOT_OK}.

-	 *

-	 */

-	protected void assertLastOperationSuccessful() {

-		assertFalse("The operation failed. Look at the log, or put a breakpoint on ExecutionException or DefaultOperationHistory#notifyNotOK to find the cause.", this.operationFailed);

-	}

-

-	protected View getRootView() {

-		return getDiagramEditPart().getDiagramView();

-	}

-

-	protected Element getRootSemanticModel() {

-		return (Element) getRootView().getElement();

-	}

-

-	protected UmlGmfDiagramEditor getDiagramEditor() {

-		return this.diagramEditor;

-	}

-

-	@After

-	public void tearDown() throws Exception {

-		this.papyrusEditor.doSave(new NullProgressMonitor());

-		// diResourceSet.save( new NullProgressMonitor());

-		// diagramEditor.close(true);

-		this.papyrusEditor = null;

-	}

-

-	protected DiagramEditPart getDiagramEditPart() {

-		if (this.diagramEditPart == null) {

-			this.diagramEditor = (UmlGmfDiagramEditor) this.papyrusEditor.getActiveEditor();

-			this.diagramEditPart = (DiagramEditPart) this.papyrusEditor.getAdapter(DiagramEditPart.class);

-

-			Assert.assertNotNull("Cannot find the diagram editor", diagramEditor);

-			Assert.assertNotNull("Cannot find the Diagram edit part", diagramEditPart);

-		}

-		return this.diagramEditPart;

-	}

-

-	protected abstract ICreationCommand getDiagramCommandCreation();

-

-	protected void projectCreation() throws Exception {

-		final String timestamp = Long.toString(System.currentTimeMillis());

-		this.project = houseKeeper.createProject("DiagramTestProject_" + timestamp);

-		this.file = this.project.getFile("DiagramTest_" + timestamp + ".di"); //$NON-NLS-2$

-		this.diResourceSet = new DiResourceSet();

-

-		// at this point, no resources have been created

-		if (this.file.exists()) {

-			this.file.delete(true, new NullProgressMonitor());

-		}

-

-		if (!this.file.exists()) {

-			// Don't create a zero-byte file. Create an empty XMI document

-			Resource diResource = diResourceSet.createResource(URI.createPlatformResourceURI(file.getFullPath().toString(), true));

-			diResource.save(null);

-			diResource.unload();

-			this.diResourceSet.createsModels(this.file);

-			new CreateUMLModelCommand().createModel(this.diResourceSet);

-			ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

-			try {

-				registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); // High priority to override all contributions

-				registry.startRegistry();

-			} catch (ServiceException ex) {

-				// Ignore exceptions

-			}

-			// diResourceSet.createsModels(file);

-			final ICreationCommand command = getDiagramCommandCreation();

-			command.createDiagram(this.diResourceSet, null, "DiagramToTest");

-			this.diResourceSet.save(new NullProgressMonitor());

-

-		}

-		IEditorPart _editor = houseKeeper.openPapyrusEditor(file);

-		assertTrue("The editor must be a " + PapyrusMultiDiagramEditor.class.getSimpleName() + " (Actual type: " + _editor.getClass().getSimpleName() + ")", _editor instanceof PapyrusMultiDiagramEditor);

-		this.papyrusEditor = ((PapyrusMultiDiagramEditor) _editor);

-		flushEventLoop();

-	}

-

-	protected static void maximize() {

-		// PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().setMaximized(true);

-	}

-

-	protected static void closeAllViewsAndEditors() {

-		// final IWorkbench workbench = PlatformUI.getWorkbench();

-		// for(final IWorkbenchWindow workbenchWindow : workbench.getWorkbenchWindows()) {

-		// final IWorkbenchPage[] pages = workbenchWindow.getPages();

-		// for(final IWorkbenchPage page : pages) {

-		// final IViewReference[] viewReferences = page.getViewReferences();

-		// for(final IViewReference viewReference : viewReferences) {

-		// page.hideView(viewReference);

-		// }

-		// page.closeAllEditors(false);

-		// }

-		// }

-	}

-

-	/**

-	 * Create a view for the given type, plus the associated semantic element unless the given type is a notation-only

-	 * type.

-	 *

-	 * <ul>

-	 * <li>if type is an {@link INotationType}, then create a view using a {@link CreateViewRequest}

-	 * <li>otherwise, create a view and the corresponding semantic element using a CreateViewAndElementRequest

-	 * </ul>

-	 *

-	 * @param elementType

-	 *            the type for which to create a view (and possibly a model element)

-	 * @param parentEditPart

-	 *            the edit part to which the creation request must be sent

-	 * @return the created View

-	 */

-	protected View createView(final IElementType elementType, final EditPart parentEditPart) {

-		return createView(elementType, null, null, parentEditPart);

-	}

-

-	/**

-	 * Create a view for the given type, plus the associated semantic element unless the given type is a notation-only

-	 * type.

-	 *

-	 * <ul>

-	 * <li>if type is an {@link INotationType}, then create a view using a {@link CreateViewRequest}

-	 * <li>otherwise, create a view and the corresponding semantic element using a CreateViewAndElementRequest

-	 * </ul>

-	 *

-	 * @param elementType

-	 *            the type for which to create a view (and possibly a model element)

-	 * @param location

-	 *            the position of the new view (may be <code>null</code>)

-	 * @param size

-	 *            the size of the new view (may be <code>null</code>)

-	 * @param parentEditPart

-	 *            the edit part to which the creation request must be sent

-	 * @return the created View

-	 */

-	protected View createView(final IElementType elementType, final Point location, final Dimension size, final EditPart parentEditPart) {

-		final View[] result = new View[1];

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				final CreateViewRequest createRequest = CreateViewRequestFactory.getCreateShapeRequest(elementType, getDiagramEditPart().getDiagramPreferencesHint());

-				if (size != null) {

-					createRequest.setSize(size);

-				}

-				if (location != null) {

-					createRequest.setLocation(location);

-				}

-				final Command command = parentEditPart.getCommand(createRequest);

-				checkCommand(command);

-				execute(command);

-

-				result[0] = getCreatedViewFromCommand(command);

-			}

-		});

-		return result[0];

-	}

-

-	protected static View getCreatedViewFromCommand(final Command command) {

-		final List<CreateCommand> createCommands = new ArrayList<CreateCommand>();

-		findNestedCreateCommands(command, createCommands);

-		assertEquals("There should be one CreateCommand inside the command", 1, createCommands.size());

-		final Object returnValue = createCommands.get(0).getCommandResult().getReturnValue();

-		if (returnValue instanceof IAdaptable) {

-			final IAdaptable adaptableResult = (IAdaptable) returnValue;

-			final View view = (View) adaptableResult.getAdapter(View.class);

-			if (view != null) {

-				return view;

-			}

-		}

-		fail("CreateView command result not found");

-		return null;

-	}

-

-	private static void findNestedCreateCommands(final Command gefCommand, final List<CreateCommand> createCommands) {

-		if (gefCommand instanceof CompoundCommand) {

-			final CompoundCommand compoundCommand = (CompoundCommand) gefCommand;

-			@SuppressWarnings("unchecked")

-			final List<Command> commands = compoundCommand.getCommands();

-			for (final Command childCommand : commands) {

-				findNestedCreateCommands(childCommand, createCommands);

-			}

-		} else if (gefCommand instanceof ICommandProxy) {

-			final ICommandProxy commandProxy = (ICommandProxy) gefCommand;

-			final ICommand iCommand = commandProxy.getICommand();

-			findNestedCreateCommands(iCommand, createCommands);

-		}

-	}

-

-	private static void findNestedCreateCommands(final ICommand gmfCommand, final List<CreateCommand> createCommands) {

-		if (gmfCommand instanceof CompositeCommand) {

-			final CompositeCommand compositeCommand = (CompositeCommand) gmfCommand;

-			final Iterator<?> iterator = compositeCommand.iterator();

-			while (iterator.hasNext()) {

-				final Object element = iterator.next();

-				if (element instanceof ICommand) {

-					final ICommand subCommand = (ICommand) element;

-					findNestedCreateCommands(subCommand, createCommands);

-				} else {

-					fail("error");

-				}

-			}

-		} else if (gmfCommand instanceof CreateCommand) {

-			createCommands.add((CreateCommand) gmfCommand);

-		} else if (gmfCommand instanceof CommandProxy) {

-			final CommandProxy commandProxy = (CommandProxy) gmfCommand;

-			findNestedCreateCommands(commandProxy.getCommand(), createCommands);

-		}

-	}

-

-	/**

-	 * This tests the deletion of the View for the given GraphicalEditPart (this checks that the View is removed, but

-	 * the semantic model is untouched).

-	 */

-	protected void testHide(final GraphicalEditPart editPart) {

-		final EditPart parent = editPart.getParent();

-		final int sizeBefore = parent.getChildren().size();

-		final EObject semanticElement = ((View) editPart.getModel()).getElement();

-		assertTrue("The semantic element should be in a Model", isInModel(semanticElement));

-

-		executeHideCommand(editPart);

-		assertEquals("The parent edit part should now contain one less child", sizeBefore - 1, parent.getChildren().size());

-		assertTrue("The semantic element should still be in the Model after deleting the View", isInModel(semanticElement));

-		undo();

-		assertEquals("The child should be back after the undo", sizeBefore, parent.getChildren().size());

-		assertTrue("The semantic element should still be in the Model after undoing the View deletion", isInModel(semanticElement));

-		redo();

-		assertEquals("The child should be removed after the redo", sizeBefore - 1, parent.getChildren().size());

-		assertTrue("The semantic element should still be in the Model after redoing the View deletion", isInModel(semanticElement));

-	}

-

-	/**

-	 * Send the given EditPart a "delete" request (which only deletes the View), and execute the returned command.

-	 *

-	 * @param editPart

-	 *            the EditPart to hide

-	 */

-	protected void executeHideCommand(final GraphicalEditPart editPart) {

-		final GroupRequest deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		deleteViewRequest.setEditParts(editPart);

-		final Command command = editPart.getCommand(deleteViewRequest);

-		checkCommand(command);

-		execute(command);

-	}

-

-	/** This tests the destruction of both the model and View for the given GraphicalEditPart. */

-	protected void testDelete(final GraphicalEditPart editPart) {

-		final EditPart parent = editPart.getParent();

-		final int sizeBefore = parent.getChildren().size();

-		final EObject semanticElement = ((View) editPart.getModel()).getElement();

-		assertTrue("The semantic element should be in a Model", isInModel(semanticElement));

-

-		executeDestroyCommand(editPart);

-		assertEquals("The parent edit part should now contain one less child", sizeBefore - 1, parent.getChildren().size());

-		assertFalse("The semantic element should not be in the Model any more after deleting it", isInModel(semanticElement));

-		undo();

-		assertEquals("The child should be back after the undo", sizeBefore, parent.getChildren().size());

-		assertTrue("The semantic element should be back in the Model after undoing the deletion", isInModel(semanticElement));

-		redo();

-		assertEquals("The child should be removed after the redo", sizeBefore - 1, parent.getChildren().size());

-		assertFalse("The semantic element should not be in the Model after redoing the deletion", isInModel(semanticElement));

-	}

-

-	/**

-	 * Send the given EditPart a {@link DestroyElementRequest}, and execute the returned command.

-	 *

-	 * @param editPart

-	 *            the EditPart to destroy

-	 */

-	protected void executeDestroyCommand(final GraphicalEditPart editPart) {

-		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		final Command command = editPart.getCommand(destroyElementRequest);

-		checkCommand(command);

-		execute(command);

-	}

-

-	/**

-	 * @param targetEditPart

-	 *            the EditPart on top of which the drop will happen. This will determine the coordinates of the drop.

-	 * @param parentEditPart

-	 *            the EditPart in which the element will really be added. Often the same EditPart as targetEditPart,

-	 *            unless dropping on top of the first EditPart puts the element in another edit part.

-	 * @param droppedElement

-	 *            the element to drop

-	 */

-	public void testDrop(final GraphicalEditPart targetEditPart, final GraphicalEditPart parentEditPart, final EObject droppedElement) {

-		final int sizeBefore = parentEditPart.getChildren().size();

-		final DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		final ArrayList<EObject> list = new ArrayList<EObject>();

-		list.add(droppedElement);

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(new Point(1, 1));

-		final Command command = targetEditPart.getCommand(dropObjectsRequest);

-		checkCommand(command);

-		execute(command);

-		assertEquals("The parent edit part should now contain one more child", sizeBefore + 1, parentEditPart.getChildren().size());

-		assertTrue("The dropped element should now be in the Model", isInModel(droppedElement));

-		undo();

-		assertEquals("The editpart should be removed after undo", sizeBefore, parentEditPart.getChildren().size());

-		assertTrue("The semantic element should still be in the Model after undoing the drop", isInModel(droppedElement));

-		redo();

-		assertEquals("The parent edit part should contain one more child after redo", sizeBefore + 1, parentEditPart.getChildren().size());

-		assertTrue("The dropped element should be in the Model after redo", isInModel(droppedElement));

-	}

-

-	/**

-	 * Return whether the given model element is contained by a UML {@link Model}. This is useful in order to determine

-	 * if an element was deleted (removed from the Model).

-	 */

-	protected static boolean isInModel(final EObject semanticElement) {

-		EObject parent = semanticElement.eContainer();

-		while (parent != null) {

-			if (parent instanceof Model) {

-				return true;

-			}

-			parent = parent.eContainer();

-		}

-		return false;

-	}

-

-	/** Check that the given command is executable. */

-	protected static void checkCommand(final Command command) {

-		assertNotNull("The command must not be null", command);

-		assertTrue("The command must be executable", command.canExecute());

-	}

-

-	/** The command stack to use to execute commands on the diagram. */

-	protected CommandStack getCommandStack() {

-		// not "diagramEditor.getDiagramEditDomain().getDiagramCommandStack()" because it messes up undo contexts

-		return this.diagramEditor.getEditingDomain().getCommandStack();

-	}

-

-	/** Execute the given command in the diagram editor. */

-	protected void execute(final Command command) {

-		resetLastOperationFailedState();

-		getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

-		assertLastOperationSuccessful();

-	}

-

-	/** Undo the last command done in the diagram editor. */

-	protected void undo() {

-		resetLastOperationFailedState();

-		final CommandStack commandStack = getCommandStack();

-		assertTrue("We should be able to undo", commandStack.canUndo());

-		commandStack.undo();

-		assertLastOperationSuccessful();

-	}

-

-	/** Redo the last command undone in the diagram editor. */

-	protected void redo() {

-		resetLastOperationFailedState();

-		final CommandStack commandStack = getCommandStack();

-		assertTrue("We should be able to redo", commandStack.canRedo());

-		commandStack.redo();

-		assertLastOperationSuccessful();

-	}

-

-	/** Call {@link AbstractPapyrusTestCase#execute(Command) execute} on the UI thread. */

-	protected void executeOnUIThread(final Command command) {

-		execute(command);

-		// Display.getDefault().syncExec(new Runnable() {

-		//

-		// public void run() {

-		// execute(command);

-		// }

-		// });

-	}

-

-	/** Call {@link AbstractPapyrusTestCase#undo() undo} on the UI thread. */

-	protected void undoOnUIThread() {

-		undo();

-		// Display.getDefault().syncExec(new Runnable() {

-		//

-		// public void run() {

-		// undo();

-		// }

-		// });

-	}

-

-	/** Call {@link AbstractPapyrusTestCase#redo() redo} on the UI thread. */

-	protected void redoOnUIThread() {

-		redo();

-		// Display.getDefault().syncExec(new Runnable() {

-		//

-		// public void run() {

-		// redo();

-		// }

-		// });

-	}

-

-	/**

-	 * Delete the View associated with the given EditPart, so that it is effectively hidden from the diagram without

-	 * removing the corresponding semantic element.

-	 */

-	protected void hide(final GraphicalEditPart editPart) {

-		final Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		final Command command = editPart.getCommand(deleteViewRequest);

-		execute(command);

-	}

-

-	// protected void sendKey(final Control control, final int key) {

-	// if (!control.setFocus()) {

-	// throw new RuntimeException("Cannot give focus to the control");

-	// }

-	//

-	// final Display display = Display.getDefault();

-	// final Event keyDownEvent = new Event();

-	// keyDownEvent.type = SWT.KeyDown;

-	// keyDownEvent.keyCode = key;

-	// display.post(keyDownEvent);

-	// final Event keyUpEvent = new Event();

-	// keyUpEvent.type = SWT.KeyUp;

-	// keyUpEvent.keyCode = key;

-	// display.post(keyUpEvent);

-	// }

-

-	protected interface INameProvider<T extends EObject> {

-

-		String getName(T element);

-	}

-

-	/**

-	 * Test setting the name on the given editPart, using a DirectEditRequest. Check that the name is set on the given

-	 * named element. Also test undo and redo.

-	 */

-	protected <T extends EObject> void testSetNameWithDirectEditRequest(final GraphicalEditPart editPart, final T element, final INameProvider<T> nameProvider) {

-		// set first name

-		final String name1 = "test name 1 " + System.currentTimeMillis();

-		setNameWithDirectEditRequest(editPart, name1);

-		flushEventLoop();

-		assertEquals("The element should have the first name", name1, nameProvider.getName(element));

-		// set second name

-		final String name2 = "test name 2 " + System.currentTimeMillis();

-		setNameWithDirectEditRequest(editPart, name2);

-		flushEventLoop();

-		assertEquals("The element should have the second name", name2, nameProvider.getName(element));

-		// test undo

-		undo();

-		assertEquals("The element name should be reset to the first name after undo", name1, nameProvider.getName(element));

-		// test redo

-		redo();

-		assertEquals("The element name should be reset to the second name after redo", name2, nameProvider.getName(element));

-	}

-

-	/**

-	 * Test setting the name on the given editPart, using a DirectEditRequest. Check that the name is set on the given

-	 * named element. Also test undo and redo.

-	 */

-	protected void testSetNameWithDirectEditRequest(final GraphicalEditPart editPart, final NamedElement namedElement) {

-		testSetNameWithDirectEditRequest(editPart, namedElement, new INameProvider<NamedElement>() {

-

-			@Override

-			public String getName(final NamedElement element) {

-				return element.getName();

-			}

-		});

-	}

-

-	/**

-	 * Set the name of the given GraphicalEditPart (which must be a name edit part) using a DirectEditRequest. This sets

-	 * the name in the Text widget that appears as a result of the DirectEditRequest, and then closes the Text widget to

-	 * accept the changes.

-	 *

-	 * @param editPart

-	 *            the edit part on which to perform the DirectEditRequest.

-	 * @param newName

-	 *            the name to set

-	 */

-	protected void setNameWithDirectEditRequest(final GraphicalEditPart editPart, final String newName) {

-		final IFigure nameFigure = editPart.getFigure();

-		final Rectangle bounds = nameFigure.getBounds();

-		final Point center = bounds.getCenter();

-		final DirectEditRequest directEditRequest = new DirectEditRequest();

-		directEditRequest.setLocation(center);

-		final Text textWidget = performDirectEditRequest(editPart, directEditRequest);

-		setText(textWidget, newName);

-	}

-

-	/** Changes the text of the given Text widget, and then removes the focus from this text in order to commit changes. */

-	protected static void setText(final Text textWidget, final String newName) {

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				textWidget.setText(newName);

-				// change the focus in order to accept the text

-				textWidget.getShell().setFocus();

-			}

-		});

-	}

-

-	/**

-	 * Performs the given DirectEditRequest on the given EditPart, and returns the Text widget that appears to let the

-	 * user edit the label.

-	 */

-	protected Text performDirectEditRequest(final EditPart editPart, final DirectEditRequest directEditRequest) {

-		final Text[] result = new Text[1];

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				// note: both operations need to be performed in the same display runnable

-				editPart.performRequest(directEditRequest);

-				result[0] = findVisibleTextWidgetOnDiagram();

-			}

-		});

-		assertNotNull("The DirectEditRequest should open a Text field", result[0]);

-		return result[0];

-	}

-

-	/**

-	 * Click the palette tool with the given id on the center of the given EditPart's Figure.

-	 *

-	 * @param toolId

-	 *            the id of the tool to click

-	 * @param target

-	 *            what to click

-	 */

-	protected void clickTool(final String toolId, final GraphicalEditPart target) {

-		final Point point = getCenterPoint(target);

-		clickTool(toolId, point);

-	}

-

-	/**

-	 * Click the palette tool with the given id at the given location.

-	 *

-	 * @param toolId

-	 *            the id of the tool to click

-	 * @param point

-	 *            where to click

-	 */

-	protected void clickTool(final String toolId, final Point point) {

-		final Tool tool = createTool(toolId);

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				tool.activate();

-				internalClickTool(tool, point);

-				tool.deactivate();

-			}

-		});

-	}

-

-	protected void clickTwiceWithTool(final String toolId, final GraphicalEditPart firstTarget, final GraphicalEditPart secondTarget) {

-		final Point firstPoint = getCenterPoint(firstTarget);

-		final Point secondPoint = getCenterPoint(secondTarget);

-		clickTwiceWithTool(toolId, firstPoint, secondPoint);

-	}

-

-	protected void clickTwiceWithTool(final String toolId, final Point firstPoint, final Point secondPoint) {

-		final Tool tool = createTool(toolId);

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				tool.activate();

-				internalClickTool(tool, firstPoint);

-				internalClickTool(tool, secondPoint);

-				tool.deactivate();

-			}

-		});

-	}

-

-	private Tool createTool(final String toolId) {

-		final PaletteViewer paletteViewer = ((EditDomain) this.diagramEditor.getDiagramEditDomain()).getPaletteViewer();

-		final ToolEntry toolEntry = findToolEntry(toolId, paletteViewer.getPaletteRoot());

-		assertNotNull("The tool with id " + toolId + " was not found in the palette", toolEntry); //$NON-NLS-2$

-		final Tool tool = toolEntry.createTool();

-		assertNotNull("The tool with id " + toolId + " couldn't be created", tool); //$NON-NLS-2$

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				initializeTool(tool);

-			}

-		});

-		return tool;

-	}

-

-	protected void initializeTool(final Tool tool) {

-		tool.setViewer(this.diagramEditor.getDiagramGraphicalViewer());

-		tool.setEditDomain((EditDomain) this.diagramEditor.getDiagramEditDomain());

-	}

-

-	/**

-	 * Find a tool with the given id in the given palette container.

-	 *

-	 * @param toolId

-	 *            the id of the tool to return

-	 * @param paletteContainer

-	 *            the palette root

-	 * @return the tool entry, from which a new instance of the tool can be created

-	 */

-	protected ToolEntry findToolEntry(final String toolId, final PaletteContainer paletteContainer) {

-		final List<?> children = paletteContainer.getChildren();

-		for (final Object child : children) {

-			if (child instanceof PaletteContainer) {

-				final PaletteContainer childContainer = (PaletteContainer) child;

-				final ToolEntry subresult = findToolEntry(toolId, childContainer);

-				if (subresult != null) {

-					return subresult;

-				}

-			} else if (child instanceof ToolEntry) {

-				final ToolEntry toolEntry = (ToolEntry) child;

-				if (toolId.equals(toolEntry.getId())) {

-					return toolEntry;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Emulate a click of the given tool at the given point on the diagram (the tool should be {@link Tool#activate()

-	 * activated}.

-	 */

-	protected void internalClickTool(final Tool tool, final Point point) {

-		final Event event = new Event();

-		event.x = point.x;

-		event.y = point.y;

-		event.widget = this.diagramEditor.getDiagramGraphicalViewer().getControl();

-		event.button = 1;

-		// final MouseEvent mouseEvent = new MouseEvent(null, figure, );

-		final MouseEvent mouseEvent = new MouseEvent(event);

-		event.type = SWT.MouseMove;

-		tool.mouseMove(mouseEvent, this.diagramEditor.getDiagramEditPart().getViewer());

-		event.type = SWT.MouseDown;

-		tool.mouseDown(mouseEvent, this.diagramEditor.getDiagramEditPart().getViewer());

-		event.type = SWT.MouseUp;

-		tool.mouseUp(mouseEvent, this.diagramEditor.getDiagramEditPart().getViewer());

-	}

-

-	/**

-	 * Send an SelectionRequest of type "open" to the given EditPart (this is what happens when the user double-clicks).

-	 */

-	protected static void sendOpenSelectionRequest(final GraphicalEditPart graphicalEditPart, final Point point) {

-		final SelectionRequest openRequest = new SelectionRequest();

-		openRequest.setType(RequestConstants.REQ_OPEN);

-		openRequest.setLastButtonPressed(0);

-		openRequest.setLocation(point);

-		graphicalEditPart.performRequest(openRequest);

-	}

-

-	/** Finds a {@link Text} widget inside the diagram control ({@link FigureCanvas}). */

-	protected Text findVisibleTextWidgetOnDiagram() {

-		final Text[] result = new Text[1];

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				final Composite composite = (Composite) getDiagramEditor().getDiagramGraphicalViewer().getControl();

-				result[0] = findVisibleTextWidget(composite);

-			}

-		});

-		return result[0];

-	}

-

-	/** Finds a {@link Text} widget inside the given composite, recursively. */

-	protected Text findVisibleTextWidget(final Composite composite) {

-		final Control[] children = composite.getChildren();

-		for (final Control child : children) {

-			if (child instanceof Text) {

-				final Text text = (Text) child;

-				if (text.isVisible()) {

-					return text;

-				}

-			} else if (child instanceof Composite) {

-				final Composite childComposite = (Composite) child;

-				final Text subresult = findVisibleTextWidget(childComposite);

-				if (subresult != null) {

-					return subresult;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Find the EditPart corresponding to the given View, or <code>null</code> if it doesn't exist, or is not registered

-	 * in the viewer's visual part map.

-	 *

-	 * @param view

-	 *            the view for which to find a corresponding EditPart

-	 * @return the EditPart corresponding to the View

-	 */

-	protected EditPart findEditPart(final View view) {

-		final Object result = this.diagramEditPart.getRoot().getViewer().getVisualPartMap().get(view);

-		assertTrue("The EditPart corresponding to the View was not found", result instanceof EditPart);

-		return (EditPart) result;

-	}

-

-	/** Processes all events waiting in the Display's event loop and then returns. */

-	protected static void flushEventLoop() {

-		final Display display = Display.getDefault();

-		display.syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				try {

-					while (display.readAndDispatch()) {

-						// nothing

-					}

-				} catch (Exception ex) {

-					// Do not fail the test for invalid runnables

-				}

-			}

-		});

-	}

-

-	/**

-	 * Move the given EditPart in its parent.

-	 *

-	 * @param editPartToMove

-	 *            the EditPart to move

-	 * @param parentEditPart

-	 *            the parent

-	 * @param moveDelta

-	 *            the offset

-	 */

-	protected void moveEditPart(final GraphicalEditPart editPartToMove, final GraphicalEditPart parentEditPart, final Point moveDelta) {

-		moveEditParts(Collections.singletonList(editPartToMove), parentEditPart, moveDelta);

-	}

-

-	/**

-	 * Resize the given EditPart in its parent.

-	 *

-	 * @param editPartToResize

-	 *            the EditPart to resize

-	 * @param parentEditPart

-	 *            the parent

-	 * @param resizeDelta

-	 *            the size offset

-	 * @param direction

-	 *            the direction to resize (cf {@link PositionConstants})

-	 */

-	protected void resizeEditPart(final GraphicalEditPart editPartToResize, final GraphicalEditPart parentEditPart, final Dimension resizeDelta, final int direction) {

-		resizeEditParts(Collections.singletonList(editPartToResize), parentEditPart, resizeDelta, direction);

-	}

-

-	/**

-	 * Move the given EditParts in their parent.

-	 *

-	 * @param editPartsToMove

-	 *            the EditParts to move

-	 * @param parentEditPart

-	 *            the parent

-	 * @param moveDelta

-	 *            the location offset

-	 */

-	protected void moveEditParts(final List<? extends GraphicalEditPart> editPartsToMove, final GraphicalEditPart parentEditPart, final Point moveDelta) {

-		if (editPartsToMove.size() < 1 || parentEditPart == null || moveDelta == null) {

-			throw new IllegalArgumentException();

-		}

-		final ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest();

-		changeBoundsRequest.setType(RequestConstants.REQ_MOVE_CHILDREN);

-		// emulate a drag&drop with the mouse over the first EditPart

-		changeBoundsRequest.setLocation(computeLocationWithDelta(editPartsToMove.get(0), moveDelta));

-		changeBoundsRequest.setMoveDelta(moveDelta);

-		changeBoundsRequest.setEditParts(editPartsToMove);

-		final Command command = parentEditPart.getCommand(changeBoundsRequest);

-		checkCommand(command);

-		executeOnUIThread(command);

-		flushEventLoop();

-	}

-

-	/**

-	 * Resize the given EditParts in their parent.

-	 *

-	 * @param editPartsToMove

-	 *            the EditParts to resize

-	 * @param parentEditPart

-	 *            the parent

-	 * @param resizeDelta

-	 *            the size offset

-	 * @param direction

-	 *            the direction to resize (cf {@link PositionConstants})

-	 */

-	protected void resizeEditParts(final List<? extends GraphicalEditPart> editPartsToResize, final GraphicalEditPart parentEditPart, final Dimension resizeDelta, final int direction) {

-		if (editPartsToResize.size() < 1 || parentEditPart == null || resizeDelta == null) {

-			throw new IllegalArgumentException();

-		}

-		final ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest();

-		changeBoundsRequest.setType(RequestConstants.REQ_RESIZE_CHILDREN);

-		changeBoundsRequest.setLocation(computeLocationWithDelta(editPartsToResize.get(0), new Point(resizeDelta.width, resizeDelta.height)));

-		changeBoundsRequest.setMoveDelta(new Point());

-		changeBoundsRequest.setSizeDelta(resizeDelta);

-		changeBoundsRequest.setResizeDirection(direction);

-		changeBoundsRequest.setEditParts(editPartsToResize);

-		final Command command = parentEditPart.getCommand(changeBoundsRequest);

-		checkCommand(command);

-		executeOnUIThread(command);

-		flushEventLoop();

-	}

-

-	/**

-	 * Compute a Location for the mouse pointer that would occur when dragging the center of the given EditPart by the

-	 * given translation vector.

-	 *

-	 * @param graphicalEditPart

-	 *            the EditPart being dragged

-	 * @param moveDelta

-	 *            the offset (the translation vector)

-	 * @return the target Location

-	 */

-	private static Point computeLocationWithDelta(final GraphicalEditPart graphicalEditPart, final Point moveDelta) {

-		return getAbsoluteBounds(graphicalEditPart).getCenter().translate(moveDelta);

-	}

-

-	protected static Rectangle getBounds(final GraphicalEditPart graphicalEditPart) {

-		return new Rectangle(graphicalEditPart.getFigure().getBounds());

-	}

-

-	/** Return the center of the given EditPart's Figure, in absolute coordinates. */

-	protected static Point getCenterPoint(final GraphicalEditPart editPart) {

-		final Rectangle bounds = new Rectangle(editPart.getFigure().getBounds());

-		editPart.getFigure().getParent().translateToAbsolute(bounds);

-		final Point point = new Point(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);

-		return point;

-	}

-

-	protected static Rectangle getAbsoluteBounds(final GraphicalEditPart graphicalEditPart) {

-		final Rectangle bounds = getBounds(graphicalEditPart);

-		graphicalEditPart.getFigure().getParent().translateToAbsolute(bounds);

-		return bounds;

-	}

-

-	/**

-	 * Check that undo and redo work correctly after moving/resizing an EditPart (the EditPart must have been

-	 * moved/resized before calling this method).

-	 *

-	 * @param editPart

-	 *            an EditPart that was just moved/resized

-	 * @param boundsBefore

-	 *            the bounds of this EditPart before it was moved/resized

-	 */

-	protected void testUndoRedoChangeBoundsEditPart(final GraphicalEditPart editPart, final Rectangle boundsBefore) {

-		final Rectangle boundsAfter = getBounds(editPart);

-

-		// test undo

-		undoOnUIThread();

-		flushEventLoop();

-		Rectangle bounds = getBounds(editPart);

-		assertEquals("The bounds change should be undone", boundsBefore, bounds);

-

-		// test redo

-		redoOnUIThread();

-		flushEventLoop();

-		bounds = getBounds(editPart);

-		assertEquals("The bounds change should be redone", boundsAfter, bounds);

-	}

-

-	/**

-	 * Check the bounds of the given GraphicalEditPart's Figure

-	 *

-	 * @param graphicalEditPart

-	 *            The EditPart whose Figure's bounds to check

-	 * @param expectedPosition

-	 *            the expected position (-1 for any of the coordinates means not to check this coordinate)

-	 * @param expectedSize

-	 *            the expected size (-1 for any of the coordinates means not to check this coordinate)

-	 * @param xErrorMargin

-	 *            an error margin for the horizontal position

-	 * @param yErrorMargin

-	 *            an error margin for the vertical position

-	 * @param widthErrorMargin

-	 *            an error margin for the width

-	 * @param heightErrorMargin

-	 *            an error margin for the height

-	 */

-	protected static void assertBounds(final GraphicalEditPart graphicalEditPart, final Point expectedPosition, final Dimension expectedSize, final int xErrorMargin, final int yErrorMargin, final int widthErrorMargin, final int heightErrorMargin) {

-		assertBounds(graphicalEditPart, new Rectangle(expectedPosition, expectedSize), xErrorMargin, yErrorMargin, widthErrorMargin, heightErrorMargin);

-	}

-

-	/**

-	 * Check the bounds of the given GraphicalEditPart's Figure

-	 *

-	 * @param graphicalEditPart

-	 *            The EditPart whose Figure's bounds to check

-	 * @param expectedBounds

-	 *            the expected bounds (-1 for any of the coordinates means not to check this coordinate)

-	 * @param xErrorMargin

-	 *            an error margin for the horizontal position

-	 * @param yErrorMargin

-	 *            an error margin for the vertical position

-	 * @param widthErrorMargin

-	 *            an error margin for the width

-	 * @param heightErrorMargin

-	 *            an error margin for the height

-	 */

-	protected static void assertBounds(final GraphicalEditPart graphicalEditPart, final Rectangle expectedBounds, final int xErrorMargin, final int yErrorMargin, final int widthErrorMargin, final int heightErrorMargin) {

-		// let GMF do its layout so that the bounds are correct

-		flushEventLoop();

-		final Rectangle bounds = getBounds(graphicalEditPart);

-		if (expectedBounds.width != -1) {

-			assertTrue("The element should be about " + expectedBounds.width + " pixels wide", Math.abs(bounds.width - expectedBounds.width) <= widthErrorMargin);

-		}

-		if (expectedBounds.height != -1) {

-			assertTrue("The element should be about " + expectedBounds.height + " pixels high", Math.abs(bounds.height - expectedBounds.height) <= heightErrorMargin);

-		}

-		if (expectedBounds.x != -1) {

-			assertTrue("The element should have a horizontal position at about " + expectedBounds.x + " pixels", Math.abs(bounds.x - expectedBounds.x) <= xErrorMargin);

-		}

-		if (expectedBounds.y != -1) {

-			assertTrue("The element should have a vertical position at about " + expectedBounds.y + " pixels", Math.abs(bounds.y - expectedBounds.y) <= yErrorMargin);

-		}

-	}

-

-	/**

-	 * Find the EditPart corresponding to the given View in the given parent EditPart's children.

-	 *

-	 * @param parentEditPart

-	 *            the EditPart in which the EditPart we are looking for should be found

-	 * @param view

-	 *            the View corresponding to the searched EditPart

-	 * @return the found EditPart

-	 */

-	protected static EditPart findChildEditPartAssociatedToView(final EditPart parentEditPart, final View view) {

-		EditPart result = null;

-		@SuppressWarnings("unchecked")

-		final List<EditPart> children = parentEditPart.getChildren();

-		for (final EditPart editPart : children) {

-			if (view == editPart.getModel()) {

-				result = editPart;

-			}

-		}

-		assertNotNull("There should be an EditPart corresponding to the View", result);

-		return result;

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 434993
+ *  Christian W. Damus (CEA) - bug 436047
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.timing.tests.generic;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IOperationHistoryListener;
+import org.eclipse.core.commands.operations.OperationHistoryEvent;
+import org.eclipse.core.commands.operations.OperationHistoryFactory;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.draw2d.FigureCanvas;
+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.Rectangle;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gef.EditDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.Tool;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.palette.PaletteContainer;
+import org.eclipse.gef.palette.ToolEntry;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef.requests.SelectionRequest;
+import org.eclipse.gef.ui.palette.PaletteViewer;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+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.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.diagram.ui.util.INotationType;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;
+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPreferenceConstants;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroPart;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.NamedElement;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+
+// DiResourceSet is deprecated but we need it for CreateUMLModelCommand
+@SuppressWarnings({ "deprecation" })
+public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	protected PapyrusMultiDiagramEditor papyrusEditor;
+
+	protected DiResourceSet diResourceSet;
+
+	protected IProject project;
+
+	protected IFile file;
+
+	protected UmlGmfDiagramEditor diagramEditor = null;
+
+	protected DiagramEditPart diagramEditPart;
+
+	protected boolean operationFailed = false;
+
+	@Before
+	public void setUp() throws Exception {
+		Runnable closeIntroRunnable = new Runnable() {
+
+			@Override
+			public void run() {
+				IIntroPart introPart = PlatformUI.getWorkbench().getIntroManager().getIntro();
+				PlatformUI.getWorkbench().getIntroManager().closeIntro(introPart);
+			}
+		};
+		PlatformUI.getWorkbench().getDisplay().syncExec(closeIntroRunnable);
+
+		// add a listener for failed operations
+		OperationHistoryFactory.getOperationHistory().addOperationHistoryListener(new IOperationHistoryListener() {
+
+			@Override
+			public void historyNotification(final OperationHistoryEvent event) {
+				if (event.getEventType() == OperationHistoryEvent.OPERATION_NOT_OK) {
+					AbstractPapyrusTestCase.this.operationFailed = true;
+				}
+			}
+		});
+
+		// disable useless animations (slows down unit tests)
+		PlatformUI.getPreferenceStore().setValue(IWorkbenchPreferenceConstants.ENABLE_ANIMATIONS, false);
+		// maximize the workbench window
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				maximize();
+				// closeAllViewsAndEditors();
+			}
+		});
+		// create a project, model, diagram, and open the diagram in the associated Papyrus editor
+		projectCreation();
+	}
+
+	/**
+	 * Reset the "operation failed" state. Call this before executing each operation for which you want to test whether
+	 * if failed with {@link AbstractPapyrusTestCase#assertLastOperationSuccessful()}.
+	 */
+	protected void resetLastOperationFailedState() {
+		this.operationFailed = false;
+	}
+
+	/**
+	 * Asserts that no Command executed on the {@link IOperationHistory} since the last call to {@link AbstractPapyrusTestCase#resetLastOperationFailedState resetLastOperationFailedState} returned {@link OperationHistoryEvent#OPERATION_NOT_OK}.
+	 *
+	 */
+	protected void assertLastOperationSuccessful() {
+		assertFalse("The operation failed. Look at the log, or put a breakpoint on ExecutionException or DefaultOperationHistory#notifyNotOK to find the cause.", this.operationFailed);
+	}
+
+	protected View getRootView() {
+		return getDiagramEditPart().getDiagramView();
+	}
+
+	protected Element getRootSemanticModel() {
+		return (Element) getRootView().getElement();
+	}
+
+	protected UmlGmfDiagramEditor getDiagramEditor() {
+		return this.diagramEditor;
+	}
+
+	@After
+	public void tearDown() throws Exception {
+		this.papyrusEditor.doSave(new NullProgressMonitor());
+		// diResourceSet.save( new NullProgressMonitor());
+		// diagramEditor.close(true);
+		this.papyrusEditor = null;
+	}
+
+	protected DiagramEditPart getDiagramEditPart() {
+		if (this.diagramEditPart == null) {
+			this.diagramEditor = (UmlGmfDiagramEditor) this.papyrusEditor.getActiveEditor();
+			this.diagramEditPart = (DiagramEditPart) this.papyrusEditor.getAdapter(DiagramEditPart.class);
+
+			Assert.assertNotNull("Cannot find the diagram editor", diagramEditor);
+			Assert.assertNotNull("Cannot find the Diagram edit part", diagramEditPart);
+		}
+		return this.diagramEditPart;
+	}
+
+	protected abstract ICreationCommand getDiagramCommandCreation();
+
+	protected void projectCreation() throws Exception {
+		final String timestamp = Long.toString(System.currentTimeMillis());
+		this.project = houseKeeper.createProject("DiagramTestProject_" + timestamp);
+		this.file = this.project.getFile("DiagramTest_" + timestamp + ".di"); //$NON-NLS-2$
+		this.diResourceSet = new DiResourceSet();
+
+		// at this point, no resources have been created
+		if (this.file.exists()) {
+			this.file.delete(true, new NullProgressMonitor());
+		}
+
+		if (!this.file.exists()) {
+			// Don't create a zero-byte file. Create an empty XMI document
+			Resource diResource = diResourceSet.createResource(URI.createPlatformResourceURI(file.getFullPath().toString(), true));
+			diResource.save(null);
+			diResource.unload();
+			this.diResourceSet.createsModels(this.file);
+			new CreateUMLModelCommand().createModel(this.diResourceSet);
+			ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
+			try {
+				registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); // High priority to override all contributions
+				registry.startRegistry();
+			} catch (ServiceException ex) {
+				// Ignore exceptions
+			}
+			// diResourceSet.createsModels(file);
+			final ICreationCommand command = getDiagramCommandCreation();
+			command.createDiagram(this.diResourceSet, null, "DiagramToTest");
+			this.diResourceSet.save(new NullProgressMonitor());
+
+		}
+		IEditorPart _editor = houseKeeper.openPapyrusEditor(file);
+		assertTrue("The editor must be a " + PapyrusMultiDiagramEditor.class.getSimpleName() + " (Actual type: " + _editor.getClass().getSimpleName() + ")", _editor instanceof PapyrusMultiDiagramEditor);
+		this.papyrusEditor = ((PapyrusMultiDiagramEditor) _editor);
+		flushEventLoop();
+	}
+
+	protected static void maximize() {
+		// PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().setMaximized(true);
+	}
+
+	protected static void closeAllViewsAndEditors() {
+		// final IWorkbench workbench = PlatformUI.getWorkbench();
+		// for(final IWorkbenchWindow workbenchWindow : workbench.getWorkbenchWindows()) {
+		// final IWorkbenchPage[] pages = workbenchWindow.getPages();
+		// for(final IWorkbenchPage page : pages) {
+		// final IViewReference[] viewReferences = page.getViewReferences();
+		// for(final IViewReference viewReference : viewReferences) {
+		// page.hideView(viewReference);
+		// }
+		// page.closeAllEditors(false);
+		// }
+		// }
+	}
+
+	/**
+	 * Create a view for the given type, plus the associated semantic element unless the given type is a notation-only
+	 * type.
+	 *
+	 * <ul>
+	 * <li>if type is an {@link INotationType}, then create a view using a {@link CreateViewRequest}
+	 * <li>otherwise, create a view and the corresponding semantic element using a CreateViewAndElementRequest
+	 * </ul>
+	 *
+	 * @param elementType
+	 *            the type for which to create a view (and possibly a model element)
+	 * @param parentEditPart
+	 *            the edit part to which the creation request must be sent
+	 * @return the created View
+	 */
+	protected View createView(final IElementType elementType, final EditPart parentEditPart) {
+		return createView(elementType, null, null, parentEditPart);
+	}
+
+	/**
+	 * Create a view for the given type, plus the associated semantic element unless the given type is a notation-only
+	 * type.
+	 *
+	 * <ul>
+	 * <li>if type is an {@link INotationType}, then create a view using a {@link CreateViewRequest}
+	 * <li>otherwise, create a view and the corresponding semantic element using a CreateViewAndElementRequest
+	 * </ul>
+	 *
+	 * @param elementType
+	 *            the type for which to create a view (and possibly a model element)
+	 * @param location
+	 *            the position of the new view (may be <code>null</code>)
+	 * @param size
+	 *            the size of the new view (may be <code>null</code>)
+	 * @param parentEditPart
+	 *            the edit part to which the creation request must be sent
+	 * @return the created View
+	 */
+	protected View createView(final IElementType elementType, final Point location, final Dimension size, final EditPart parentEditPart) {
+		final View[] result = new View[1];
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				final CreateViewRequest createRequest = CreateViewRequestFactory.getCreateShapeRequest(elementType, getDiagramEditPart().getDiagramPreferencesHint());
+				if (size != null) {
+					createRequest.setSize(size);
+				}
+				if (location != null) {
+					createRequest.setLocation(location);
+				}
+				final Command command = parentEditPart.getCommand(createRequest);
+				checkCommand(command);
+				execute(command);
+
+				result[0] = getCreatedViewFromCommand(command);
+			}
+		});
+		return result[0];
+	}
+
+	protected static View getCreatedViewFromCommand(final Command command) {
+		final List<CreateCommand> createCommands = new ArrayList<CreateCommand>();
+		findNestedCreateCommands(command, createCommands);
+		assertEquals("There should be one CreateCommand inside the command", 1, createCommands.size());
+		final Object returnValue = createCommands.get(0).getCommandResult().getReturnValue();
+		if (returnValue instanceof IAdaptable) {
+			final IAdaptable adaptableResult = (IAdaptable) returnValue;
+			final View view = (View) adaptableResult.getAdapter(View.class);
+			if (view != null) {
+				return view;
+			}
+		}
+		fail("CreateView command result not found");
+		return null;
+	}
+
+	private static void findNestedCreateCommands(final Command gefCommand, final List<CreateCommand> createCommands) {
+		if (gefCommand instanceof CompoundCommand) {
+			final CompoundCommand compoundCommand = (CompoundCommand) gefCommand;
+			@SuppressWarnings("unchecked")
+			final List<Command> commands = compoundCommand.getCommands();
+			for (final Command childCommand : commands) {
+				findNestedCreateCommands(childCommand, createCommands);
+			}
+		} else if (gefCommand instanceof ICommandProxy) {
+			final ICommandProxy commandProxy = (ICommandProxy) gefCommand;
+			final ICommand iCommand = commandProxy.getICommand();
+			findNestedCreateCommands(iCommand, createCommands);
+		}
+	}
+
+	private static void findNestedCreateCommands(final ICommand gmfCommand, final List<CreateCommand> createCommands) {
+		if (gmfCommand instanceof CompositeCommand) {
+			final CompositeCommand compositeCommand = (CompositeCommand) gmfCommand;
+			final Iterator<?> iterator = compositeCommand.iterator();
+			while (iterator.hasNext()) {
+				final Object element = iterator.next();
+				if (element instanceof ICommand) {
+					final ICommand subCommand = (ICommand) element;
+					findNestedCreateCommands(subCommand, createCommands);
+				} else {
+					fail("error");
+				}
+			}
+		} else if (gmfCommand instanceof CreateCommand) {
+			createCommands.add((CreateCommand) gmfCommand);
+		} else if (gmfCommand instanceof CommandProxy) {
+			final CommandProxy commandProxy = (CommandProxy) gmfCommand;
+			findNestedCreateCommands(commandProxy.getCommand(), createCommands);
+		}
+	}
+
+	/**
+	 * This tests the deletion of the View for the given GraphicalEditPart (this checks that the View is removed, but
+	 * the semantic model is untouched).
+	 */
+	protected void testHide(final GraphicalEditPart editPart) {
+		final EditPart parent = editPart.getParent();
+		final int sizeBefore = parent.getChildren().size();
+		final EObject semanticElement = ((View) editPart.getModel()).getElement();
+		assertTrue("The semantic element should be in a Model", isInModel(semanticElement));
+
+		executeHideCommand(editPart);
+		assertEquals("The parent edit part should now contain one less child", sizeBefore - 1, parent.getChildren().size());
+		assertTrue("The semantic element should still be in the Model after deleting the View", isInModel(semanticElement));
+		undo();
+		assertEquals("The child should be back after the undo", sizeBefore, parent.getChildren().size());
+		assertTrue("The semantic element should still be in the Model after undoing the View deletion", isInModel(semanticElement));
+		redo();
+		assertEquals("The child should be removed after the redo", sizeBefore - 1, parent.getChildren().size());
+		assertTrue("The semantic element should still be in the Model after redoing the View deletion", isInModel(semanticElement));
+	}
+
+	/**
+	 * Send the given EditPart a "delete" request (which only deletes the View), and execute the returned command.
+	 *
+	 * @param editPart
+	 *            the EditPart to hide
+	 */
+	protected void executeHideCommand(final GraphicalEditPart editPart) {
+		final GroupRequest deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		deleteViewRequest.setEditParts(editPart);
+		final Command command = editPart.getCommand(deleteViewRequest);
+		checkCommand(command);
+		execute(command);
+	}
+
+	/** This tests the destruction of both the model and View for the given GraphicalEditPart. */
+	protected void testDelete(final GraphicalEditPart editPart) {
+		final EditPart parent = editPart.getParent();
+		final int sizeBefore = parent.getChildren().size();
+		final EObject semanticElement = ((View) editPart.getModel()).getElement();
+		assertTrue("The semantic element should be in a Model", isInModel(semanticElement));
+
+		executeDestroyCommand(editPart);
+		assertEquals("The parent edit part should now contain one less child", sizeBefore - 1, parent.getChildren().size());
+		assertFalse("The semantic element should not be in the Model any more after deleting it", isInModel(semanticElement));
+		undo();
+		assertEquals("The child should be back after the undo", sizeBefore, parent.getChildren().size());
+		assertTrue("The semantic element should be back in the Model after undoing the deletion", isInModel(semanticElement));
+		redo();
+		assertEquals("The child should be removed after the redo", sizeBefore - 1, parent.getChildren().size());
+		assertFalse("The semantic element should not be in the Model after redoing the deletion", isInModel(semanticElement));
+	}
+
+	/**
+	 * Send the given EditPart a {@link DestroyElementRequest}, and execute the returned command.
+	 *
+	 * @param editPart
+	 *            the EditPart to destroy
+	 */
+	protected void executeDestroyCommand(final GraphicalEditPart editPart) {
+		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		final Command command = editPart.getCommand(destroyElementRequest);
+		checkCommand(command);
+		execute(command);
+	}
+
+	/**
+	 * @param targetEditPart
+	 *            the EditPart on top of which the drop will happen. This will determine the coordinates of the drop.
+	 * @param parentEditPart
+	 *            the EditPart in which the element will really be added. Often the same EditPart as targetEditPart,
+	 *            unless dropping on top of the first EditPart puts the element in another edit part.
+	 * @param droppedElement
+	 *            the element to drop
+	 */
+	public void testDrop(final GraphicalEditPart targetEditPart, final GraphicalEditPart parentEditPart, final EObject droppedElement) {
+		final int sizeBefore = parentEditPart.getChildren().size();
+		final DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		final ArrayList<EObject> list = new ArrayList<EObject>();
+		list.add(droppedElement);
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(new Point(1, 1));
+		final Command command = targetEditPart.getCommand(dropObjectsRequest);
+		checkCommand(command);
+		execute(command);
+		assertEquals("The parent edit part should now contain one more child", sizeBefore + 1, parentEditPart.getChildren().size());
+		assertTrue("The dropped element should now be in the Model", isInModel(droppedElement));
+		undo();
+		assertEquals("The editpart should be removed after undo", sizeBefore, parentEditPart.getChildren().size());
+		assertTrue("The semantic element should still be in the Model after undoing the drop", isInModel(droppedElement));
+		redo();
+		assertEquals("The parent edit part should contain one more child after redo", sizeBefore + 1, parentEditPart.getChildren().size());
+		assertTrue("The dropped element should be in the Model after redo", isInModel(droppedElement));
+	}
+
+	/**
+	 * Return whether the given model element is contained by a UML {@link Model}. This is useful in order to determine
+	 * if an element was deleted (removed from the Model).
+	 */
+	protected static boolean isInModel(final EObject semanticElement) {
+		EObject parent = semanticElement.eContainer();
+		while (parent != null) {
+			if (parent instanceof Model) {
+				return true;
+			}
+			parent = parent.eContainer();
+		}
+		return false;
+	}
+
+	/** Check that the given command is executable. */
+	protected static void checkCommand(final Command command) {
+		assertNotNull("The command must not be null", command);
+		assertTrue("The command must be executable", command.canExecute());
+	}
+
+	/** The command stack to use to execute commands on the diagram. */
+	protected CommandStack getCommandStack() {
+		// not "diagramEditor.getDiagramEditDomain().getDiagramCommandStack()" because it messes up undo contexts
+		return this.diagramEditor.getEditingDomain().getCommandStack();
+	}
+
+	/** Execute the given command in the diagram editor. */
+	protected void execute(final Command command) {
+		resetLastOperationFailedState();
+		getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+		assertLastOperationSuccessful();
+	}
+
+	/** Undo the last command done in the diagram editor. */
+	protected void undo() {
+		resetLastOperationFailedState();
+		final CommandStack commandStack = getCommandStack();
+		assertTrue("We should be able to undo", commandStack.canUndo());
+		commandStack.undo();
+		assertLastOperationSuccessful();
+	}
+
+	/** Redo the last command undone in the diagram editor. */
+	protected void redo() {
+		resetLastOperationFailedState();
+		final CommandStack commandStack = getCommandStack();
+		assertTrue("We should be able to redo", commandStack.canRedo());
+		commandStack.redo();
+		assertLastOperationSuccessful();
+	}
+
+	/** Call {@link AbstractPapyrusTestCase#execute(Command) execute} on the UI thread. */
+	protected void executeOnUIThread(final Command command) {
+		execute(command);
+		// Display.getDefault().syncExec(new Runnable() {
+		//
+		// public void run() {
+		// execute(command);
+		// }
+		// });
+	}
+
+	/** Call {@link AbstractPapyrusTestCase#undo() undo} on the UI thread. */
+	protected void undoOnUIThread() {
+		undo();
+		// Display.getDefault().syncExec(new Runnable() {
+		//
+		// public void run() {
+		// undo();
+		// }
+		// });
+	}
+
+	/** Call {@link AbstractPapyrusTestCase#redo() redo} on the UI thread. */
+	protected void redoOnUIThread() {
+		redo();
+		// Display.getDefault().syncExec(new Runnable() {
+		//
+		// public void run() {
+		// redo();
+		// }
+		// });
+	}
+
+	/**
+	 * Delete the View associated with the given EditPart, so that it is effectively hidden from the diagram without
+	 * removing the corresponding semantic element.
+	 */
+	protected void hide(final GraphicalEditPart editPart) {
+		final Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		final Command command = editPart.getCommand(deleteViewRequest);
+		execute(command);
+	}
+
+	// protected void sendKey(final Control control, final int key) {
+	// if (!control.setFocus()) {
+	// throw new RuntimeException("Cannot give focus to the control");
+	// }
+	//
+	// final Display display = Display.getDefault();
+	// final Event keyDownEvent = new Event();
+	// keyDownEvent.type = SWT.KeyDown;
+	// keyDownEvent.keyCode = key;
+	// display.post(keyDownEvent);
+	// final Event keyUpEvent = new Event();
+	// keyUpEvent.type = SWT.KeyUp;
+	// keyUpEvent.keyCode = key;
+	// display.post(keyUpEvent);
+	// }
+
+	protected interface INameProvider<T extends EObject> {
+
+		String getName(T element);
+	}
+
+	/**
+	 * Test setting the name on the given editPart, using a DirectEditRequest. Check that the name is set on the given
+	 * named element. Also test undo and redo.
+	 */
+	protected <T extends EObject> void testSetNameWithDirectEditRequest(final GraphicalEditPart editPart, final T element, final INameProvider<T> nameProvider) {
+		// set first name
+		final String name1 = "test name 1 " + System.currentTimeMillis();
+		setNameWithDirectEditRequest(editPart, name1);
+		flushEventLoop();
+		assertEquals("The element should have the first name", name1, nameProvider.getName(element));
+		// set second name
+		final String name2 = "test name 2 " + System.currentTimeMillis();
+		setNameWithDirectEditRequest(editPart, name2);
+		flushEventLoop();
+		assertEquals("The element should have the second name", name2, nameProvider.getName(element));
+		// test undo
+		undo();
+		assertEquals("The element name should be reset to the first name after undo", name1, nameProvider.getName(element));
+		// test redo
+		redo();
+		assertEquals("The element name should be reset to the second name after redo", name2, nameProvider.getName(element));
+	}
+
+	/**
+	 * Test setting the name on the given editPart, using a DirectEditRequest. Check that the name is set on the given
+	 * named element. Also test undo and redo.
+	 */
+	protected void testSetNameWithDirectEditRequest(final GraphicalEditPart editPart, final NamedElement namedElement) {
+		testSetNameWithDirectEditRequest(editPart, namedElement, new INameProvider<NamedElement>() {
+
+			@Override
+			public String getName(final NamedElement element) {
+				return element.getName();
+			}
+		});
+	}
+
+	/**
+	 * Set the name of the given GraphicalEditPart (which must be a name edit part) using a DirectEditRequest. This sets
+	 * the name in the Text widget that appears as a result of the DirectEditRequest, and then closes the Text widget to
+	 * accept the changes.
+	 *
+	 * @param editPart
+	 *            the edit part on which to perform the DirectEditRequest.
+	 * @param newName
+	 *            the name to set
+	 */
+	protected void setNameWithDirectEditRequest(final GraphicalEditPart editPart, final String newName) {
+		final IFigure nameFigure = editPart.getFigure();
+		final Rectangle bounds = nameFigure.getBounds();
+		final Point center = bounds.getCenter();
+		final DirectEditRequest directEditRequest = new DirectEditRequest();
+		directEditRequest.setLocation(center);
+		final Text textWidget = performDirectEditRequest(editPart, directEditRequest);
+		setText(textWidget, newName);
+	}
+
+	/** Changes the text of the given Text widget, and then removes the focus from this text in order to commit changes. */
+	protected static void setText(final Text textWidget, final String newName) {
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				textWidget.setText(newName);
+				// change the focus in order to accept the text
+				textWidget.getShell().setFocus();
+			}
+		});
+	}
+
+	/**
+	 * Performs the given DirectEditRequest on the given EditPart, and returns the Text widget that appears to let the
+	 * user edit the label.
+	 */
+	protected Text performDirectEditRequest(final EditPart editPart, final DirectEditRequest directEditRequest) {
+		final Text[] result = new Text[1];
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				// note: both operations need to be performed in the same display runnable
+				editPart.performRequest(directEditRequest);
+				result[0] = findVisibleTextWidgetOnDiagram();
+			}
+		});
+		assertNotNull("The DirectEditRequest should open a Text field", result[0]);
+		return result[0];
+	}
+
+	/**
+	 * Click the palette tool with the given id on the center of the given EditPart's Figure.
+	 *
+	 * @param toolId
+	 *            the id of the tool to click
+	 * @param target
+	 *            what to click
+	 */
+	protected void clickTool(final String toolId, final GraphicalEditPart target) {
+		final Point point = getCenterPoint(target);
+		clickTool(toolId, point);
+	}
+
+	/**
+	 * Click the palette tool with the given id at the given location.
+	 *
+	 * @param toolId
+	 *            the id of the tool to click
+	 * @param point
+	 *            where to click
+	 */
+	protected void clickTool(final String toolId, final Point point) {
+		final Tool tool = createTool(toolId);
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				tool.activate();
+				internalClickTool(tool, point);
+				tool.deactivate();
+			}
+		});
+	}
+
+	protected void clickTwiceWithTool(final String toolId, final GraphicalEditPart firstTarget, final GraphicalEditPart secondTarget) {
+		final Point firstPoint = getCenterPoint(firstTarget);
+		final Point secondPoint = getCenterPoint(secondTarget);
+		clickTwiceWithTool(toolId, firstPoint, secondPoint);
+	}
+
+	protected void clickTwiceWithTool(final String toolId, final Point firstPoint, final Point secondPoint) {
+		final Tool tool = createTool(toolId);
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				tool.activate();
+				internalClickTool(tool, firstPoint);
+				internalClickTool(tool, secondPoint);
+				tool.deactivate();
+			}
+		});
+	}
+
+	private Tool createTool(final String toolId) {
+		final PaletteViewer paletteViewer = ((EditDomain) this.diagramEditor.getDiagramEditDomain()).getPaletteViewer();
+		final ToolEntry toolEntry = findToolEntry(toolId, paletteViewer.getPaletteRoot());
+		assertNotNull("The tool with id " + toolId + " was not found in the palette", toolEntry); //$NON-NLS-2$
+		final Tool tool = toolEntry.createTool();
+		assertNotNull("The tool with id " + toolId + " couldn't be created", tool); //$NON-NLS-2$
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				initializeTool(tool);
+			}
+		});
+		return tool;
+	}
+
+	protected void initializeTool(final Tool tool) {
+		tool.setViewer(this.diagramEditor.getDiagramGraphicalViewer());
+		tool.setEditDomain((EditDomain) this.diagramEditor.getDiagramEditDomain());
+	}
+
+	/**
+	 * Find a tool with the given id in the given palette container.
+	 *
+	 * @param toolId
+	 *            the id of the tool to return
+	 * @param paletteContainer
+	 *            the palette root
+	 * @return the tool entry, from which a new instance of the tool can be created
+	 */
+	protected ToolEntry findToolEntry(final String toolId, final PaletteContainer paletteContainer) {
+		final List<?> children = paletteContainer.getChildren();
+		for (final Object child : children) {
+			if (child instanceof PaletteContainer) {
+				final PaletteContainer childContainer = (PaletteContainer) child;
+				final ToolEntry subresult = findToolEntry(toolId, childContainer);
+				if (subresult != null) {
+					return subresult;
+				}
+			} else if (child instanceof ToolEntry) {
+				final ToolEntry toolEntry = (ToolEntry) child;
+				if (toolId.equals(toolEntry.getId())) {
+					return toolEntry;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Emulate a click of the given tool at the given point on the diagram (the tool should be {@link Tool#activate()
+	 * activated}.
+	 */
+	protected void internalClickTool(final Tool tool, final Point point) {
+		final Event event = new Event();
+		event.x = point.x;
+		event.y = point.y;
+		event.widget = this.diagramEditor.getDiagramGraphicalViewer().getControl();
+		event.button = 1;
+		// final MouseEvent mouseEvent = new MouseEvent(null, figure, );
+		final MouseEvent mouseEvent = new MouseEvent(event);
+		event.type = SWT.MouseMove;
+		tool.mouseMove(mouseEvent, this.diagramEditor.getDiagramEditPart().getViewer());
+		event.type = SWT.MouseDown;
+		tool.mouseDown(mouseEvent, this.diagramEditor.getDiagramEditPart().getViewer());
+		event.type = SWT.MouseUp;
+		tool.mouseUp(mouseEvent, this.diagramEditor.getDiagramEditPart().getViewer());
+	}
+
+	/**
+	 * Send an SelectionRequest of type "open" to the given EditPart (this is what happens when the user double-clicks).
+	 */
+	protected static void sendOpenSelectionRequest(final GraphicalEditPart graphicalEditPart, final Point point) {
+		final SelectionRequest openRequest = new SelectionRequest();
+		openRequest.setType(RequestConstants.REQ_OPEN);
+		openRequest.setLastButtonPressed(0);
+		openRequest.setLocation(point);
+		graphicalEditPart.performRequest(openRequest);
+	}
+
+	/** Finds a {@link Text} widget inside the diagram control ({@link FigureCanvas}). */
+	protected Text findVisibleTextWidgetOnDiagram() {
+		final Text[] result = new Text[1];
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				final Composite composite = (Composite) getDiagramEditor().getDiagramGraphicalViewer().getControl();
+				result[0] = findVisibleTextWidget(composite);
+			}
+		});
+		return result[0];
+	}
+
+	/** Finds a {@link Text} widget inside the given composite, recursively. */
+	protected Text findVisibleTextWidget(final Composite composite) {
+		final Control[] children = composite.getChildren();
+		for (final Control child : children) {
+			if (child instanceof Text) {
+				final Text text = (Text) child;
+				if (text.isVisible()) {
+					return text;
+				}
+			} else if (child instanceof Composite) {
+				final Composite childComposite = (Composite) child;
+				final Text subresult = findVisibleTextWidget(childComposite);
+				if (subresult != null) {
+					return subresult;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Find the EditPart corresponding to the given View, or <code>null</code> if it doesn't exist, or is not registered
+	 * in the viewer's visual part map.
+	 *
+	 * @param view
+	 *            the view for which to find a corresponding EditPart
+	 * @return the EditPart corresponding to the View
+	 */
+	protected EditPart findEditPart(final View view) {
+		final Object result = this.diagramEditPart.getRoot().getViewer().getVisualPartMap().get(view);
+		assertTrue("The EditPart corresponding to the View was not found", result instanceof EditPart);
+		return (EditPart) result;
+	}
+
+	/** Processes all events waiting in the Display's event loop and then returns. */
+	protected static void flushEventLoop() {
+		final Display display = Display.getDefault();
+		display.syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				try {
+					while (display.readAndDispatch()) {
+						// nothing
+					}
+				} catch (Exception ex) {
+					// Do not fail the test for invalid runnables
+				}
+			}
+		});
+	}
+
+	/**
+	 * Move the given EditPart in its parent.
+	 *
+	 * @param editPartToMove
+	 *            the EditPart to move
+	 * @param parentEditPart
+	 *            the parent
+	 * @param moveDelta
+	 *            the offset
+	 */
+	protected void moveEditPart(final GraphicalEditPart editPartToMove, final GraphicalEditPart parentEditPart, final Point moveDelta) {
+		moveEditParts(Collections.singletonList(editPartToMove), parentEditPart, moveDelta);
+	}
+
+	/**
+	 * Resize the given EditPart in its parent.
+	 *
+	 * @param editPartToResize
+	 *            the EditPart to resize
+	 * @param parentEditPart
+	 *            the parent
+	 * @param resizeDelta
+	 *            the size offset
+	 * @param direction
+	 *            the direction to resize (cf {@link PositionConstants})
+	 */
+	protected void resizeEditPart(final GraphicalEditPart editPartToResize, final GraphicalEditPart parentEditPart, final Dimension resizeDelta, final int direction) {
+		resizeEditParts(Collections.singletonList(editPartToResize), parentEditPart, resizeDelta, direction);
+	}
+
+	/**
+	 * Move the given EditParts in their parent.
+	 *
+	 * @param editPartsToMove
+	 *            the EditParts to move
+	 * @param parentEditPart
+	 *            the parent
+	 * @param moveDelta
+	 *            the location offset
+	 */
+	protected void moveEditParts(final List<? extends GraphicalEditPart> editPartsToMove, final GraphicalEditPart parentEditPart, final Point moveDelta) {
+		if (editPartsToMove.size() < 1 || parentEditPart == null || moveDelta == null) {
+			throw new IllegalArgumentException();
+		}
+		final ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest();
+		changeBoundsRequest.setType(RequestConstants.REQ_MOVE_CHILDREN);
+		// emulate a drag&drop with the mouse over the first EditPart
+		changeBoundsRequest.setLocation(computeLocationWithDelta(editPartsToMove.get(0), moveDelta));
+		changeBoundsRequest.setMoveDelta(moveDelta);
+		changeBoundsRequest.setEditParts(editPartsToMove);
+		final Command command = parentEditPart.getCommand(changeBoundsRequest);
+		checkCommand(command);
+		executeOnUIThread(command);
+		flushEventLoop();
+	}
+
+	/**
+	 * Resize the given EditParts in their parent.
+	 *
+	 * @param editPartsToMove
+	 *            the EditParts to resize
+	 * @param parentEditPart
+	 *            the parent
+	 * @param resizeDelta
+	 *            the size offset
+	 * @param direction
+	 *            the direction to resize (cf {@link PositionConstants})
+	 */
+	protected void resizeEditParts(final List<? extends GraphicalEditPart> editPartsToResize, final GraphicalEditPart parentEditPart, final Dimension resizeDelta, final int direction) {
+		if (editPartsToResize.size() < 1 || parentEditPart == null || resizeDelta == null) {
+			throw new IllegalArgumentException();
+		}
+		final ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest();
+		changeBoundsRequest.setType(RequestConstants.REQ_RESIZE_CHILDREN);
+		changeBoundsRequest.setLocation(computeLocationWithDelta(editPartsToResize.get(0), new Point(resizeDelta.width, resizeDelta.height)));
+		changeBoundsRequest.setMoveDelta(new Point());
+		changeBoundsRequest.setSizeDelta(resizeDelta);
+		changeBoundsRequest.setResizeDirection(direction);
+		changeBoundsRequest.setEditParts(editPartsToResize);
+		final Command command = parentEditPart.getCommand(changeBoundsRequest);
+		checkCommand(command);
+		executeOnUIThread(command);
+		flushEventLoop();
+	}
+
+	/**
+	 * Compute a Location for the mouse pointer that would occur when dragging the center of the given EditPart by the
+	 * given translation vector.
+	 *
+	 * @param graphicalEditPart
+	 *            the EditPart being dragged
+	 * @param moveDelta
+	 *            the offset (the translation vector)
+	 * @return the target Location
+	 */
+	private static Point computeLocationWithDelta(final GraphicalEditPart graphicalEditPart, final Point moveDelta) {
+		return getAbsoluteBounds(graphicalEditPart).getCenter().translate(moveDelta);
+	}
+
+	protected static Rectangle getBounds(final GraphicalEditPart graphicalEditPart) {
+		return new Rectangle(graphicalEditPart.getFigure().getBounds());
+	}
+
+	/** Return the center of the given EditPart's Figure, in absolute coordinates. */
+	protected static Point getCenterPoint(final GraphicalEditPart editPart) {
+		final Rectangle bounds = new Rectangle(editPart.getFigure().getBounds());
+		editPart.getFigure().getParent().translateToAbsolute(bounds);
+		final Point point = new Point(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);
+		return point;
+	}
+
+	protected static Rectangle getAbsoluteBounds(final GraphicalEditPart graphicalEditPart) {
+		final Rectangle bounds = getBounds(graphicalEditPart);
+		graphicalEditPart.getFigure().getParent().translateToAbsolute(bounds);
+		return bounds;
+	}
+
+	/**
+	 * Check that undo and redo work correctly after moving/resizing an EditPart (the EditPart must have been
+	 * moved/resized before calling this method).
+	 *
+	 * @param editPart
+	 *            an EditPart that was just moved/resized
+	 * @param boundsBefore
+	 *            the bounds of this EditPart before it was moved/resized
+	 */
+	protected void testUndoRedoChangeBoundsEditPart(final GraphicalEditPart editPart, final Rectangle boundsBefore) {
+		final Rectangle boundsAfter = getBounds(editPart);
+
+		// test undo
+		undoOnUIThread();
+		flushEventLoop();
+		Rectangle bounds = getBounds(editPart);
+		assertEquals("The bounds change should be undone", boundsBefore, bounds);
+
+		// test redo
+		redoOnUIThread();
+		flushEventLoop();
+		bounds = getBounds(editPart);
+		assertEquals("The bounds change should be redone", boundsAfter, bounds);
+	}
+
+	/**
+	 * Check the bounds of the given GraphicalEditPart's Figure
+	 *
+	 * @param graphicalEditPart
+	 *            The EditPart whose Figure's bounds to check
+	 * @param expectedPosition
+	 *            the expected position (-1 for any of the coordinates means not to check this coordinate)
+	 * @param expectedSize
+	 *            the expected size (-1 for any of the coordinates means not to check this coordinate)
+	 * @param xErrorMargin
+	 *            an error margin for the horizontal position
+	 * @param yErrorMargin
+	 *            an error margin for the vertical position
+	 * @param widthErrorMargin
+	 *            an error margin for the width
+	 * @param heightErrorMargin
+	 *            an error margin for the height
+	 */
+	protected static void assertBounds(final GraphicalEditPart graphicalEditPart, final Point expectedPosition, final Dimension expectedSize, final int xErrorMargin, final int yErrorMargin, final int widthErrorMargin, final int heightErrorMargin) {
+		assertBounds(graphicalEditPart, new Rectangle(expectedPosition, expectedSize), xErrorMargin, yErrorMargin, widthErrorMargin, heightErrorMargin);
+	}
+
+	/**
+	 * Check the bounds of the given GraphicalEditPart's Figure
+	 *
+	 * @param graphicalEditPart
+	 *            The EditPart whose Figure's bounds to check
+	 * @param expectedBounds
+	 *            the expected bounds (-1 for any of the coordinates means not to check this coordinate)
+	 * @param xErrorMargin
+	 *            an error margin for the horizontal position
+	 * @param yErrorMargin
+	 *            an error margin for the vertical position
+	 * @param widthErrorMargin
+	 *            an error margin for the width
+	 * @param heightErrorMargin
+	 *            an error margin for the height
+	 */
+	protected static void assertBounds(final GraphicalEditPart graphicalEditPart, final Rectangle expectedBounds, final int xErrorMargin, final int yErrorMargin, final int widthErrorMargin, final int heightErrorMargin) {
+		// let GMF do its layout so that the bounds are correct
+		flushEventLoop();
+		final Rectangle bounds = getBounds(graphicalEditPart);
+		if (expectedBounds.width != -1) {
+			assertTrue("The element should be about " + expectedBounds.width + " pixels wide", Math.abs(bounds.width - expectedBounds.width) <= widthErrorMargin);
+		}
+		if (expectedBounds.height != -1) {
+			assertTrue("The element should be about " + expectedBounds.height + " pixels high", Math.abs(bounds.height - expectedBounds.height) <= heightErrorMargin);
+		}
+		if (expectedBounds.x != -1) {
+			assertTrue("The element should have a horizontal position at about " + expectedBounds.x + " pixels", Math.abs(bounds.x - expectedBounds.x) <= xErrorMargin);
+		}
+		if (expectedBounds.y != -1) {
+			assertTrue("The element should have a vertical position at about " + expectedBounds.y + " pixels", Math.abs(bounds.y - expectedBounds.y) <= yErrorMargin);
+		}
+	}
+
+	/**
+	 * Find the EditPart corresponding to the given View in the given parent EditPart's children.
+	 *
+	 * @param parentEditPart
+	 *            the EditPart in which the EditPart we are looking for should be found
+	 * @param view
+	 *            the View corresponding to the searched EditPart
+	 * @return the found EditPart
+	 */
+	protected static EditPart findChildEditPartAssociatedToView(final EditPart parentEditPart, final View view) {
+		EditPart result = null;
+		@SuppressWarnings("unchecked")
+		final List<EditPart> children = parentEditPart.getChildren();
+		for (final EditPart editPart : children) {
+			if (view == editPart.getModel()) {
+				result = editPart;
+			}
+		}
+		assertNotNull("There should be an EditPart corresponding to the View", result);
+		return result;
+
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF
index e9d5a94b6c9..92d3fec3811 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF
@@ -1,35 +1,35 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.xtend.lib;bundle-version="2.8.1",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.usecase.tests,

- org.eclipse.papyrus.uml.diagram.usecase.tests.canonical,

- org.eclipse.papyrus.uml.diagram.usecase.tests.generation

-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.uml.diagram.usecase.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.usecase.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.usecase.tests,
+ org.eclipse.papyrus.uml.diagram.usecase.tests.canonical,
+ org.eclipse.papyrus.uml.diagram.usecase.tests.generation
+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.uml.diagram.usecase.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.usecase.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/AbstractPapyrusTestCase.java
index 5bd46b38eb5..fa2603912fb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/AbstractPapyrusTestCase.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * 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.uml.diagram.usecase.tests;

-

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand;

-

-

-

-/**

- * The Class AbstractPapyrusTestCase.

- */

-public abstract class AbstractPapyrusTestCase extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {

-

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		

-		return new CreateUseCaseDiagramCommand();

-	}

-

-}

+/*****************************************************************************
+ * 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.uml.diagram.usecase.tests;
+
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand;
+
+
+
+/**
+ * The Class AbstractPapyrusTestCase.
+ */
+public abstract class AbstractPapyrusTestCase extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {
+
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		
+		return new CreateUseCaseDiagramCommand();
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/Activator.java
index 22511df4c14..62c10db1177 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/Activator.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 - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.usecase.tests;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.usecase.tests"; //$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;

-	}

-

-}

+/*****************************************************************************
+ * 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.uml.diagram.usecase.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.usecase.tests"; //$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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/AllTests.java
index 110a210be56..563f884e39d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/AllTests.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2009, 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 464647

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.usecase.tests;

-

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;

-import org.eclipse.papyrus.uml.diagram.usecase.tests.canonical.AllCanonicalTests;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		// canonical

-		AllCanonicalTests.class,

-		RoundedCompartmentTest.class,

-

-})

-@DynamicClasses("org.eclipse.papyrus.uml.diagram.usecase.test.AllGenTests")

-public class AllTests {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 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 464647
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.usecase.tests;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite.DynamicClasses;
+import org.eclipse.papyrus.uml.diagram.usecase.tests.canonical.AllCanonicalTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * All tests together.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		// canonical
+		AllCanonicalTests.class,
+		RoundedCompartmentTest.class,
+
+})
+@DynamicClasses("org.eclipse.papyrus.uml.diagram.usecase.test.AllGenTests")
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/IUseCaseDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/IUseCaseDiagramTestsConstants.java
index 3996d577485..eb441ed6e7f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/IUseCaseDiagramTestsConstants.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/IUseCaseDiagramTestsConstants.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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.usecase.tests;

-

-public interface IUseCaseDiagramTestsConstants {

-

-	/** name of the test project */

-	public final String PROJECT_NAME = "UseCaseDiagramTestProject";

-

-	/** name of the test model */

-	public final String FILE_NAME = "UseCaseDiagramTest.di";

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.usecase.tests;
+
+public interface IUseCaseDiagramTestsConstants {
+
+	/** name of the test project */
+	public final String PROJECT_NAME = "UseCaseDiagramTestProject";
+
+	/** name of the test model */
+	public final String FILE_NAME = "UseCaseDiagramTest.di";
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/RoundedCompartmentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/RoundedCompartmentTest.java
index ec7db8dcd8f..579ceaff127 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/RoundedCompartmentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/RoundedCompartmentTest.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * 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

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.usecase.tests;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-

-/**

- * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.

- */

-public class RoundedCompartmentTest extends AbstractGenericShapeTest {

-

-	/**

-	 * Gets the rounded compartment edit parts.

-	 *

-	 * @return the rounded compartment edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()

-	 */

-	public List<Class<?>> getRoundedCompartmentEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-

-		classes.add(ActorEditPartTN.class);

-		classes.add(ActorInComponentEditPart.class);

-		classes.add(ActorInPackageEditPart.class);

-		classes.add(PackageEditPartCN.class);

-		classes.add(PackageEditPartTN.class);

-		classes.add(ComponentInPackageEditPart.class);

-		classes.add(SubjectClassifierEditPartTN.class);

-		classes.add(UseCaseEditPartTN.class);

-		classes.add(UseCaseInComponentEditPart.class);

-		classes.add(UseCaseInPackageEditPart.class);

-

-		return classes;

-	}

-

-	/**

-	 * Gets the rounded border named element edit parts.

-	 *

-	 * @return the rounded border named element edit parts

-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()

-	 */

-	public List<Class<?>> getRoundedBorderNamedElementEditParts() {

-		List<Class<?>> classes = new ArrayList<Class<?>>();

-		return classes;

-	}

-}

+/*****************************************************************************
+ * 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
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.usecase.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassifierEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;
+
+/**
+ * The Class RoundedCompartmentTest use to test if edit part which need it, extends RoundCompartmentEditPart and RoundBorderNameElementEditPart.
+ */
+public class RoundedCompartmentTest extends AbstractGenericShapeTest {
+
+	/**
+	 * Gets the rounded compartment edit parts.
+	 *
+	 * @return the rounded compartment edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedCompartmentEditParts()
+	 */
+	public List<Class<?>> getRoundedCompartmentEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+
+		classes.add(ActorEditPartTN.class);
+		classes.add(ActorInComponentEditPart.class);
+		classes.add(ActorInPackageEditPart.class);
+		classes.add(PackageEditPartCN.class);
+		classes.add(PackageEditPartTN.class);
+		classes.add(ComponentInPackageEditPart.class);
+		classes.add(SubjectClassifierEditPartTN.class);
+		classes.add(UseCaseEditPartTN.class);
+		classes.add(UseCaseInComponentEditPart.class);
+		classes.add(UseCaseInPackageEditPart.class);
+
+		return classes;
+	}
+
+	/**
+	 * Gets the rounded border named element edit parts.
+	 *
+	 * @return the rounded border named element edit parts
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractGenericShapeTest#getRoundedBorderNamedElementEditParts()
+	 */
+	public List<Class<?>> getRoundedBorderNamedElementEditParts() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+		return classes;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/AllCanonicalTests.java
index 815594fa80c..55cb3e695ee 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/AllCanonicalTests.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.usecase.tests.canonical;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-

-/**

- * All test in canonical package

- */

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-// top nodes

-TestUseCaseTopNode.class,

-// child nodes

-TestUseCaseChildNodeForPackage.class, TestUseCaseChildNodeForClassSubject.class, TestUseCaseLink.class, TestUseCaseLinkOwnedBySource.class

-

-})

-public class AllCanonicalTests {

-

-}

+/*****************************************************************************
+ * 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.uml.diagram.usecase.tests.canonical;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * All test in canonical package
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+// top nodes
+TestUseCaseTopNode.class,
+// child nodes
+TestUseCaseChildNodeForPackage.class, TestUseCaseChildNodeForClassSubject.class, TestUseCaseLink.class, TestUseCaseLinkOwnedBySource.class
+
+})
+public class AllCanonicalTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java
index 4983026d6c8..12711e1575b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java
@@ -1,325 +1,325 @@
-/*****************************************************************************

- * 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.uml.diagram.usecase.tests.canonical;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNotSame;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest.ViewAndElementDescriptor;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.CreateEditBasedElementCommand;

-import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * The Class TestTopNode.

- */

-public abstract class TestSpecificTopNode extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {

-

-

-	/**

-	 * Test view deletion.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testViewDeletion(IElementType type) {

-		// DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((GraphicalEditPart) getDiagramEditPart().getChildren().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 1);

-

-	}

-

-	/**

-	 * Retrieves the TransactionalEditingDomain

-	 *

-	 * @return the editing domain (can be null)

-	 */

-	protected TransactionalEditingDomain getEditingDomain() {

-		ServiceUtilsForActionHandlers serviceUtils = ServiceUtilsForActionHandlers.getInstance();

-		TransactionalEditingDomain editingDomain = null;

-		try {

-			editingDomain = serviceUtils.getTransactionalEditingDomain();

-

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-

-		return editingDomain;

-	}

-

-	/**

-	 * Test destroy.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testDestroy(IElementType type) {

-

-

-		// DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ((GraphicalEditPart) getDiagramEditPart().getChildren().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 0);

-

-

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 1);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 0);

-	}

-

-

-	/**

-	 * Test drop.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testDrop(IElementType type) {

-		// DROP

-		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-

-

-		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-		ArrayList<Element> list = new ArrayList<Element>();

-		list.add(getRootSemanticModel().getOwnedElements().get(0));

-		dropObjectsRequest.setObjects(list);

-		dropObjectsRequest.setLocation(new Point(20, 20));

-		Command command = getDiagramEditPart().getCommand(dropObjectsRequest);

-		assertNotNull(DROP + COMMAND_NULL, command);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DROP + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() != 0);

-		assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() != 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DROP + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(DROP + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() != 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() != 0);

-		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() != 0);

-	}

-

-

-	/**

-	 * Test change container.

-	 *

-	 * @param type

-	 *            the type

-	 * @param containerType

-	 *            the container type

-	 */

-	public void testChangeContainer(IElementType type, IElementType containerType) {

-		// CHANGE CONTAINER

-		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);

-		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-

-

-		Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(containerType, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CONTAINER_CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 2);

-		GraphicalEditPart containerEditPart = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);

-		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);

-		changeBoundsRequest.setEditParts((EditPart) getDiagramEditPart().getChildren().get(0));

-		changeBoundsRequest.setLocation(new Point(30, 30));

-		ShapeCompartmentEditPart compartment = null;

-		int index = 0;

-		while (compartment == null && index < containerEditPart.getChildren().size()) {

-			if ((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {

-				compartment = (ShapeCompartmentEditPart) (containerEditPart.getChildren().get(index));

-			}

-			index++;

-		}

-		assertTrue("Container not found", compartment != null);

-

-

-		command = compartment.getCommand(changeBoundsRequest);

-		assertNotNull(CHANGE_CONTAINER, command);

-		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, getRootView().getChildren().size() == 2);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 2);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, getRootView().getChildren().size() == 1);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 1);

-		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);

-

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testToCreateANode(IElementType type) {

-

-		// CREATION

-		assertEquals(CREATION + INITIALIZATION_TEST, 0, getDiagramEditPart().getChildren().size());

-		assertEquals(CREATION + INITIALIZATION_TEST, 0, getRootSemanticModel().getOwnedElements().size());

-		ViewAndElementDescriptor viewDescriptor = new ViewAndElementDescriptor(new CreateElementRequestAdapter(new CreateElementRequest(type)), Node.class, ((IHintedType) type).getSemanticHint(), getDiagramEditPart().getDiagramPreferencesHint());

-		CreateViewRequest requestcreation = new CreateViewAndElementRequest(viewDescriptor);

-

-		// CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertNotSame(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, UnexecutableCommand.INSTANCE, command);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertEquals(CREATION + TEST_THE_EXECUTION, 1, getRootView().getChildren().size());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertEquals(CREATION + TEST_THE_UNDO, 0, getRootView().getChildren().size());

-		assertEquals(CREATION + TEST_THE_UNDO, 0, getRootSemanticModel().getOwnedElements().size());

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-

-		assertEquals("CREATION: " + TEST_THE_REDO, 1, getDiagramEditPart().getChildren().size());

-

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *            the type

-	 */

-	public void testToCreateSpecificNode(IElementType type, EClass eClassHint) {

-

-		// CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-		CreateElementRequest semanticRequest = new CreateElementRequest(type);

-		semanticRequest.setParameter(CreateEditBasedElementCommand.ECLASS_HINT, eClassHint);

-

-		ViewAndElementDescriptor viewDescriptor = new ViewAndElementDescriptor(new CreateElementRequestAdapter(semanticRequest), Node.class, ((IHintedType) type).getSemanticHint(), getDiagramEditPart().getDiagramPreferencesHint());

-		CreateViewRequest requestcreation = new CreateViewAndElementRequest(viewDescriptor);

-

-		// CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 0);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-

-		assertTrue("CREATION: " + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 1);

-

-	}

-

-	/**

-	 * Test to manage top node.

-	 *

-	 * @param type

-	 *            the type

-	 * @param containerType

-	 *            the container type

-	 */

-	public void testToManageTopNode(IElementType type, IElementType containerType) {

-		int i = 0;

-		testToCreateANode(type);

-		testDestroy(type);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		testViewDeletion(type);

-		testDrop(type);

-		testChangeContainer(type, containerType);

-	}

-

-	/**

-	 * Test to manage top node.

-	 *

-	 * @param type

-	 *            the type

-	 * @param containerType

-	 *            the container type

-	 */

-	public void testToManageSpecificTopNode(IElementType type, IElementType containerType, EClass eClassHint) {

-		int i = 0;

-		testToCreateSpecificNode(type, eClassHint);

-		testDestroy(type);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		testViewDeletion(type);

-		testDrop(type);

-		testChangeContainer(type, containerType);

-	}

-

-

-}

+/*****************************************************************************
+ * 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.uml.diagram.usecase.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest.ViewAndElementDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.CreateEditBasedElementCommand;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * The Class TestTopNode.
+ */
+public abstract class TestSpecificTopNode extends org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase {
+
+
+	/**
+	 * Test view deletion.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testViewDeletion(IElementType type) {
+		// DELETION OF THE VIEW
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);
+		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+
+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
+		Command command = ((GraphicalEditPart) getDiagramEditPart().getChildren().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 1);
+		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 1);
+
+	}
+
+	/**
+	 * Retrieves the TransactionalEditingDomain
+	 *
+	 * @return the editing domain (can be null)
+	 */
+	protected TransactionalEditingDomain getEditingDomain() {
+		ServiceUtilsForActionHandlers serviceUtils = ServiceUtilsForActionHandlers.getInstance();
+		TransactionalEditingDomain editingDomain = null;
+		try {
+			editingDomain = serviceUtils.getTransactionalEditingDomain();
+
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+
+		return editingDomain;
+	}
+
+	/**
+	 * Test destroy.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testDestroy(IElementType type) {
+
+
+		// DESTROY SEMANTIC+ VIEW
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);
+		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+
+		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+		Command command = ((GraphicalEditPart) getDiagramEditPart().getChildren().get(0)).getCommand(deleteViewRequest);
+		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 0);
+
+
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 1);
+		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 0);
+	}
+
+
+	/**
+	 * Test drop.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testDrop(IElementType type) {
+		// DROP
+		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+
+
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		list.add(getRootSemanticModel().getOwnedElements().get(0));
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(new Point(20, 20));
+		Command command = getDiagramEditPart().getCommand(dropObjectsRequest);
+		assertNotNull(DROP + COMMAND_NULL, command);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(DROP + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(DROP + TEST_THE_EXECUTION, getDiagramEditPart().getChildren().size() != 0);
+		assertTrue(DROP + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() != 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(DROP + TEST_THE_UNDO, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(DROP + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() != 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(DROP + TEST_THE_REDO, getDiagramEditPart().getChildren().size() != 0);
+		assertTrue(DROP + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() != 0);
+	}
+
+
+	/**
+	 * Test change container.
+	 *
+	 * @param type
+	 *            the type
+	 * @param containerType
+	 *            the container type
+	 */
+	public void testChangeContainer(IElementType type, IElementType containerType) {
+		// CHANGE CONTAINER
+		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);
+		assertTrue(CHANGE_CONTAINER + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
+
+
+		Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(containerType, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CONTAINER_CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 2);
+		GraphicalEditPart containerEditPart = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);
+		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);
+		changeBoundsRequest.setEditParts((EditPart) getDiagramEditPart().getChildren().get(0));
+		changeBoundsRequest.setLocation(new Point(30, 30));
+		ShapeCompartmentEditPart compartment = null;
+		int index = 0;
+		while (compartment == null && index < containerEditPart.getChildren().size()) {
+			if ((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
+				compartment = (ShapeCompartmentEditPart) (containerEditPart.getChildren().get(index));
+			}
+			index++;
+		}
+		assertTrue("Container not found", compartment != null);
+
+
+		command = compartment.getCommand(changeBoundsRequest);
+		assertNotNull(CHANGE_CONTAINER, command);
+		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 1);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, getRootView().getChildren().size() == 2);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 2);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, getRootView().getChildren().size() == 1);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 1);
+		assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);
+
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testToCreateANode(IElementType type) {
+
+		// CREATION
+		assertEquals(CREATION + INITIALIZATION_TEST, 0, getDiagramEditPart().getChildren().size());
+		assertEquals(CREATION + INITIALIZATION_TEST, 0, getRootSemanticModel().getOwnedElements().size());
+		ViewAndElementDescriptor viewDescriptor = new ViewAndElementDescriptor(new CreateElementRequestAdapter(new CreateElementRequest(type)), Node.class, ((IHintedType) type).getSemanticHint(), getDiagramEditPart().getDiagramPreferencesHint());
+		CreateViewRequest requestcreation = new CreateViewAndElementRequest(viewDescriptor);
+
+		// CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertNotSame(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, UnexecutableCommand.INSTANCE, command);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertEquals(CREATION + TEST_THE_EXECUTION, 1, getRootView().getChildren().size());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertEquals(CREATION + TEST_THE_UNDO, 0, getRootView().getChildren().size());
+		assertEquals(CREATION + TEST_THE_UNDO, 0, getRootSemanticModel().getOwnedElements().size());
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+
+		assertEquals("CREATION: " + TEST_THE_REDO, 1, getDiagramEditPart().getChildren().size());
+
+	}
+
+	/**
+	 * Test to create a node.
+	 *
+	 * @param type
+	 *            the type
+	 */
+	public void testToCreateSpecificNode(IElementType type, EClass eClassHint) {
+
+		// CREATION
+		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
+		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);
+		CreateElementRequest semanticRequest = new CreateElementRequest(type);
+		semanticRequest.setParameter(CreateEditBasedElementCommand.ECLASS_HINT, eClassHint);
+
+		ViewAndElementDescriptor viewDescriptor = new ViewAndElementDescriptor(new CreateElementRequestAdapter(semanticRequest), Node.class, ((IHintedType) type).getSemanticHint(), getDiagramEditPart().getDiagramPreferencesHint());
+		CreateViewRequest requestcreation = new CreateViewAndElementRequest(viewDescriptor);
+
+		// CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
+		Command command = getDiagramEditPart().getCommand(requestcreation);
+		assertNotNull(CREATION + COMMAND_NULL, command);
+		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+		assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 0);
+		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 0);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+
+		assertTrue("CREATION: " + TEST_THE_REDO, getDiagramEditPart().getChildren().size() == 1);
+
+	}
+
+	/**
+	 * Test to manage top node.
+	 *
+	 * @param type
+	 *            the type
+	 * @param containerType
+	 *            the container type
+	 */
+	public void testToManageTopNode(IElementType type, IElementType containerType) {
+		int i = 0;
+		testToCreateANode(type);
+		testDestroy(type);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		testViewDeletion(type);
+		testDrop(type);
+		testChangeContainer(type, containerType);
+	}
+
+	/**
+	 * Test to manage top node.
+	 *
+	 * @param type
+	 *            the type
+	 * @param containerType
+	 *            the container type
+	 */
+	public void testToManageSpecificTopNode(IElementType type, IElementType containerType, EClass eClassHint) {
+		int i = 0;
+		testToCreateSpecificNode(type, eClassHint);
+		testDestroy(type);
+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+		testViewDeletion(type);
+		testDrop(type);
+		testChangeContainer(type, containerType);
+	}
+
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java
index f4de8ca35fd..dbd24cca950 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * 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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 440263

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.usecase.tests.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;

-import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.usecase.tests.IUseCaseDiagramTestsConstants;

-import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;

-import org.junit.Test;

-

-

-/**

- * The Class TestUseCaseLink use to test link that are contained by the owner of the target and the source

- */

-public class TestUseCaseLink extends TestLink {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return org.eclipse.papyrus.uml.diagram.usecase.custom.edit.parts.CustomUMLDiagramUpdater.INSTANCE;

-	}

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return  new CreateUseCaseDiagramCommand();

-	}

-	/**

-	 * Test to manage component.

-	 */

-	@Test

-	public void testToManageDependency() {

-		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Dependency_Edge,UMLElementTypes.Package_Shape,true);

-	}

-	

-	@Override

-	protected String getProjectName() {

-		return IUseCaseDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IUseCaseDiagramTestsConstants.FILE_NAME;

-	}

-	

-	/**

-	 * Test to manage component.

-	 */

-	@Test

-	public void testToManageDependencyUseCase_Actor() {

-		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.Actor_Shape,UMLElementTypes.Dependency_Edge,UMLElementTypes.Package_Shape,true);

-	}

-	@Test

-	public void testToManageAssociationUseCase_UseCase() {

-		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE,UMLElementTypes.Package_Shape,true);

-	}

-	@Test

-	public void testToManageAssociationUseCase_Actor() {

-		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.Actor_Shape,UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE,UMLElementTypes.Package_Shape,true);

-	}

-	

-	@Test

-	public void testToManageAbstraction() {

-		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Abstraction_Edge,UMLElementTypes.Package_Shape,true);

-	}

-	@Test

-	public void testToManageUsage() {

-		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Usage_Edge,UMLElementTypes.Package_Shape,true);

-	}

-	@Test

-	public void testToManageRealization() {

-		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Realization_Edge,UMLElementTypes.Package_Shape,true);

-	}

-	

-}

+/*****************************************************************************
+ * 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 440263
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.usecase.tests.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLink;
+import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.usecase.tests.IUseCaseDiagramTestsConstants;
+import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes;
+import org.junit.Test;
+
+
+/**
+ * The Class TestUseCaseLink use to test link that are contained by the owner of the target and the source
+ */
+public class TestUseCaseLink extends TestLink {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return org.eclipse.papyrus.uml.diagram.usecase.custom.edit.parts.CustomUMLDiagramUpdater.INSTANCE;
+	}
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return  new CreateUseCaseDiagramCommand();
+	}
+	/**
+	 * Test to manage component.
+	 */
+	@Test
+	public void testToManageDependency() {
+		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Dependency_Edge,UMLElementTypes.Package_Shape,true);
+	}
+	
+	@Override
+	protected String getProjectName() {
+		return IUseCaseDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IUseCaseDiagramTestsConstants.FILE_NAME;
+	}
+	
+	/**
+	 * Test to manage component.
+	 */
+	@Test
+	public void testToManageDependencyUseCase_Actor() {
+		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.Actor_Shape,UMLElementTypes.Dependency_Edge,UMLElementTypes.Package_Shape,true);
+	}
+	@Test
+	public void testToManageAssociationUseCase_UseCase() {
+		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE,UMLElementTypes.Package_Shape,true);
+	}
+	@Test
+	public void testToManageAssociationUseCase_Actor() {
+		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.Actor_Shape,UMLDIElementTypes.ASSOCIATION_NON_DIRECTED_EDGE,UMLElementTypes.Package_Shape,true);
+	}
+	
+	@Test
+	public void testToManageAbstraction() {
+		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Abstraction_Edge,UMLElementTypes.Package_Shape,true);
+	}
+	@Test
+	public void testToManageUsage() {
+		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Usage_Edge,UMLElementTypes.Package_Shape,true);
+	}
+	@Test
+	public void testToManageRealization() {
+		testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Realization_Edge,UMLElementTypes.Package_Shape,true);
+	}
+	
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java
index 6a8827cbf63..46f11c81c5a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 468646

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.usecase.tests.canonical;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkOwnedBySource;

-import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.usecase.tests.IUseCaseDiagramTestsConstants;

-import org.junit.Test;

-

-

-/**

- * The Class TestUseCaseLink use to test link that are contained by the owner of the target and the source

- */

-public class TestUseCaseLinkOwnedBySource extends TestLinkOwnedBySource {

-

-	@Override

-	public DiagramUpdater getDiagramUpdater() {

-		return org.eclipse.papyrus.uml.diagram.usecase.custom.edit.parts.CustomUMLDiagramUpdater.INSTANCE;

-	}

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateUseCaseDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IUseCaseDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IUseCaseDiagramTestsConstants.FILE_NAME;

-	}

-

-	@Test

-	public void testToManageGeneralization() {

-		testToManageLink(UMLElementTypes.Actor_Shape, UMLElementTypes.Actor_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-	@Test

-	public void testToManagePackageMerge() {

-		testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.PackageMerge_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	@Test

-	public void testToManagePackageImport() {

-		testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.PackageImport_Edge, UMLElementTypes.Package_Shape, true);

-	}

-

-	@Test

-	public void testToManageExtend() {

-		testToManageLink(UMLElementTypes.UseCase_Shape, UMLElementTypes.UseCase_Shape, UMLElementTypes.Extend_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-	@Test

-	public void testToManageInclude() {

-		testToManageLink(UMLElementTypes.UseCase_Shape, UMLElementTypes.UseCase_Shape, UMLElementTypes.Include_Edge, UMLElementTypes.Package_Shape, false);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 468646
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.usecase.tests.canonical;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkOwnedBySource;
+import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.usecase.tests.IUseCaseDiagramTestsConstants;
+import org.junit.Test;
+
+
+/**
+ * The Class TestUseCaseLink use to test link that are contained by the owner of the target and the source
+ */
+public class TestUseCaseLinkOwnedBySource extends TestLinkOwnedBySource {
+
+	@Override
+	public DiagramUpdater getDiagramUpdater() {
+		return org.eclipse.papyrus.uml.diagram.usecase.custom.edit.parts.CustomUMLDiagramUpdater.INSTANCE;
+	}
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateUseCaseDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IUseCaseDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IUseCaseDiagramTestsConstants.FILE_NAME;
+	}
+
+	@Test
+	public void testToManageGeneralization() {
+		testToManageLink(UMLElementTypes.Actor_Shape, UMLElementTypes.Actor_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+	@Test
+	public void testToManagePackageMerge() {
+		testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.PackageMerge_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	@Test
+	public void testToManagePackageImport() {
+		testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.PackageImport_Edge, UMLElementTypes.Package_Shape, true);
+	}
+
+	@Test
+	public void testToManageExtend() {
+		testToManageLink(UMLElementTypes.UseCase_Shape, UMLElementTypes.UseCase_Shape, UMLElementTypes.Extend_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+	@Test
+	public void testToManageInclude() {
+		testToManageLink(UMLElementTypes.UseCase_Shape, UMLElementTypes.UseCase_Shape, UMLElementTypes.Include_Edge, UMLElementTypes.Package_Shape, false);
+	}
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseTopNode.java
index 0993db4d73c..ff5157a0c45 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseTopNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseTopNode.java
@@ -1,224 +1,224 @@
-/*****************************************************************************

- * 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.uml.diagram.usecase.tests.canonical;

-

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.usecase.tests.IUseCaseDiagramTestsConstants;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Test;

-

-

-

-/**

- * The Class TestUseCaseTopNode.

- */

-public class TestUseCaseTopNode extends TestSpecificTopNode {

-

-	@Override

-	protected ICreationCommand getDiagramCommandCreation() {

-		return new CreateUseCaseDiagramCommand();

-	}

-

-	@Override

-	protected String getProjectName() {

-		return IUseCaseDiagramTestsConstants.PROJECT_NAME;

-	}

-

-	@Override

-	protected String getFileName() {

-		return IUseCaseDiagramTestsConstants.FILE_NAME;

-	}

-

-	/**

-	 * Test to manage component.

-	 */

-	@Test

-	public void testToManagePackage() {

-

-		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape);

-	}

-

-	/**

-	 * Test to manage component.

-	 */

-	@Test

-	public void testToManageActor() {

-		testToManageTopNode(UMLElementTypes.Actor_Shape, UMLElementTypes.Package_Shape);

-	}

-

-	/**

-	 * Test to manage component.

-	 */

-	@Test

-	public void testToManageComment() {

-		testToManageTopNode(UMLElementTypes.Comment_Shape, UMLElementTypes.Package_Shape);

-	}

-

-

-	/**

-	 * Test to manage component.

-	 */

-	@Test

-	public void testToManageConstraint() {

-		testToManageTopNode(UMLElementTypes.Constraint_Shape, UMLElementTypes.Package_Shape);

-	}

-

-	/**

-	 * Test to manage subjects.

-	 */

-	@Test

-	public void testToManageSubjectActivity() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getActivity());

-	}

-

-

-	@Test

-	public void testToManageSubjectActor() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getActor());

-	}

-

-

-	@Test

-	public void testToManageSubjectArtifact() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getArtifact());

-	}

-

-

-	// @Test

-	// public void testToManageSubjectAssociation() {

-	// testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getAssociation());

-	// }

-

-

-	// @Test

-	// public void testToManageSubjectAssociationClass() {

-	// testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getAssociationClass());

-	// }

-

-

-	@Test

-	public void testToManageSubjectClass() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getClass_());

-	}

-

-

-	@Test

-	public void testToManageSubjectCollaboration() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getCollaboration());

-	}

-

-

-	// @Test

-	// public void testToManageSubjectCommunicationPath() {

-	// testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getCommunicationPath());

-	// }

-

-	@Test

-	public void testToManageSubjectComponent() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getComponent());

-	}

-

-	@Test

-	public void testToManageSubjectDatatype() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getDataType());

-	}

-

-

-	@Test

-	public void testToManageSubjectDeployementSpecification() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getDeploymentSpecification());

-	}

-

-	@Test

-	public void testToManageSubjectDevice() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getDevice());

-	}

-

-	@Test

-	public void testToManageSubjectEnumeration() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getEnumeration());

-	}

-

-	@Test

-	public void testToManageSubjectExecutionEnvironment() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getExecutionEnvironment());

-	}

-

-	// @Test

-	// public void testToManageSubjectExtension() {

-	// testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getExtension());

-	// }

-

-	@Test

-	public void testToManageSubjectFunctionBehavior() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getFunctionBehavior());

-	}

-

-	@Test

-	public void testToManageSubjectInformationItem() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getInformationItem());

-	}

-

-	@Test

-	public void testToManageSubjectInteraction() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getInteraction());

-	}

-

-	@Test

-	public void testToManageSubjectInterface() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getInterface());

-	}

-

-	@Test

-	public void testToManageSubjectNode() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getNode());

-	}

-

-	@Test

-	public void testToManageSubjectOpaqueBehavior() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getOpaqueBehavior());

-	}

-

-	@Test

-	public void testToManageSubjectPrimitiveType() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getPrimitiveType());

-	}

-

-	@Test

-	public void testToManageSubjectProtocolStateMachine() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getProtocolStateMachine());

-	}

-

-	@Test

-	public void testToManageSubjectSignal() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getSignal());

-	}

-

-	@Test

-	public void testToManageSubjectStateMachine() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getStateMachine());

-	}

-

-	@Test

-	public void testToManageSubjectStereotype() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getStereotype());

-	}

-

-	@Test

-	public void testToManageSubjectUsecase() {

-		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getUseCase());

-	}

-}

+/*****************************************************************************
+ * 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.uml.diagram.usecase.tests.canonical;
+
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.usecase.tests.IUseCaseDiagramTestsConstants;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Test;
+
+
+
+/**
+ * The Class TestUseCaseTopNode.
+ */
+public class TestUseCaseTopNode extends TestSpecificTopNode {
+
+	@Override
+	protected ICreationCommand getDiagramCommandCreation() {
+		return new CreateUseCaseDiagramCommand();
+	}
+
+	@Override
+	protected String getProjectName() {
+		return IUseCaseDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IUseCaseDiagramTestsConstants.FILE_NAME;
+	}
+
+	/**
+	 * Test to manage component.
+	 */
+	@Test
+	public void testToManagePackage() {
+
+		testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape);
+	}
+
+	/**
+	 * Test to manage component.
+	 */
+	@Test
+	public void testToManageActor() {
+		testToManageTopNode(UMLElementTypes.Actor_Shape, UMLElementTypes.Package_Shape);
+	}
+
+	/**
+	 * Test to manage component.
+	 */
+	@Test
+	public void testToManageComment() {
+		testToManageTopNode(UMLElementTypes.Comment_Shape, UMLElementTypes.Package_Shape);
+	}
+
+
+	/**
+	 * Test to manage component.
+	 */
+	@Test
+	public void testToManageConstraint() {
+		testToManageTopNode(UMLElementTypes.Constraint_Shape, UMLElementTypes.Package_Shape);
+	}
+
+	/**
+	 * Test to manage subjects.
+	 */
+	@Test
+	public void testToManageSubjectActivity() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getActivity());
+	}
+
+
+	@Test
+	public void testToManageSubjectActor() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getActor());
+	}
+
+
+	@Test
+	public void testToManageSubjectArtifact() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getArtifact());
+	}
+
+
+	// @Test
+	// public void testToManageSubjectAssociation() {
+	// testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getAssociation());
+	// }
+
+
+	// @Test
+	// public void testToManageSubjectAssociationClass() {
+	// testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getAssociationClass());
+	// }
+
+
+	@Test
+	public void testToManageSubjectClass() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getClass_());
+	}
+
+
+	@Test
+	public void testToManageSubjectCollaboration() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getCollaboration());
+	}
+
+
+	// @Test
+	// public void testToManageSubjectCommunicationPath() {
+	// testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getCommunicationPath());
+	// }
+
+	@Test
+	public void testToManageSubjectComponent() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getComponent());
+	}
+
+	@Test
+	public void testToManageSubjectDatatype() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getDataType());
+	}
+
+
+	@Test
+	public void testToManageSubjectDeployementSpecification() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getDeploymentSpecification());
+	}
+
+	@Test
+	public void testToManageSubjectDevice() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getDevice());
+	}
+
+	@Test
+	public void testToManageSubjectEnumeration() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getEnumeration());
+	}
+
+	@Test
+	public void testToManageSubjectExecutionEnvironment() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getExecutionEnvironment());
+	}
+
+	// @Test
+	// public void testToManageSubjectExtension() {
+	// testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getExtension());
+	// }
+
+	@Test
+	public void testToManageSubjectFunctionBehavior() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getFunctionBehavior());
+	}
+
+	@Test
+	public void testToManageSubjectInformationItem() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getInformationItem());
+	}
+
+	@Test
+	public void testToManageSubjectInteraction() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getInteraction());
+	}
+
+	@Test
+	public void testToManageSubjectInterface() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getInterface());
+	}
+
+	@Test
+	public void testToManageSubjectNode() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getNode());
+	}
+
+	@Test
+	public void testToManageSubjectOpaqueBehavior() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getOpaqueBehavior());
+	}
+
+	@Test
+	public void testToManageSubjectPrimitiveType() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getPrimitiveType());
+	}
+
+	@Test
+	public void testToManageSubjectProtocolStateMachine() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getProtocolStateMachine());
+	}
+
+	@Test
+	public void testToManageSubjectSignal() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getSignal());
+	}
+
+	@Test
+	public void testToManageSubjectStateMachine() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getStateMachine());
+	}
+
+	@Test
+	public void testToManageSubjectStereotype() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getStereotype());
+	}
+
+	@Test
+	public void testToManageSubjectUsecase() {
+		testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getUseCase());
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.classpath
index b84b0cee1dc..51401743708 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.classpath
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.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="test"/>

-	<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="test"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.project b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.project
index 0cc3dfa3d3e..93ace4bf9fb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.project
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.wizards.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.wizards.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
index 266be0a2a9a..df9bc6168e8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.ui.workbench;bundle-version="3.103.1",

- org.eclipse.ui.ide;bundle-version="3.8.1",

- org.eclipse.jface;bundle-version="3.8.101",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.core.resources,

- org.eclipse.core.runtime;bundle-version="3.10.0",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.uml.diagram.wizards

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests;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"

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="3.103.1",
+ org.eclipse.ui.ide;bundle-version="3.8.1",
+ org.eclipse.jface;bundle-version="3.8.101",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.wizards
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests;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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/about.html
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/build.properties
index 1fb9d118af1..a93f8a384a9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = test/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               build.properties,\

-               plugin.properties,\

-               resources/

-src.includes = about.html

+source.. = test/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               build.properties,\
+               plugin.properties,\
+               resources/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/plugin.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/plugin.properties
index caacec5712c..b89f1598611 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/plugin.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2013 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     

-##################################################################################

-pluginName=UML Diagram Wizards Tests

-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:
+#     
+##################################################################################
+pluginName=UML Diagram Wizards Tests
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/resources/model.model.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/resources/model.model.uml
index 45c6c36c934..62166669801 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/resources/model.model.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/resources/model.model.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AuibwODoEeOahKUgtNrIYg" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AuibwODoEeOahKUgtNrIYg" name="model"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/resources/model.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/resources/model.uml
index 45c6c36c934..62166669801 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/resources/model.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/resources/model.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AuibwODoEeOahKUgtNrIYg" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AuibwODoEeOahKUgtNrIYg" name="model"/>
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation
index 62958366c24..9dc556b450c 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation
@@ -1,171 +1,171 @@
-<?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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_S-8MECgzEeeoAJG6t_MwCA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_UsONQCgzEeeoAJG6t_MwCA" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_UsO0UCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_UsO0USgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_UsO0UigzEeeoAJG6t_MwCA" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_UsO0UygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">

-      <children xmi:type="notation:Shape" xmi:id="_V3wMQCgzEeeoAJG6t_MwCA" type="Property_ClassAttributeLabel">

-        <element xmi:type="uml:Property" href="expressionModelTest.uml#_V3npYCgzEeeoAJG6t_MwCA"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V3wMQSgzEeeoAJG6t_MwCA"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_UsO0VCgzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_UsO0VSgzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsO0VigzEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsO0VygzEeeoAJG6t_MwCA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbYCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbYSgzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbYigzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbYygzEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbZCgzEeeoAJG6t_MwCA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbZSgzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbZigzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbZygzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbaCgzEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbaSgzEeeoAJG6t_MwCA"/>

-    </children>

-    <element xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsONQSgzEeeoAJG6t_MwCA" x="120" y="60" width="201" height="141"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_daXpICgzEeeoAJG6t_MwCA" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_daYQMCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_daYQMSgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daYQMigzEeeoAJG6t_MwCA" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_daYQMygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_daYQNCgzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_daYQNSgzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_daYQNigzEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daYQNygzEeeoAJG6t_MwCA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_daYQOCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_daYQOSgzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_daYQOigzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3QCgzEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3QSgzEeeoAJG6t_MwCA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_daY3QigzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_daY3QygzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_daY3RCgzEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3RSgzEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3RigzEeeoAJG6t_MwCA"/>

-    </children>

-    <element xmi:type="uml:Class" href="expressionModelTest.uml#_daTXsCgzEeeoAJG6t_MwCA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daXpISgzEeeoAJG6t_MwCA" x="120" y="240" width="201" height="101"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_TLBLIC0TEee42cCIRX36lw" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUC0TEee42cCIRX36lw" type="Class_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUS0TEee42cCIRX36lw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TLDAUi0TEee42cCIRX36lw" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOcC0TEee42cCIRX36lw" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOcS0TEee42cCIRX36lw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOci0TEee42cCIRX36lw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOcy0TEee42cCIRX36lw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOdC0TEee42cCIRX36lw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOdS0TEee42cCIRX36lw" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOdi0TEee42cCIRX36lw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOdy0TEee42cCIRX36lw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOeC0TEee42cCIRX36lw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOeS0TEee42cCIRX36lw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOei0TEee42cCIRX36lw" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOey0TEee42cCIRX36lw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOfC0TEee42cCIRX36lw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOfS0TEee42cCIRX36lw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOfi0TEee42cCIRX36lw"/>

-    </children>

-    <element xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLBLIS0TEee42cCIRX36lw" x="480" y="60" width="201" height="141"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_3ooXsC0TEee42cCIRX36lw" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_3ooXsS0TEee42cCIRX36lw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXsy0TEee42cCIRX36lw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ooXsi0TEee42cCIRX36lw" x="680" y="60"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_A6ngdC0UEee42cCIRX36lw" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_A6ngdS0UEee42cCIRX36lw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6ngdy0UEee42cCIRX36lw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A6ngdi0UEee42cCIRX36lw" x="320" y="60"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_vI_ZULAiEee43bo6S9i5Mw" type="Class_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_vJAAYLAiEee43bo6S9i5Mw" type="Class_NameLabel"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_vJAAYbAiEee43bo6S9i5Mw" type="Class_FloatingNameLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_vJAncLAiEee43bo6S9i5Mw" y="15"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_vJAncbAiEee43bo6S9i5Mw" type="Class_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_vJAncrAiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vJAnc7AiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vJAndLAiEee43bo6S9i5Mw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vJAndbAiEee43bo6S9i5Mw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_vJAndrAiEee43bo6S9i5Mw" type="Class_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_vJAnd7AiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vJAneLAiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vJAnebAiEee43bo6S9i5Mw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vJAnerAiEee43bo6S9i5Mw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_vJBOgLAiEee43bo6S9i5Mw" type="Class_NestedClassifierCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_vJBOgbAiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vJBOgrAiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vJBOg7AiEee43bo6S9i5Mw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vJBOhLAiEee43bo6S9i5Mw"/>

-    </children>

-    <element xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vI_ZUbAiEee43bo6S9i5Mw" x="480" y="240" width="201" height="101"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_BKFAMLAjEee43bo6S9i5Mw" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_BKFAMbAjEee43bo6S9i5Mw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BKFnQLAjEee43bo6S9i5Mw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BKFAMrAjEee43bo6S9i5Mw" x="680" y="240"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_S-8MESgzEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_S-8MEigzEeeoAJG6t_MwCA"/>

-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_S-8MEygzEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

-    <owner xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>

-  </styles>

-  <element xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_3ooXtC0TEee42cCIRX36lw" type="StereotypeCommentLink" source="_TLBLIC0TEee42cCIRX36lw" target="_3ooXsC0TEee42cCIRX36lw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_3ooXtS0TEee42cCIRX36lw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXuS0TEee42cCIRX36lw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3ooXti0TEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXty0TEee42cCIRX36lw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXuC0TEee42cCIRX36lw"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_A6oHgC0UEee42cCIRX36lw" type="StereotypeCommentLink" source="_UsONQCgzEeeoAJG6t_MwCA" target="_A6ngdC0UEee42cCIRX36lw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_A6oHgS0UEee42cCIRX36lw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6oHhS0UEee42cCIRX36lw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A6oHgi0UEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHgy0UEee42cCIRX36lw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHhC0UEee42cCIRX36lw"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_BKGOULAjEee43bo6S9i5Mw" type="StereotypeCommentLink" source="_vI_ZULAiEee43bo6S9i5Mw" target="_BKFAMLAjEee43bo6S9i5Mw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_BKGOUbAjEee43bo6S9i5Mw"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BKGOVbAjEee43bo6S9i5Mw" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BKGOUrAjEee43bo6S9i5Mw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BKGOU7AjEee43bo6S9i5Mw"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BKGOVLAjEee43bo6S9i5Mw"/>

-  </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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_S-8MECgzEeeoAJG6t_MwCA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_UsONQCgzEeeoAJG6t_MwCA" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UsO0UCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_UsO0USgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_UsO0UigzEeeoAJG6t_MwCA" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UsO0UygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_V3wMQCgzEeeoAJG6t_MwCA" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="expressionModelTest.uml#_V3npYCgzEeeoAJG6t_MwCA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V3wMQSgzEeeoAJG6t_MwCA"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UsO0VCgzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_UsO0VSgzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsO0VigzEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsO0VygzEeeoAJG6t_MwCA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbYCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbYSgzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbYigzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbYygzEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbZCgzEeeoAJG6t_MwCA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbZSgzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbZigzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbZygzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbaCgzEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbaSgzEeeoAJG6t_MwCA"/>
+    </children>
+    <element xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsONQSgzEeeoAJG6t_MwCA" x="120" y="60" width="201" height="141"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_daXpICgzEeeoAJG6t_MwCA" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_daYQMCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_daYQMSgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daYQMigzEeeoAJG6t_MwCA" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_daYQMygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_daYQNCgzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_daYQNSgzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_daYQNigzEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daYQNygzEeeoAJG6t_MwCA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_daYQOCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_daYQOSgzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_daYQOigzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3QCgzEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3QSgzEeeoAJG6t_MwCA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_daY3QigzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_daY3QygzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_daY3RCgzEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3RSgzEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3RigzEeeoAJG6t_MwCA"/>
+    </children>
+    <element xmi:type="uml:Class" href="expressionModelTest.uml#_daTXsCgzEeeoAJG6t_MwCA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daXpISgzEeeoAJG6t_MwCA" x="120" y="240" width="201" height="101"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_TLBLIC0TEee42cCIRX36lw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUC0TEee42cCIRX36lw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUS0TEee42cCIRX36lw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TLDAUi0TEee42cCIRX36lw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOcC0TEee42cCIRX36lw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOcS0TEee42cCIRX36lw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOci0TEee42cCIRX36lw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOcy0TEee42cCIRX36lw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOdC0TEee42cCIRX36lw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOdS0TEee42cCIRX36lw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOdi0TEee42cCIRX36lw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOdy0TEee42cCIRX36lw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOeC0TEee42cCIRX36lw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOeS0TEee42cCIRX36lw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOei0TEee42cCIRX36lw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOey0TEee42cCIRX36lw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOfC0TEee42cCIRX36lw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOfS0TEee42cCIRX36lw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOfi0TEee42cCIRX36lw"/>
+    </children>
+    <element xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLBLIS0TEee42cCIRX36lw" x="480" y="60" width="201" height="141"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_3ooXsC0TEee42cCIRX36lw" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_3ooXsS0TEee42cCIRX36lw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXsy0TEee42cCIRX36lw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ooXsi0TEee42cCIRX36lw" x="680" y="60"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_A6ngdC0UEee42cCIRX36lw" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_A6ngdS0UEee42cCIRX36lw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6ngdy0UEee42cCIRX36lw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A6ngdi0UEee42cCIRX36lw" x="320" y="60"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_vI_ZULAiEee43bo6S9i5Mw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_vJAAYLAiEee43bo6S9i5Mw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vJAAYbAiEee43bo6S9i5Mw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vJAncLAiEee43bo6S9i5Mw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_vJAncbAiEee43bo6S9i5Mw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vJAncrAiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_vJAnc7AiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vJAndLAiEee43bo6S9i5Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vJAndbAiEee43bo6S9i5Mw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_vJAndrAiEee43bo6S9i5Mw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vJAnd7AiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_vJAneLAiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vJAnebAiEee43bo6S9i5Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vJAnerAiEee43bo6S9i5Mw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_vJBOgLAiEee43bo6S9i5Mw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vJBOgbAiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_vJBOgrAiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vJBOg7AiEee43bo6S9i5Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vJBOhLAiEee43bo6S9i5Mw"/>
+    </children>
+    <element xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vI_ZUbAiEee43bo6S9i5Mw" x="480" y="240" width="201" height="101"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_BKFAMLAjEee43bo6S9i5Mw" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_BKFAMbAjEee43bo6S9i5Mw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BKFnQLAjEee43bo6S9i5Mw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BKFAMrAjEee43bo6S9i5Mw" x="680" y="240"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_S-8MESgzEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_S-8MEigzEeeoAJG6t_MwCA"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_S-8MEygzEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>
+  </styles>
+  <element xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_3ooXtC0TEee42cCIRX36lw" type="StereotypeCommentLink" source="_TLBLIC0TEee42cCIRX36lw" target="_3ooXsC0TEee42cCIRX36lw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_3ooXtS0TEee42cCIRX36lw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXuS0TEee42cCIRX36lw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3ooXti0TEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXty0TEee42cCIRX36lw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXuC0TEee42cCIRX36lw"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_A6oHgC0UEee42cCIRX36lw" type="StereotypeCommentLink" source="_UsONQCgzEeeoAJG6t_MwCA" target="_A6ngdC0UEee42cCIRX36lw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_A6oHgS0UEee42cCIRX36lw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6oHhS0UEee42cCIRX36lw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A6oHgi0UEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHgy0UEee42cCIRX36lw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHhC0UEee42cCIRX36lw"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_BKGOULAjEee43bo6S9i5Mw" type="StereotypeCommentLink" source="_vI_ZULAiEee43bo6S9i5Mw" target="_BKFAMLAjEee43bo6S9i5Mw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_BKGOUbAjEee43bo6S9i5Mw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BKGOVbAjEee43bo6S9i5Mw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BKGOUrAjEee43bo6S9i5Mw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BKGOU7AjEee43bo6S9i5Mw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BKGOVLAjEee43bo6S9i5Mw"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml
index e3f97da73f1..c6ecb538bc4 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml
@@ -1,41 +1,41 @@
-<?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:RootElement="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5" xmlns:RootElement_1="papyrusExpressionProfile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5 expressionProfileWithoutURI.profile.uml#_dHQ5QLAiEee43bo6S9i5Mw papyrusExpressionProfile expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ">

-  <uml:Model xmi:id="_8TUvwCgyEeeoAJG6t_MwCA" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_UsJ70CgzEeeoAJG6t_MwCA" name="StereotypedWithURIClass">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_V3npYCgzEeeoAJG6t_MwCA" name="StereotypedWithURIProperty" visibility="public"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_daTXsCgzEeeoAJG6t_MwCA" name="NoStereotypedClass"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_TK3aIC0TEee42cCIRX36lw" name="StereotypedWithoutURIClass"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_vI55wLAiEee43bo6S9i5Mw" name="StereotypedWithChildStereotype"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L-vxsC0TEee42cCIRX36lw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9S7vgLAiEee43bo6S9i5Mw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vgbAiEee43bo6S9i5Mw" key="Version" value="0.0.6"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vgrAiEee43bo6S9i5Mw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vg7AiEee43bo6S9i5Mw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vhLAiEee43bo6S9i5Mw" key="Date" value="2017-10-13"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vhbAiEee43bo6S9i5Mw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L-0DIC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="expressionProfileWithoutURI.profile.uml#_dHQ5QLAiEee43bo6S9i5Mw"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_xKl9QC0TEee42cCIRX36lw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EAHzEC8oEeexfKc2E3OwJQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzES8oEeexfKc2E3OwJQ" key="Version" value="0.0.8"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEi8oEeexfKc2E3OwJQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEy8oEeexfKc2E3OwJQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFC8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFS8oEeexfKc2E3OwJQ" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xKmkUC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>

-    </profileApplication>

-  </uml:Model>

-  <RootElement:ANiceStereotypeForElement xmi:id="_3objYC0TEee42cCIRX36lw" base_Element="_TK3aIC0TEee42cCIRX36lw"/>

-  <RootElement_1:ANiceStereotypeForElement xmi:id="_A6WasC0UEee42cCIRX36lw" base_Element="_UsJ70CgzEeeoAJG6t_MwCA"/>

-  <RootElement:ANiceStereotypeForProperty xmi:id="_0vazsC8oEeexfKc2E3OwJQ" base_Property="_V3npYCgzEeeoAJG6t_MwCA"/>

-  <RootElement:AChildNiceStereotypeForElement xmi:id="_BJua4LAjEee43bo6S9i5Mw" base_Element="_vI55wLAiEee43bo6S9i5Mw"/>

-</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:RootElement="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5" xmlns:RootElement_1="papyrusExpressionProfile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5 expressionProfileWithoutURI.profile.uml#_dHQ5QLAiEee43bo6S9i5Mw papyrusExpressionProfile expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ">
+  <uml:Model xmi:id="_8TUvwCgyEeeoAJG6t_MwCA" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_UsJ70CgzEeeoAJG6t_MwCA" name="StereotypedWithURIClass">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_V3npYCgzEeeoAJG6t_MwCA" name="StereotypedWithURIProperty" visibility="public"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_daTXsCgzEeeoAJG6t_MwCA" name="NoStereotypedClass"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_TK3aIC0TEee42cCIRX36lw" name="StereotypedWithoutURIClass"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_vI55wLAiEee43bo6S9i5Mw" name="StereotypedWithChildStereotype"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L-vxsC0TEee42cCIRX36lw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9S7vgLAiEee43bo6S9i5Mw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vgbAiEee43bo6S9i5Mw" key="Version" value="0.0.6"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vgrAiEee43bo6S9i5Mw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vg7AiEee43bo6S9i5Mw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vhLAiEee43bo6S9i5Mw" key="Date" value="2017-10-13"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vhbAiEee43bo6S9i5Mw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L-0DIC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="expressionProfileWithoutURI.profile.uml#_dHQ5QLAiEee43bo6S9i5Mw"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_xKl9QC0TEee42cCIRX36lw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EAHzEC8oEeexfKc2E3OwJQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzES8oEeexfKc2E3OwJQ" key="Version" value="0.0.8"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEi8oEeexfKc2E3OwJQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEy8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFC8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFS8oEeexfKc2E3OwJQ" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xKmkUC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
+    </profileApplication>
+  </uml:Model>
+  <RootElement:ANiceStereotypeForElement xmi:id="_3objYC0TEee42cCIRX36lw" base_Element="_TK3aIC0TEee42cCIRX36lw"/>
+  <RootElement_1:ANiceStereotypeForElement xmi:id="_A6WasC0UEee42cCIRX36lw" base_Element="_UsJ70CgzEeeoAJG6t_MwCA"/>
+  <RootElement:ANiceStereotypeForProperty xmi:id="_0vazsC8oEeexfKc2E3OwJQ" base_Property="_V3npYCgzEeeoAJG6t_MwCA"/>
+  <RootElement:AChildNiceStereotypeForElement xmi:id="_BJua4LAjEee43bo6S9i5Mw" base_Element="_vI55wLAiEee43bo6S9i5Mw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation
index 8e75cbea0a6..8f6408e6e42 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation
@@ -1,144 +1,144 @@
-<?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" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o0MdkCgyEeeoAJG6t_MwCA" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_tPCRMCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tPI-4CgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4SgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4igyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4ygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5CgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5SgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_tPHwwCgyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tPIX0CgyEeeoAJG6t_MwCA" x="80" y="60" width="201" height="61"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_tP8QICgyEeeoAJG6t_MwCA" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_tP8QISgyEeeoAJG6t_MwCA"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP8QIygyEeeoAJG6t_MwCA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tP8QIigyEeeoAJG6t_MwCA" x="460" y="60"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_t8oXACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_t8tPgCgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPgSgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPgigyEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPgygyEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPhCgyEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPhSgyEeeoAJG6t_MwCA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPhigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPhygyEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPiCgyEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPiSgyEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPiigyEeeoAJG6t_MwCA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_t8ksoCgyEeeoAJG6t_MwCA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8oXASgyEeeoAJG6t_MwCA" x="80" y="280" width="201"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_yoxWACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_yox9ECgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_yox9ESgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_yox9EigyEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_yox9EygyEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9FCgyEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9FSgyEeeoAJG6t_MwCA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_yox9FigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_yox9FygyEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_yox9GCgyEeeoAJG6t_MwCA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9GSgyEeeoAJG6t_MwCA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9GigyEeeoAJG6t_MwCA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_yokhsCgyEeeoAJG6t_MwCA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yoxWASgyEeeoAJG6t_MwCA" x="440" y="280" width="201"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_1_0KUCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1_0xYCgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYSgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYigyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZCgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZSgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_1_0KUigyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_0KUygyEeeoAJG6t_MwCA" x="440" y="60" width="201" height="61"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_1_-iYygyEeeoAJG6t_MwCA" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_1_-iZCgyEeeoAJG6t_MwCA"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1_-iZigyEeeoAJG6t_MwCA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_-iZSgyEeeoAJG6t_MwCA" x="700" y="60"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_WW-4QLAiEee43bo6S9i5Mw" type="Stereotype_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_WXDwwLAiEee43bo6S9i5Mw" type="Stereotype_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_WXDwwbAiEee43bo6S9i5Mw" type="Stereotype_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_WXDwwrAiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WXDww7AiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WXDwxLAiEee43bo6S9i5Mw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WXDwxbAiEee43bo6S9i5Mw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_WXEX0LAiEee43bo6S9i5Mw" type="Stereotype_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_WXEX0bAiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WXEX0rAiEee43bo6S9i5Mw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WXEX07AiEee43bo6S9i5Mw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WXEX1LAiEee43bo6S9i5Mw"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_WW0gMLAiEee43bo6S9i5Mw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WW-4QbAiEee43bo6S9i5Mw" x="80" y="520" width="201"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_o0MdkSgyEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_o0MdkigyEeeoAJG6t_MwCA"/>

-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_o0MdkygyEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">

-    <owner xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>

-  </styles>

-  <element xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_tP83MCgyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_tPCRMCgyEeeoAJG6t_MwCA" target="_tP8QICgyEeeoAJG6t_MwCA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_tP83MSgyEeeoAJG6t_MwCA"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP9eQSgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tP83MigyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP83MygyEeeoAJG6t_MwCA"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP9eQCgyEeeoAJG6t_MwCA"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_1_-iZygyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_1_0KUCgyEeeoAJG6t_MwCA" target="_1_-iYygyEeeoAJG6t_MwCA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_1_-iaCgyEeeoAJG6t_MwCA"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1__JcCgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1_-iaSgyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaigyEeeoAJG6t_MwCA"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaygyEeeoAJG6t_MwCA"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_3g-bECgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_t8oXACgyEeeoAJG6t_MwCA" target="_tPCRMCgyEeeoAJG6t_MwCA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_3g-bESgyEeeoAJG6t_MwCA"/>

-    <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_3gxmwCgyEeeoAJG6t_MwCA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3g-bEigyEeeoAJG6t_MwCA" points="[140, 280, -643984, -643984]$[140, 110, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_4GY1QCgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_yoxWACgyEeeoAJG6t_MwCA" target="_1_0KUCgyEeeoAJG6t_MwCA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_4GY1QSgyEeeoAJG6t_MwCA"/>

-    <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_4GMA8CgyEeeoAJG6t_MwCA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4GY1QigyEeeoAJG6t_MwCA" points="[500, 280, -643984, -643984]$[500, 110, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_Xeq5ELAiEee43bo6S9i5Mw" type="Generalization_Edge" source="_WW-4QLAiEee43bo6S9i5Mw" target="_t8oXACgyEeeoAJG6t_MwCA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_XergILAiEee43bo6S9i5Mw" type="Generalization_StereotypeLabel">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_XergIbAiEee43bo6S9i5Mw" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Xeq5EbAiEee43bo6S9i5Mw"/>

-    <element xmi:type="uml:Generalization" href="expressionProfileWithoutURI.profile.uml#_XeTssLAiEee43bo6S9i5Mw"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xeq5ErAiEee43bo6S9i5Mw" points="[160, 520, -643984, -643984]$[160, 380, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XfZ44LAiEee43bo6S9i5Mw" id="(0.39800995024875624,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xfaf8LAiEee43bo6S9i5Mw" id="(0.39800995024875624,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" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o0MdkCgyEeeoAJG6t_MwCA" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_tPCRMCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tPI-4CgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4SgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4igyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4ygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5CgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5SgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_tPHwwCgyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tPIX0CgyEeeoAJG6t_MwCA" x="80" y="60" width="201" height="61"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_tP8QICgyEeeoAJG6t_MwCA" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_tP8QISgyEeeoAJG6t_MwCA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP8QIygyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tP8QIigyEeeoAJG6t_MwCA" x="460" y="60"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_t8oXACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_t8tPgCgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPgSgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPgigyEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPgygyEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPhCgyEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPhSgyEeeoAJG6t_MwCA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPhigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPhygyEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPiCgyEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPiSgyEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPiigyEeeoAJG6t_MwCA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_t8ksoCgyEeeoAJG6t_MwCA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8oXASgyEeeoAJG6t_MwCA" x="80" y="280" width="201"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_yoxWACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_yox9ECgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_yox9ESgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_yox9EigyEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_yox9EygyEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9FCgyEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9FSgyEeeoAJG6t_MwCA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_yox9FigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_yox9FygyEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_yox9GCgyEeeoAJG6t_MwCA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9GSgyEeeoAJG6t_MwCA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9GigyEeeoAJG6t_MwCA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_yokhsCgyEeeoAJG6t_MwCA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yoxWASgyEeeoAJG6t_MwCA" x="440" y="280" width="201"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_1_0KUCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1_0xYCgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYSgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYigyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZCgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZSgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_1_0KUigyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_0KUygyEeeoAJG6t_MwCA" x="440" y="60" width="201" height="61"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_1_-iYygyEeeoAJG6t_MwCA" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_1_-iZCgyEeeoAJG6t_MwCA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1_-iZigyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_-iZSgyEeeoAJG6t_MwCA" x="700" y="60"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_WW-4QLAiEee43bo6S9i5Mw" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_WXDwwLAiEee43bo6S9i5Mw" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_WXDwwbAiEee43bo6S9i5Mw" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_WXDwwrAiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_WXDww7AiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WXDwxLAiEee43bo6S9i5Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WXDwxbAiEee43bo6S9i5Mw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_WXEX0LAiEee43bo6S9i5Mw" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_WXEX0bAiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_WXEX0rAiEee43bo6S9i5Mw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WXEX07AiEee43bo6S9i5Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WXEX1LAiEee43bo6S9i5Mw"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_WW0gMLAiEee43bo6S9i5Mw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WW-4QbAiEee43bo6S9i5Mw" x="80" y="520" width="201"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_o0MdkSgyEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_o0MdkigyEeeoAJG6t_MwCA"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_o0MdkygyEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">
+    <owner xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_tP83MCgyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_tPCRMCgyEeeoAJG6t_MwCA" target="_tP8QICgyEeeoAJG6t_MwCA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_tP83MSgyEeeoAJG6t_MwCA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP9eQSgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tP83MigyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP83MygyEeeoAJG6t_MwCA"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP9eQCgyEeeoAJG6t_MwCA"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_1_-iZygyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_1_0KUCgyEeeoAJG6t_MwCA" target="_1_-iYygyEeeoAJG6t_MwCA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_1_-iaCgyEeeoAJG6t_MwCA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1__JcCgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1_-iaSgyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaigyEeeoAJG6t_MwCA"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaygyEeeoAJG6t_MwCA"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_3g-bECgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_t8oXACgyEeeoAJG6t_MwCA" target="_tPCRMCgyEeeoAJG6t_MwCA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_3g-bESgyEeeoAJG6t_MwCA"/>
+    <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_3gxmwCgyEeeoAJG6t_MwCA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3g-bEigyEeeoAJG6t_MwCA" points="[140, 280, -643984, -643984]$[140, 110, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_4GY1QCgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_yoxWACgyEeeoAJG6t_MwCA" target="_1_0KUCgyEeeoAJG6t_MwCA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_4GY1QSgyEeeoAJG6t_MwCA"/>
+    <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_4GMA8CgyEeeoAJG6t_MwCA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4GY1QigyEeeoAJG6t_MwCA" points="[500, 280, -643984, -643984]$[500, 110, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Xeq5ELAiEee43bo6S9i5Mw" type="Generalization_Edge" source="_WW-4QLAiEee43bo6S9i5Mw" target="_t8oXACgyEeeoAJG6t_MwCA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_XergILAiEee43bo6S9i5Mw" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_XergIbAiEee43bo6S9i5Mw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Xeq5EbAiEee43bo6S9i5Mw"/>
+    <element xmi:type="uml:Generalization" href="expressionProfileWithoutURI.profile.uml#_XeTssLAiEee43bo6S9i5Mw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xeq5ErAiEee43bo6S9i5Mw" points="[160, 520, -643984, -643984]$[160, 380, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XfZ44LAiEee43bo6S9i5Mw" id="(0.39800995024875624,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xfaf8LAiEee43bo6S9i5Mw" id="(0.39800995024875624,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml
index f4f8c0089ba..b5d99638837 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml
@@ -1,159 +1,159 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ozrgMCgyEeeoAJG6t_MwCA" name="RootElement" metaclassReference="_tOxygCgyEeeoAJG6t_MwCA _1_y8MCgyEeeoAJG6t_MwCA">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUCgyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_dHQ5QLAiEee43bo6S9i5Mw" name="RootElement" nsURI="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5" nsPrefix="RootElement">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHT8kLAiEee43bo6S9i5Mw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8kbAiEee43bo6S9i5Mw" key="Version" value="0.0.6"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8krAiEee43bo6S9i5Mw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8k7AiEee43bo6S9i5Mw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8lLAiEee43bo6S9i5Mw" key="Date" value="2017-10-13"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8lbAiEee43bo6S9i5Mw" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5QbAiEee43bo6S9i5Mw" name="ANiceStereotypeForElement">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5QrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dHQ5Q7AiEee43bo6S9i5Mw" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5RbAiEee43bo6S9i5Mw" name="ANiceStereotypeForProperty">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5RrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dHQ5R7AiEee43bo6S9i5Mw" name="base_Property" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5SbAiEee43bo6S9i5Mw" name="AChildNiceStereotypeForElement" eSuperTypes="_dHQ5QbAiEee43bo6S9i5Mw">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5SrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WW0gMLAiEee43bo6S9i5Mw"/>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_AgGB4C8oEeexfKc2E3OwJQ" name="RootElement" nsURI="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4" nsPrefix="RootElement">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgH3Ei8oEeexfKc2E3OwJQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIC8oEeexfKc2E3OwJQ" key="Version" value="0.0.5"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIS8oEeexfKc2E3OwJQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIi8oEeexfKc2E3OwJQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIy8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeJC8oEeexfKc2E3OwJQ" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB4S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForElement">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB4i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB4y8oEeexfKc2E3OwJQ" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB5S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForProperty">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB5i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB5y8oEeexfKc2E3OwJQ" name="base_Property" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_uDXtoC0TEee42cCIRX36lw" name="ProfileWithoutURI" nsURI="http:///schemas/ProfileWithoutURI/_uDXGkC0TEee42cCIRX36lw/3" nsPrefix="ProfileWithoutURI">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDYUsS0TEee42cCIRX36lw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsi0TEee42cCIRX36lw" key="Version" value="0.0.4"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsy0TEee42cCIRX36lw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtC0TEee42cCIRX36lw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtS0TEee42cCIRX36lw" key="Date" value="2017-04-29"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUti0TEee42cCIRX36lw" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtoS0TEee42cCIRX36lw" name="ANiceStereotypeForElement">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtoi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtoy0TEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtpS0TEee42cCIRX36lw" name="ANiceStereotypeForProperty">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtpi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtpy0TEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_8NYKsC0SEee42cCIRX36lw" name="ProfileWithoutNsURI" nsURI="http:///schemas/ProfileWithoutNsURI/_8NWVgC0SEee42cCIRX36lw/2" nsPrefix="ProfileWithoutNsURI">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8Nam8S0SEee42cCIRX36lw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8i0SEee42cCIRX36lw" key="Version" value="0.0.3"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8y0SEee42cCIRX36lw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9C0SEee42cCIRX36lw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9S0SEee42cCIRX36lw" key="Date" value="2017-04-29"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9i0SEee42cCIRX36lw" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKsS0SEee42cCIRX36lw" name="ANiceStereotypeForElement">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKsi0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKsy0SEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKtS0SEee42cCIRX36lw" name="ANiceStereotypeForProperty">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKti0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKty0SEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_PrrrkSgzEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_PrrrkCgzEeeoAJG6t_MwCA/1" nsPrefix="RootElement">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrsSoigzEeeoAJG6t_MwCA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSoygzEeeoAJG6t_MwCA" key="Version" value="0.0.2"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpCgzEeeoAJG6t_MwCA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpSgzEeeoAJG6t_MwCA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpigzEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpygzEeeoAJG6t_MwCA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrkigzEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrkygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrlCgzEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrligzEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrlygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrmCgzEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_41FuUSgyEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_41CrACgyEeeoAJG6t_MwCA/0" nsPrefix="RootElement">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41HjgigyEeeoAJG6t_MwCA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjgygyEeeoAJG6t_MwCA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhCgyEeeoAJG6t_MwCA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhSgyEeeoAJG6t_MwCA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhigyEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhygyEeeoAJG6t_MwCA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuUigyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuVCgyEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuVigyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuVygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuWCgyEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_tOxygCgyEeeoAJG6t_MwCA" alias="Element">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-  </elementImport>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_1_y8MCgyEeeoAJG6t_MwCA" alias="Property">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-  </elementImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_t8ksoCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_3g1RISgyEeeoAJG6t_MwCA" name="base_Element" association="_3gxmwCgyEeeoAJG6t_MwCA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_yokhsCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_4GNPECgyEeeoAJG6t_MwCA" name="base_Property" association="_4GMA8CgyEeeoAJG6t_MwCA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_3gxmwCgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForElement_Element1" memberEnd="_3g1RICgyEeeoAJG6t_MwCA _3g1RISgyEeeoAJG6t_MwCA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3g1RICgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForElement" type="_t8ksoCgyEeeoAJG6t_MwCA" aggregation="composite" association="_3gxmwCgyEeeoAJG6t_MwCA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_4GMA8CgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForProperty_Property1" memberEnd="_4GMoACgyEeeoAJG6t_MwCA _4GNPECgyEeeoAJG6t_MwCA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_4GMoACgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForProperty" type="_yokhsCgyEeeoAJG6t_MwCA" aggregation="composite" association="_4GMA8CgyEeeoAJG6t_MwCA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_WW0gMLAiEee43bo6S9i5Mw" name="AChildNiceStereotypeForElement">

-    <generalization xmi:type="uml:Generalization" xmi:id="_XeTssLAiEee43bo6S9i5Mw" general="_t8ksoCgyEeeoAJG6t_MwCA"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ozrgMCgyEeeoAJG6t_MwCA" name="RootElement" metaclassReference="_tOxygCgyEeeoAJG6t_MwCA _1_y8MCgyEeeoAJG6t_MwCA">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUCgyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_dHQ5QLAiEee43bo6S9i5Mw" name="RootElement" nsURI="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5" nsPrefix="RootElement">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHT8kLAiEee43bo6S9i5Mw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8kbAiEee43bo6S9i5Mw" key="Version" value="0.0.6"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8krAiEee43bo6S9i5Mw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8k7AiEee43bo6S9i5Mw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8lLAiEee43bo6S9i5Mw" key="Date" value="2017-10-13"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8lbAiEee43bo6S9i5Mw" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5QbAiEee43bo6S9i5Mw" name="ANiceStereotypeForElement">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5QrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dHQ5Q7AiEee43bo6S9i5Mw" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5RbAiEee43bo6S9i5Mw" name="ANiceStereotypeForProperty">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5RrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dHQ5R7AiEee43bo6S9i5Mw" name="base_Property" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5SbAiEee43bo6S9i5Mw" name="AChildNiceStereotypeForElement" eSuperTypes="_dHQ5QbAiEee43bo6S9i5Mw">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5SrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WW0gMLAiEee43bo6S9i5Mw"/>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_AgGB4C8oEeexfKc2E3OwJQ" name="RootElement" nsURI="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4" nsPrefix="RootElement">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgH3Ei8oEeexfKc2E3OwJQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIC8oEeexfKc2E3OwJQ" key="Version" value="0.0.5"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIS8oEeexfKc2E3OwJQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIi8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIy8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeJC8oEeexfKc2E3OwJQ" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB4S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForElement">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB4i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB4y8oEeexfKc2E3OwJQ" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB5S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForProperty">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB5i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB5y8oEeexfKc2E3OwJQ" name="base_Property" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_uDXtoC0TEee42cCIRX36lw" name="ProfileWithoutURI" nsURI="http:///schemas/ProfileWithoutURI/_uDXGkC0TEee42cCIRX36lw/3" nsPrefix="ProfileWithoutURI">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDYUsS0TEee42cCIRX36lw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsi0TEee42cCIRX36lw" key="Version" value="0.0.4"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsy0TEee42cCIRX36lw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtC0TEee42cCIRX36lw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtS0TEee42cCIRX36lw" key="Date" value="2017-04-29"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUti0TEee42cCIRX36lw" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtoS0TEee42cCIRX36lw" name="ANiceStereotypeForElement">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtoi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtoy0TEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtpS0TEee42cCIRX36lw" name="ANiceStereotypeForProperty">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtpi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtpy0TEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_8NYKsC0SEee42cCIRX36lw" name="ProfileWithoutNsURI" nsURI="http:///schemas/ProfileWithoutNsURI/_8NWVgC0SEee42cCIRX36lw/2" nsPrefix="ProfileWithoutNsURI">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8Nam8S0SEee42cCIRX36lw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8i0SEee42cCIRX36lw" key="Version" value="0.0.3"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8y0SEee42cCIRX36lw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9C0SEee42cCIRX36lw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9S0SEee42cCIRX36lw" key="Date" value="2017-04-29"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9i0SEee42cCIRX36lw" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKsS0SEee42cCIRX36lw" name="ANiceStereotypeForElement">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKsi0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKsy0SEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKtS0SEee42cCIRX36lw" name="ANiceStereotypeForProperty">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKti0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKty0SEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_PrrrkSgzEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_PrrrkCgzEeeoAJG6t_MwCA/1" nsPrefix="RootElement">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrsSoigzEeeoAJG6t_MwCA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSoygzEeeoAJG6t_MwCA" key="Version" value="0.0.2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpCgzEeeoAJG6t_MwCA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpSgzEeeoAJG6t_MwCA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpigzEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpygzEeeoAJG6t_MwCA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrkigzEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrkygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrlCgzEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrligzEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrlygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrmCgzEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_41FuUSgyEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_41CrACgyEeeoAJG6t_MwCA/0" nsPrefix="RootElement">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41HjgigyEeeoAJG6t_MwCA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjgygyEeeoAJG6t_MwCA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhCgyEeeoAJG6t_MwCA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhSgyEeeoAJG6t_MwCA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhigyEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhygyEeeoAJG6t_MwCA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuUigyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuVCgyEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuVigyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuVygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuWCgyEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_tOxygCgyEeeoAJG6t_MwCA" alias="Element">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+  </elementImport>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_1_y8MCgyEeeoAJG6t_MwCA" alias="Property">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+  </elementImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_t8ksoCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_3g1RISgyEeeoAJG6t_MwCA" name="base_Element" association="_3gxmwCgyEeeoAJG6t_MwCA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_yokhsCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_4GNPECgyEeeoAJG6t_MwCA" name="base_Property" association="_4GMA8CgyEeeoAJG6t_MwCA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_3gxmwCgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForElement_Element1" memberEnd="_3g1RICgyEeeoAJG6t_MwCA _3g1RISgyEeeoAJG6t_MwCA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3g1RICgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForElement" type="_t8ksoCgyEeeoAJG6t_MwCA" aggregation="composite" association="_3gxmwCgyEeeoAJG6t_MwCA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_4GMA8CgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForProperty_Property1" memberEnd="_4GMoACgyEeeoAJG6t_MwCA _4GNPECgyEeeoAJG6t_MwCA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_4GMoACgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForProperty" type="_yokhsCgyEeeoAJG6t_MwCA" aggregation="composite" association="_4GMA8CgyEeeoAJG6t_MwCA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_WW0gMLAiEee43bo6S9i5Mw" name="AChildNiceStereotypeForElement">
+    <generalization xmi:type="uml:Generalization" xmi:id="_XeTssLAiEee43bo6S9i5Mw" general="_t8ksoCgyEeeoAJG6t_MwCA"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF
index 0e66c0efd94..0315954a21c 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.uml.internationalization.controlmode.tests;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.uml.internationalization.controlmode.tests,

- org.eclipse.papyrus.uml.internationalization.controlmode.tests.tests

-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- 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.ui.workbench;bundle-version="[3.108.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",

- org.eclipse.papyrus.uml.internationalization.tests;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-Activator: org.eclipse.papyrus.uml.internationalization.controlmode.tests.Activator

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.uml.internationalization.controlmode.tests;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.uml.internationalization.controlmode.tests,
+ org.eclipse.papyrus.uml.internationalization.controlmode.tests.tests
+Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ 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.ui.workbench;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.papyrus.uml.internationalization.tests;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.uml.internationalization.controlmode.tests.Activator
 Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF
index b89c0987563..36b18620db7 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.uml.internationalization.tests;singleton:=true

-Bundle-Version: 1.100.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.uml.internationalization.tests,

- org.eclipse.papyrus.uml.internationalization.tests.tests

-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- 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.papyrus.uml.internationalization;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.100.0,2.0.0)",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.100.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-Activator: org.eclipse.papyrus.uml.internationalization.tests.Activator

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.uml.internationalization.tests;singleton:=true
+Bundle-Version: 1.100.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.uml.internationalization.tests,
+ org.eclipse.papyrus.uml.internationalization.tests.tests
+Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ 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.papyrus.uml.internationalization;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.100.0,2.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.100.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.uml.internationalization.tests.Activator
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.classpath b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.classpath
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.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/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.project b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.project
index f914619a6ae..f6c5cc7650e 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.project
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.modelexplorer.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.modelexplorer.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.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/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
index dfd2b7c8cdc..ca16b1c5079 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -1,36 +1,36 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.emf.ecore,

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.ui.navigator,

- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.junit;bundle-version="4.10.0",

- 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.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.notation.edit,

- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.uml.modelexplorer.tests,

- org.eclipse.papyrus.uml.modelexplorer.tests.paste

-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.uml.modelexplorer.tests.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.ecore,
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.junit;bundle-version="4.10.0",
+ 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.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation.edit,
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.modelexplorer.tests,
+ org.eclipse.papyrus.uml.modelexplorer.tests.paste
+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.uml.modelexplorer.tests.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/about.html b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/about.html
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/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/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/build.properties b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/build.properties
index 18dbd802f30..050c11f4b16 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/build.properties
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               resources/,\

-               build.properties,\

-               plugin.properties,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               resources/,\
+               build.properties,\
+               plugin.properties,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/org.eclipse.papyrus.uml.modelexplorer.tests.launch b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/org.eclipse.papyrus.uml.modelexplorer.tests.launch
index 8b82788fc21..b49c86eac40 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/org.eclipse.papyrus.uml.modelexplorer.tests.launch
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/org.eclipse.papyrus.uml.modelexplorer.tests.launch
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.modelexplorer.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.modelexplorer.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Xmx4096m -DsuppressRawWhenUnchecked=true "/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.modelexplorer.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.modelexplorer.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Xmx4096m -DsuppressRawWhenUnchecked=true "/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties
index 0a213aca78f..8922c357336 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties
@@ -1,4 +1,4 @@
-#Properties file for org.eclipse.papyrus.uml.modelexplorer.tests

-providerName = Eclipse Modeling Project

-pluginName = JUnit Tests for uml ModelExplorer

+#Properties file for org.eclipse.papyrus.uml.modelexplorer.tests
+providerName = Eclipse Modeling Project
+pluginName = JUnit Tests for uml ModelExplorer
 pluginDescription=This plugin allows to tests the plugin org.eclipse.papyrus.uml.modelexplorer
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/Activator.java b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/Activator.java
index 274bbf42413..5a38347328d 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/Activator.java
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/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.uml.modelexplorer.tests;

-

-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.uml.modelexplorer.tests"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(final BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(final BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.modelexplorer.tests;
+
+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.uml.modelexplorer.tests"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(final BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(final BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.project b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.project
index a3629d5a38b..0a450ca3708 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.project
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.clazz.config.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.clazz.config.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/UMLTreeNatTableClassTests.launch b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/UMLTreeNatTableClassTests.launch
index a1ae885933f..28f012d9ddb 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/UMLTreeNatTableClassTests.launch
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/UMLTreeNatTableClassTests.launch
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<listAttribute key="classFilters">

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.infra.emf.*)"/>

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.uml.tools.*)"/>

-<listEntry value="ClassFilter(include, *.tests.*)"/>

-</listAttribute>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.nattable.clazz.config.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms120m -Xmx512m "/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<listAttribute key="classFilters">
+<listEntry value="ClassFilter(include, org.eclipse.papyrus.infra.emf.*)"/>
+<listEntry value="ClassFilter(include, org.eclipse.papyrus.uml.tools.*)"/>
+<listEntry value="ClassFilter(include, *.tests.*)"/>
+</listAttribute>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.nattable.clazz.config.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms120m -Xmx512m "/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/plugin.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/plugin.properties
index fca8b97c361..59e2b065d21 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/plugin.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/plugin.properties
@@ -1,4 +1,4 @@
-#Properties file for org.eclipse.papyrus.uml.nattable.clazz.config.tests

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = UML NatTable Class Tests

+#Properties file for org.eclipse.papyrus.uml.nattable.clazz.config.tests
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = UML NatTable Class Tests
 Bundle-Description = This plugin provides tests for the plugin org.eclipse.papyrus.uml.nattable.clazz.config
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.notation
index 0592742fd13..edf43814956 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.notation
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_mS_9EBtUEeWAIYKqr4cMiQ" name="ClassTreeTable0" currentRowAxisProvider="_mS_9ExtUEeWAIYKqr4cMiQ" currentColumnAxisProvider="_mS_9ERtUEeWAIYKqr4cMiQ">

-  <context xmi:type="uml:Model" href="OpenAndDeleteTest.uml#_i3QR8BszEeWpHqoKlVqIAQ"/>

-  <owner xmi:type="uml:Model" href="OpenAndDeleteTest.uml#_i3QR8BszEeWpHqoKlVqIAQ"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_mS_9ERtUEeWAIYKqr4cMiQ" 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="_mS_9EhtUEeWAIYKqr4cMiQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_mS_9ExtUEeWAIYKqr4cMiQ" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_4VxB4Bv3EeWoheZPsyYD9w" indexStyle="NUMERIC">

-    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_4VxB4Rv3EeWoheZPsyYD9w" name="rowLabelWidth" intValue="116"/>

-  </localRowHeaderAxisConfiguration>

-  <localColumnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_5FvGQBv3EeWoheZPsyYD9w">

-    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_5FvGQRv3EeWoheZPsyYD9w" name="columnIndexHeight" intValue="38"/>

-    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_5kp24Bv3EeWoheZPsyYD9w" name="columnLabelHeight" intValue="29"/>

-  </localColumnHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_mS_9EBtUEeWAIYKqr4cMiQ" name="ClassTreeTable0" currentRowAxisProvider="_mS_9ExtUEeWAIYKqr4cMiQ" currentColumnAxisProvider="_mS_9ERtUEeWAIYKqr4cMiQ">
+  <context xmi:type="uml:Model" href="OpenAndDeleteTest.uml#_i3QR8BszEeWpHqoKlVqIAQ"/>
+  <owner xmi:type="uml:Model" href="OpenAndDeleteTest.uml#_i3QR8BszEeWpHqoKlVqIAQ"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_mS_9ERtUEeWAIYKqr4cMiQ" 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="_mS_9EhtUEeWAIYKqr4cMiQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_mS_9ExtUEeWAIYKqr4cMiQ" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_4VxB4Bv3EeWoheZPsyYD9w" indexStyle="NUMERIC">
+    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_4VxB4Rv3EeWoheZPsyYD9w" name="rowLabelWidth" intValue="116"/>
+  </localRowHeaderAxisConfiguration>
+  <localColumnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_5FvGQBv3EeWoheZPsyYD9w">
+    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_5FvGQRv3EeWoheZPsyYD9w" name="columnIndexHeight" intValue="38"/>
+    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_5kp24Bv3EeWoheZPsyYD9w" name="columnLabelHeight" intValue="29"/>
+  </localColumnHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.uml
index 9af8281e0d2..fbe6f5700c6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug470811/OpenAndDeleteTest.uml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_i3QR8BszEeWpHqoKlVqIAQ" name="RootElement">

-  <packagedElement xmi:type="uml:Class" xmi:id="_L_VpkBs0EeWnBYfbvylYbw" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_NMO6gBs0EeWnBYfbvylYbw" name="Class2"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_MkPtcBs0EeWnBYfbvylYbw" name="Class2">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_OZU_wBs0EeWnBYfbvylYbw" name="Attribute1"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_i3QR8BszEeWpHqoKlVqIAQ" name="RootElement">
+  <packagedElement xmi:type="uml:Class" xmi:id="_L_VpkBs0EeWnBYfbvylYbw" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_NMO6gBs0EeWnBYfbvylYbw" name="Class2"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_MkPtcBs0EeWnBYfbvylYbw" name="Class2">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_OZU_wBs0EeWnBYfbvylYbw" name="Attribute1"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.notation
index 1e9b7412836..22a46d1fc0a 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.notation
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_gTYNUCSyEeWi9YWjnWvYDw" name="GenericTreeTable0" currentRowAxisProvider="_gTYNUySyEeWi9YWjnWvYDw" currentColumnAxisProvider="_gTYNUSSyEeWi9YWjnWvYDw">

-  <context xmi:type="uml:Model" href="MoveElementsTreeTableTest.uml#_YEpRUCSyEeWi9YWjnWvYDw"/>

-  <owner xmi:type="uml:Model" href="MoveElementsTreeTableTest.uml#_YEpRUCSyEeWi9YWjnWvYDw"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_gTYNUSSyEeWi9YWjnWvYDw" 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="_gTYNUiSyEeWi9YWjnWvYDw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_gTYNUySyEeWi9YWjnWvYDw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_iQh2gCSyEeWi9YWjnWvYDw" indexStyle="NUMERIC">

-    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_iQh2gSSyEeWi9YWjnWvYDw" name="rowLabelWidth" intValue="225"/>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_gTYNUCSyEeWi9YWjnWvYDw" name="GenericTreeTable0" currentRowAxisProvider="_gTYNUySyEeWi9YWjnWvYDw" currentColumnAxisProvider="_gTYNUSSyEeWi9YWjnWvYDw">
+  <context xmi:type="uml:Model" href="MoveElementsTreeTableTest.uml#_YEpRUCSyEeWi9YWjnWvYDw"/>
+  <owner xmi:type="uml:Model" href="MoveElementsTreeTableTest.uml#_YEpRUCSyEeWi9YWjnWvYDw"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_gTYNUSSyEeWi9YWjnWvYDw" 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="_gTYNUiSyEeWi9YWjnWvYDw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_gTYNUySyEeWi9YWjnWvYDw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_iQh2gCSyEeWi9YWjnWvYDw" indexStyle="NUMERIC">
+    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_iQh2gSSyEeWi9YWjnWvYDw" name="rowLabelWidth" intValue="225"/>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.uml
index b1863772c2a..bb008eab261 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/bugs/bug471903/MoveElementsTreeTableTest.uml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_YEpRUCSyEeWi9YWjnWvYDw" name="RootElement">

-  <packagedElement xmi:type="uml:Class" xmi:id="_aWeKACSyEeWi9YWjnWvYDw" name="Class1"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_a07AkCSyEeWi9YWjnWvYDw" name="Class2"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_ba1xECSyEeWi9YWjnWvYDw" name="Class3"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_AfYM8CVyEeWIlt4s1rO3gg" name="Class4"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_hOYdACSyEeWi9YWjnWvYDw" name="Package1"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_YEpRUCSyEeWi9YWjnWvYDw" name="RootElement">
+  <packagedElement xmi:type="uml:Class" xmi:id="_aWeKACSyEeWi9YWjnWvYDw" name="Class1"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_a07AkCSyEeWi9YWjnWvYDw" name="Class2"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ba1xECSyEeWi9YWjnWvYDw" name="Class3"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_AfYM8CVyEeWIlt4s1rO3gg" name="Class4"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_hOYdACSyEeWi9YWjnWvYDw" name="Package1"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.notation
index 3774b8dca36..65d9e2e3eca 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.notation
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_bUpBsGWwEeSE1IcRTuXCRQ" name="ClassTreeTable1" currentRowAxisProvider="_bUpBs2WwEeSE1IcRTuXCRQ" currentColumnAxisProvider="_bUpBsWWwEeSE1IcRTuXCRQ">

-  <context xmi:type="uml:Model" href="contents_with_categories_0_1_2.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-  <owner xmi:type="uml:Model" href="contents_with_categories_0_1_2.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_bUpBsWWwEeSE1IcRTuXCRQ" 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="_bUpBsmWwEeSE1IcRTuXCRQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_bUpBs2WwEeSE1IcRTuXCRQ" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_bUpBsGWwEeSE1IcRTuXCRQ" name="ClassTreeTable1" currentRowAxisProvider="_bUpBs2WwEeSE1IcRTuXCRQ" currentColumnAxisProvider="_bUpBsWWwEeSE1IcRTuXCRQ">
+  <context xmi:type="uml:Model" href="contents_with_categories_0_1_2.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+  <owner xmi:type="uml:Model" href="contents_with_categories_0_1_2.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_bUpBsWWwEeSE1IcRTuXCRQ" 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="_bUpBsmWwEeSE1IcRTuXCRQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_bUpBs2WwEeSE1IcRTuXCRQ" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.uml
index 16d61587acf..e4aa1fbc7e7 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/contents_and_expand_tests_resources/contents_with_categories_0_1_2.uml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Wn-FQFz_EeSXB5lObuMx0Q" name="model">

-  <eAnnotations xmi:id="_dzUMcF-CEeSiC_8vQsLcmQ"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_ktkuAFz_EeSXB5lObuMx0Q" name="Class1">

-    <ownedAttribute xmi:id="_p8tFUFz_EeSXB5lObuMx0Q" name="Attribute1"/>

-    <ownedAttribute xmi:id="_VJ8yoF0AEeSXB5lObuMx0Q" name="Attribute2"/>

-    <ownedAttribute xmi:id="_XXDPIF57EeSGEoSIn-CQ9A" name="Attribute3"/>

-    <ownedOperation xmi:id="_XZqygF0AEeSXB5lObuMx0Q" name="Operation1">

-      <ownedParameter xmi:id="_Y_LXwF0AEeSXB5lObuMx0Q" name="Parameter1"/>

-      <ownedParameter xmi:id="_XfAz8GWwEeSE1IcRTuXCRQ" name="Parameter2"/>

-      <ownedParameter xmi:id="_XokYkGWwEeSE1IcRTuXCRQ" name="Parameter3"/>

-    </ownedOperation>

-    <ownedOperation xmi:id="_SdkTUGWwEeSE1IcRTuXCRQ" name="Operation2"/>

-    <ownedOperation xmi:id="_VYLDQGWwEeSE1IcRTuXCRQ" name="Operation3"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_m6Uc0F6IEeSkFutaog6joA" name="Class1"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_6Gzf0F6IEeSkFutaog6joA" name="Class2"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_sRfWAF6tEeSX9eTjVyEyYw" name="Class3"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_r-4YcFz_EeSXB5lObuMx0Q" name="Class2"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_VddQQF57EeSGEoSIn-CQ9A" name="Class3"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_u6xpEF6EEeSMz8JhP-zl5g" name="Class4"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_7Lw5kF6EEeSMz8JhP-zl5g" name="Class5"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_OvWYgF6GEeSMz8JhP-zl5g" name="Class6"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Wn-FQFz_EeSXB5lObuMx0Q" name="model">
+  <eAnnotations xmi:id="_dzUMcF-CEeSiC_8vQsLcmQ"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ktkuAFz_EeSXB5lObuMx0Q" name="Class1">
+    <ownedAttribute xmi:id="_p8tFUFz_EeSXB5lObuMx0Q" name="Attribute1"/>
+    <ownedAttribute xmi:id="_VJ8yoF0AEeSXB5lObuMx0Q" name="Attribute2"/>
+    <ownedAttribute xmi:id="_XXDPIF57EeSGEoSIn-CQ9A" name="Attribute3"/>
+    <ownedOperation xmi:id="_XZqygF0AEeSXB5lObuMx0Q" name="Operation1">
+      <ownedParameter xmi:id="_Y_LXwF0AEeSXB5lObuMx0Q" name="Parameter1"/>
+      <ownedParameter xmi:id="_XfAz8GWwEeSE1IcRTuXCRQ" name="Parameter2"/>
+      <ownedParameter xmi:id="_XokYkGWwEeSE1IcRTuXCRQ" name="Parameter3"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_SdkTUGWwEeSE1IcRTuXCRQ" name="Operation2"/>
+    <ownedOperation xmi:id="_VYLDQGWwEeSE1IcRTuXCRQ" name="Operation3"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_m6Uc0F6IEeSkFutaog6joA" name="Class1"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_6Gzf0F6IEeSkFutaog6joA" name="Class2"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_sRfWAF6tEeSX9eTjVyEyYw" name="Class3"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_r-4YcFz_EeSXB5lObuMx0Q" name="Class2"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_VddQQF57EeSGEoSIn-CQ9A" name="Class3"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_u6xpEF6EEeSMz8JhP-zl5g" name="Class4"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_7Lw5kF6EEeSMz8JhP-zl5g" name="Class5"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_OvWYgF6GEeSMz8JhP-zl5g" name="Class6"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.di
index 08128862c28..8c549eecdc6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.notation
index 10eb11e244b..6c49daf4ff6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.notation
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_SqS6QKzkEeeyD_oOzBDqvw" name="GenericTreeTable" currentRowAxisProvider="_SqS6Q6zkEeeyD_oOzBDqvw" currentColumnAxisProvider="_SqS6QazkEeeyD_oOzBDqvw" tableKindId="org.eclipse.papyrus.uml.table.genericTree">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SqThUKzkEeeyD_oOzBDqvw" source="http://www.eclipse.org/papyrus/infra/nattable/version">

-    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SqThUazkEeeyD_oOzBDqvw" key="version" value="1.3.0"/>

-  </eAnnotations>

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_UufmoKzkEeeyD_oOzBDqvw" name="hiddenCategoriesByDepth">

-    <intListValue>1</intListValue>

-    <intListValue>2</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.uml#_4GD6gKzLEeeyD_oOzBDqvw"/>

-  <owner xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.uml#_4GD6gKzLEeeyD_oOzBDqvw"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_SqS6QazkEeeyD_oOzBDqvw" 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="_SqS6QqzkEeeyD_oOzBDqvw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_SqS6Q6zkEeeyD_oOzBDqvw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_VboZcKzkEeeyD_oOzBDqvw" indexStyle="NUMERIC">

-    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_VbpAgKzkEeeyD_oOzBDqvw" name="rowLabelWidth" intValue="216"/>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_SqS6QKzkEeeyD_oOzBDqvw" name="GenericTreeTable" currentRowAxisProvider="_SqS6Q6zkEeeyD_oOzBDqvw" currentColumnAxisProvider="_SqS6QazkEeeyD_oOzBDqvw" tableKindId="org.eclipse.papyrus.uml.table.genericTree">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SqThUKzkEeeyD_oOzBDqvw" source="http://www.eclipse.org/papyrus/infra/nattable/version">
+    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SqThUazkEeeyD_oOzBDqvw" key="version" value="1.3.0"/>
+  </eAnnotations>
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_UufmoKzkEeeyD_oOzBDqvw" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.uml#_4GD6gKzLEeeyD_oOzBDqvw"/>
+  <owner xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.uml#_4GD6gKzLEeeyD_oOzBDqvw"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_SqS6QazkEeeyD_oOzBDqvw" 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="_SqS6QqzkEeeyD_oOzBDqvw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_SqS6Q6zkEeeyD_oOzBDqvw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_VboZcKzkEeeyD_oOzBDqvw" indexStyle="NUMERIC">
+    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_VbpAgKzkEeeyD_oOzBDqvw" name="rowLabelWidth" intValue="216"/>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.uml
index 2d360e8402f..9332f8fd987 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_H1_H1_Test.uml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4GD6gKzLEeeyD_oOzBDqvw" name="FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_2">

-  <packagedElement xmi:type="uml:Class" xmi:id="_5c05IKzLEeeyD_oOzBDqvw" name="10Requirement100">

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_6S0F8KzLEeeyD_oOzBDqvw" name="10Requirement101"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_6npGcKzLEeeyD_oOzBDqvw" name="10Requirement102"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="__BL5kKzLEeeyD_oOzBDqvw" name="20Requirement200">

-    <nestedClassifier xmi:type="uml:Class" xmi:id="__BL5kazLEeeyD_oOzBDqvw" name="20Requirement201"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="__BL5kqzLEeeyD_oOzBDqvw" name="20Requirement202"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_DWMK8KzMEeeyD_oOzBDqvw" name="30Requirement300">

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_DWMK8azMEeeyD_oOzBDqvw" name="30Requirement301"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_DWMK8qzMEeeyD_oOzBDqvw" name="30Requirement302"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4GD6gKzLEeeyD_oOzBDqvw" name="FillHandleHiddenRowsBug519383BeginningEndingPrefix_V1_V1_V1_Test_2">
+  <packagedElement xmi:type="uml:Class" xmi:id="_5c05IKzLEeeyD_oOzBDqvw" name="10Requirement100">
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_6S0F8KzLEeeyD_oOzBDqvw" name="10Requirement101"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_6npGcKzLEeeyD_oOzBDqvw" name="10Requirement102"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="__BL5kKzLEeeyD_oOzBDqvw" name="20Requirement200">
+    <nestedClassifier xmi:type="uml:Class" xmi:id="__BL5kazLEeeyD_oOzBDqvw" name="20Requirement201"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="__BL5kqzLEeeyD_oOzBDqvw" name="20Requirement202"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_DWMK8KzMEeeyD_oOzBDqvw" name="30Requirement300">
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_DWMK8azMEeeyD_oOzBDqvw" name="30Requirement301"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_DWMK8qzMEeeyD_oOzBDqvw" name="30Requirement302"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.di
index 08128862c28..8c549eecdc6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.notation
index a29d64e151b..3279faf5fde 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.notation
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_aV8XUKzkEeeyD_oOzBDqvw" name="GenericTreeTable" currentRowAxisProvider="_aV8XU6zkEeeyD_oOzBDqvw" currentColumnAxisProvider="_aV8XUazkEeeyD_oOzBDqvw" tableKindId="org.eclipse.papyrus.uml.table.genericTree">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aV8-YKzkEeeyD_oOzBDqvw" source="http://www.eclipse.org/papyrus/infra/nattable/version">

-    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aV8-YazkEeeyD_oOzBDqvw" key="version" value="1.3.0"/>

-  </eAnnotations>

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_beU7sKzkEeeyD_oOzBDqvw" name="hiddenCategoriesByDepth">

-    <intListValue>1</intListValue>

-    <intListValue>2</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.uml#_4GD6gKzLEeeyD_oOzBDqvw"/>

-  <owner xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.uml#_4GD6gKzLEeeyD_oOzBDqvw"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_aV8XUazkEeeyD_oOzBDqvw" 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="_aV8XUqzkEeeyD_oOzBDqvw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_aV8XU6zkEeeyD_oOzBDqvw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_c1HIcKzkEeeyD_oOzBDqvw" indexStyle="NUMERIC">

-    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_c1HIcazkEeeyD_oOzBDqvw" name="rowLabelWidth" intValue="235"/>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_aV8XUKzkEeeyD_oOzBDqvw" name="GenericTreeTable" currentRowAxisProvider="_aV8XU6zkEeeyD_oOzBDqvw" currentColumnAxisProvider="_aV8XUazkEeeyD_oOzBDqvw" tableKindId="org.eclipse.papyrus.uml.table.genericTree">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aV8-YKzkEeeyD_oOzBDqvw" source="http://www.eclipse.org/papyrus/infra/nattable/version">
+    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aV8-YazkEeeyD_oOzBDqvw" key="version" value="1.3.0"/>
+  </eAnnotations>
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_beU7sKzkEeeyD_oOzBDqvw" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.uml#_4GD6gKzLEeeyD_oOzBDqvw"/>
+  <owner xmi:type="uml:Model" href="FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.uml#_4GD6gKzLEeeyD_oOzBDqvw"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_aV8XUazkEeeyD_oOzBDqvw" 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="_aV8XUqzkEeeyD_oOzBDqvw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_aV8XU6zkEeeyD_oOzBDqvw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_c1HIcKzkEeeyD_oOzBDqvw" indexStyle="NUMERIC">
+    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_c1HIcazkEeeyD_oOzBDqvw" name="rowLabelWidth" intValue="235"/>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.uml
index 69946a1db3e..90ea9ef63b1 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_H1_H1_Test.uml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4GD6gKzLEeeyD_oOzBDqvw" name="FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_2">

-  <packagedElement xmi:type="uml:Class" xmi:id="_5c05IKzLEeeyD_oOzBDqvw" name="10Requirement100">

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_6S0F8KzLEeeyD_oOzBDqvw" name="10Requirement101"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_6npGcKzLEeeyD_oOzBDqvw" name="10Requirement102"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="__BL5kKzLEeeyD_oOzBDqvw" name="20Requirement200">

-    <nestedClassifier xmi:type="uml:Class" xmi:id="__BL5kazLEeeyD_oOzBDqvw" name="20Requirement201"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="__BL5kqzLEeeyD_oOzBDqvw" name="20Requirement202"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_DWMK8KzMEeeyD_oOzBDqvw" name="30Requirement300">

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_DWMK8azMEeeyD_oOzBDqvw" name="30Requirement301"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_DWMK8qzMEeeyD_oOzBDqvw" name="30Requirement302"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4GD6gKzLEeeyD_oOzBDqvw" name="FillHandleHiddenRowsBug519383BeginningEndingSuffix_V1_V1_V1_Test_2">
+  <packagedElement xmi:type="uml:Class" xmi:id="_5c05IKzLEeeyD_oOzBDqvw" name="10Requirement100">
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_6S0F8KzLEeeyD_oOzBDqvw" name="10Requirement101"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_6npGcKzLEeeyD_oOzBDqvw" name="10Requirement102"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="__BL5kKzLEeeyD_oOzBDqvw" name="20Requirement200">
+    <nestedClassifier xmi:type="uml:Class" xmi:id="__BL5kazLEeeyD_oOzBDqvw" name="20Requirement201"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="__BL5kqzLEeeyD_oOzBDqvw" name="20Requirement202"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_DWMK8KzMEeeyD_oOzBDqvw" name="30Requirement300">
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_DWMK8azMEeeyD_oOzBDqvw" name="30Requirement301"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_DWMK8qzMEeeyD_oOzBDqvw" name="30Requirement302"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.notation
index 1f28b4693de..9f8f64348f7 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.notation
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_bUpBsGWwEeSE1IcRTuXCRQ" name="ClassTreeTable1" currentRowAxisProvider="_bUpBs2WwEeSE1IcRTuXCRQ" currentColumnAxisProvider="_bUpBsWWwEeSE1IcRTuXCRQ">

-  <context xmi:type="uml:Model" href="openTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-  <owner xmi:type="uml:Model" href="openTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_bUpBsWWwEeSE1IcRTuXCRQ" 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="_bUpBsmWwEeSE1IcRTuXCRQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_bUpBs2WwEeSE1IcRTuXCRQ" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_bUpBsGWwEeSE1IcRTuXCRQ" name="ClassTreeTable1" currentRowAxisProvider="_bUpBs2WwEeSE1IcRTuXCRQ" currentColumnAxisProvider="_bUpBsWWwEeSE1IcRTuXCRQ">
+  <context xmi:type="uml:Model" href="openTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+  <owner xmi:type="uml:Model" href="openTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_bUpBsWWwEeSE1IcRTuXCRQ" 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="_bUpBsmWwEeSE1IcRTuXCRQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_bUpBs2WwEeSE1IcRTuXCRQ" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.uml
index eef540c4594..2598b1f1742 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/openTest.uml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Wn-FQFz_EeSXB5lObuMx0Q" name="model">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dzUMcF-CEeSiC_8vQsLcmQ"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_ktkuAFz_EeSXB5lObuMx0Q" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_p8tFUFz_EeSXB5lObuMx0Q" name="Attribute1"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_VJ8yoF0AEeSXB5lObuMx0Q" name="Attribute2"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_XXDPIF57EeSGEoSIn-CQ9A" name="Attribute3"/>

-    <ownedOperation xmi:type="uml:Operation" xmi:id="_XZqygF0AEeSXB5lObuMx0Q" name="Operation1">

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Y_LXwF0AEeSXB5lObuMx0Q" name="Parameter1"/>

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_XfAz8GWwEeSE1IcRTuXCRQ" name="Parameter2"/>

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_XokYkGWwEeSE1IcRTuXCRQ" name="Parameter1_3"/>

-    </ownedOperation>

-    <ownedOperation xmi:type="uml:Operation" xmi:id="_SdkTUGWwEeSE1IcRTuXCRQ" name="Operation2">

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_SdkTUWWwEeSE1IcRTuXCRQ" name="Parameter1"/>

-    </ownedOperation>

-    <ownedOperation xmi:type="uml:Operation" xmi:id="_VYLDQGWwEeSE1IcRTuXCRQ" name="Operation3">

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_VYLDQWWwEeSE1IcRTuXCRQ" name="Parameter1"/>

-    </ownedOperation>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_m6Uc0F6IEeSkFutaog6joA" name="Class1"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_6Gzf0F6IEeSkFutaog6joA" name="Class2"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_sRfWAF6tEeSX9eTjVyEyYw" name="Class3"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_r-4YcFz_EeSXB5lObuMx0Q" name="Class2"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_VddQQF57EeSGEoSIn-CQ9A" name="Class3"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_u6xpEF6EEeSMz8JhP-zl5g" name="Class4"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_7Lw5kF6EEeSMz8JhP-zl5g" name="Class5"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_OvWYgF6GEeSMz8JhP-zl5g" name="Class6"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Wn-FQFz_EeSXB5lObuMx0Q" name="model">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dzUMcF-CEeSiC_8vQsLcmQ"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ktkuAFz_EeSXB5lObuMx0Q" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_p8tFUFz_EeSXB5lObuMx0Q" name="Attribute1"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_VJ8yoF0AEeSXB5lObuMx0Q" name="Attribute2"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_XXDPIF57EeSGEoSIn-CQ9A" name="Attribute3"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_XZqygF0AEeSXB5lObuMx0Q" name="Operation1">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Y_LXwF0AEeSXB5lObuMx0Q" name="Parameter1"/>
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_XfAz8GWwEeSE1IcRTuXCRQ" name="Parameter2"/>
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_XokYkGWwEeSE1IcRTuXCRQ" name="Parameter1_3"/>
+    </ownedOperation>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_SdkTUGWwEeSE1IcRTuXCRQ" name="Operation2">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_SdkTUWWwEeSE1IcRTuXCRQ" name="Parameter1"/>
+    </ownedOperation>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_VYLDQGWwEeSE1IcRTuXCRQ" name="Operation3">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_VYLDQWWwEeSE1IcRTuXCRQ" name="Parameter1"/>
+    </ownedOperation>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_m6Uc0F6IEeSkFutaog6joA" name="Class1"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_6Gzf0F6IEeSkFutaog6joA" name="Class2"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_sRfWAF6tEeSX9eTjVyEyYw" name="Class3"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_r-4YcFz_EeSXB5lObuMx0Q" name="Class2"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_VddQQF57EeSGEoSIn-CQ9A" name="Class3"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_u6xpEF6EEeSMz8JhP-zl5g" name="Class4"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_7Lw5kF6EEeSMz8JhP-zl5g" name="Class5"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_OvWYgF6GEeSMz8JhP-zl5g" name="Class6"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_AttachedMode_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_AttachedMode_Test.txt
index 49f1abb1701..5057db0eefa 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_AttachedMode_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_AttachedMode_Test.txt
@@ -1,26 +1,26 @@
-Class0			Class0	public	false	N/A

-	Operation0		Operation0	package	false	N/A

-		Param0	Param0	public	N/A	in

-		Param1	Param1	public	N/A	out

-		Param2	Param2	public	N/A	return

-	Operation1		Operation1	package	false	

-		Param0	Param0	private	N/A	in

-		Param1	Param1	private	N/A	out

-		Param2	Param2	private	N/A	return

-	Operation2		Operation2	package	false	

-		Param0	Param0	package	N/A	in

-		Param1	Param1	package	N/A	out

-		Param2	Param2	package	N/A	return

-Class1			Class1	public	false	N/A

-	Operation0		Operation0	package	false	N/A

-		Param0	Param0	public	N/A	in

-		Param1	Param1	public	N/A	out

-		Param2	Param2	public	N/A	return

-	Operation1		Operation1	package	false	

-		Param0	Param0	private	N/A	in

-		Param1	Param1	private	N/A	out

-		Param2	Param2	private	N/A	return

-	Operation2		Operation2	package	false	

-		Param0	Param0	package	N/A	in

-		Param1	Param1	package	N/A	out

-		Param2	Param2	package	N/A	return

+Class0			Class0	public	false	N/A
+	Operation0		Operation0	package	false	N/A
+		Param0	Param0	public	N/A	in
+		Param1	Param1	public	N/A	out
+		Param2	Param2	public	N/A	return
+	Operation1		Operation1	package	false	
+		Param0	Param0	private	N/A	in
+		Param1	Param1	private	N/A	out
+		Param2	Param2	private	N/A	return
+	Operation2		Operation2	package	false	
+		Param0	Param0	package	N/A	in
+		Param1	Param1	package	N/A	out
+		Param2	Param2	package	N/A	return
+Class1			Class1	public	false	N/A
+	Operation0		Operation0	package	false	N/A
+		Param0	Param0	public	N/A	in
+		Param1	Param1	public	N/A	out
+		Param2	Param2	public	N/A	return
+	Operation1		Operation1	package	false	
+		Param0	Param0	private	N/A	in
+		Param1	Param1	private	N/A	out
+		Param2	Param2	private	N/A	return
+	Operation2		Operation2	package	false	
+		Param0	Param0	package	N/A	in
+		Param1	Param1	package	N/A	out
+		Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.notation
index 4b870ff2403..38aa4795ead 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.notation
@@ -1,59 +1,59 @@
-<?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: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: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">

-  <nattable:Table xmi:id="_aUsOoFz_EeSXB5lObuMx0Q" name="ClassTreeTable0" currentRowAxisProvider="_aUsOo1z_EeSXB5lObuMx0Q" currentColumnAxisProvider="_aUsOoVz_EeSXB5lObuMx0Q">

-    <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_3ADggF9oEeSKQchw6MYwwA" displayStyle="HIERARCHIC_MULTI_TREE_COLUMN"/>

-    <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_-d-fMGBbEeSBLv2oi7EXvw" name="hiddenCategoriesByDepth">

-      <intListValue>1</intListValue>

-    </styles>

-    <context xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-    <owner xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_aUsOoVz_EeSXB5lObuMx0Q" 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="_7jkSgF9pEeSKQchw6MYwwA">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.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="_x4JCIF-BEeSiC_8vQsLcmQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_aUsOo1z_EeSXB5lObuMx0Q" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-    <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_ar-hsF96EeS5UN4qxUcpWg" indexStyle="NUMERIC">

-      <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_ar_v0F96EeS5UN4qxUcpWg" name="rowLabelWidth" intValue="397"/>

-    </localRowHeaderAxisConfiguration>

-  </nattable:Table>

-  <nattable:Table xmi:id="_DvW5QGBcEeSBLv2oi7EXvw" name="ClassTreeTable1" currentRowAxisProvider="_DvW5Q2BcEeSBLv2oi7EXvw" currentColumnAxisProvider="_DvW5QWBcEeSBLv2oi7EXvw">

-    <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_FknxwGBcEeSBLv2oi7EXvw" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>

-    <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_o6bowGBcEeSBLv2oi7EXvw" name="hiddenCategoriesByDepth">

-      <intListValue>1</intListValue>

-    </styles>

-    <context xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-    <owner xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_DvW5QWBcEeSBLv2oi7EXvw" 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="_DvW5QmBcEeSBLv2oi7EXvw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_DvW5Q2BcEeSBLv2oi7EXvw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-  </nattable:Table>

-  <nattable:Table xmi:id="_BLq3IGTTEeSdf_74U33iMg" name="ClassTreeTable2" currentRowAxisProvider="_BLq3I2TTEeSdf_74U33iMg" currentColumnAxisProvider="_BLq3IWTTEeSdf_74U33iMg">

-    <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_P7VJgGTTEeSdf_74U33iMg" displayStyle="HIERARCHIC_MULTI_TREE_COLUMN"/>

-    <context xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-    <owner xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>

-    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_BLq3IWTTEeSdf_74U33iMg" 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="_BLq3ImTTEeSdf_74U33iMg">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_BLq3I2TTEeSdf_74U33iMg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-    <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_N_UIwGTTEeSdf_74U33iMg" indexStyle="NUMERIC"/>

-  </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: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: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">
+  <nattable:Table xmi:id="_aUsOoFz_EeSXB5lObuMx0Q" name="ClassTreeTable0" currentRowAxisProvider="_aUsOo1z_EeSXB5lObuMx0Q" currentColumnAxisProvider="_aUsOoVz_EeSXB5lObuMx0Q">
+    <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_3ADggF9oEeSKQchw6MYwwA" displayStyle="HIERARCHIC_MULTI_TREE_COLUMN"/>
+    <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_-d-fMGBbEeSBLv2oi7EXvw" name="hiddenCategoriesByDepth">
+      <intListValue>1</intListValue>
+    </styles>
+    <context xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+    <owner xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_aUsOoVz_EeSXB5lObuMx0Q" 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="_7jkSgF9pEeSKQchw6MYwwA">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.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="_x4JCIF-BEeSiC_8vQsLcmQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_aUsOo1z_EeSXB5lObuMx0Q" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+    <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_ar-hsF96EeS5UN4qxUcpWg" indexStyle="NUMERIC">
+      <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_ar_v0F96EeS5UN4qxUcpWg" name="rowLabelWidth" intValue="397"/>
+    </localRowHeaderAxisConfiguration>
+  </nattable:Table>
+  <nattable:Table xmi:id="_DvW5QGBcEeSBLv2oi7EXvw" name="ClassTreeTable1" currentRowAxisProvider="_DvW5Q2BcEeSBLv2oi7EXvw" currentColumnAxisProvider="_DvW5QWBcEeSBLv2oi7EXvw">
+    <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_FknxwGBcEeSBLv2oi7EXvw" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+    <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_o6bowGBcEeSBLv2oi7EXvw" name="hiddenCategoriesByDepth">
+      <intListValue>1</intListValue>
+    </styles>
+    <context xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+    <owner xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_DvW5QWBcEeSBLv2oi7EXvw" 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="_DvW5QmBcEeSBLv2oi7EXvw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_DvW5Q2BcEeSBLv2oi7EXvw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  </nattable:Table>
+  <nattable:Table xmi:id="_BLq3IGTTEeSdf_74U33iMg" name="ClassTreeTable2" currentRowAxisProvider="_BLq3I2TTEeSdf_74U33iMg" currentColumnAxisProvider="_BLq3IWTTEeSdf_74U33iMg">
+    <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_P7VJgGTTEeSdf_74U33iMg" displayStyle="HIERARCHIC_MULTI_TREE_COLUMN"/>
+    <context xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+    <owner xmi:type="uml:Model" href="tableFillingAndTableExpandTest.uml#_Wn-FQFz_EeSXB5lObuMx0Q"/>
+    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_BLq3IWTTEeSdf_74U33iMg" 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="_BLq3ImTTEeSdf_74U33iMg">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_BLq3I2TTEeSdf_74U33iMg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+    <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_N_UIwGTTEeSdf_74U33iMg" indexStyle="NUMERIC"/>
+  </nattable:Table>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.uml
index 4615f4a0a23..696603331c7 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/tableFillingAndTableExpandTest.uml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Wn-FQFz_EeSXB5lObuMx0Q" name="model">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dzUMcF-CEeSiC_8vQsLcmQ"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_ktkuAFz_EeSXB5lObuMx0Q" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_p8tFUFz_EeSXB5lObuMx0Q" name="Attribute1"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_VJ8yoF0AEeSXB5lObuMx0Q" name="Attribute2"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_XXDPIF57EeSGEoSIn-CQ9A" name="Attribute3"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_oZr90F6IEeSkFutaog6joA" name="Attribute4"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_qi0NgF6IEeSkFutaog6joA" name="Attribute5"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_u_YfoF6tEeSX9eTjVyEyYw" name="Attribute6"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_60blkF6uEeSX9eTjVyEyYw" name="Attribute7"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_RCjl0F95EeS5UN4qxUcpWg" name="Attribute8"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_e_FLEF95EeS5UN4qxUcpWg" name="Attribute9"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_kDQ2oF95EeS5UN4qxUcpWg" name="Attribute10"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_SWCQ0F-CEeSiC_8vQsLcmQ"/>

-    <ownedOperation xmi:type="uml:Operation" xmi:id="_XZqygF0AEeSXB5lObuMx0Q" name="Operation1">

-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Y_LXwF0AEeSXB5lObuMx0Q" name="Parameter1"/>

-    </ownedOperation>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_m6Uc0F6IEeSkFutaog6joA" name="Class1"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_6Gzf0F6IEeSkFutaog6joA" name="Class2"/>

-    <nestedClassifier xmi:type="uml:UseCase" xmi:id="_c1Gq4F6JEeSkFutaog6joA" name="UseCase1"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_sRfWAF6tEeSX9eTjVyEyYw" name="Class3"/>

-    <nestedClassifier xmi:type="uml:Class" xmi:id="_uHgccF6tEeSX9eTjVyEyYw" name="Class4"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_r-4YcFz_EeSXB5lObuMx0Q" name="Class2sdfsdfsdf&#xD;&#xA;sdfsdf&#xD;&#xA;qsdfsdf&#xD;&#xA;"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_VddQQF57EeSGEoSIn-CQ9A" name="Class3"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_u6xpEF6EEeSMz8JhP-zl5g" name="Class4"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_7Lw5kF6EEeSMz8JhP-zl5g" name="Class5"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_OvWYgF6GEeSMz8JhP-zl5g" name="Class6"/>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_XX8rgF-CEeSiC_8vQsLcmQ"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Wn-FQFz_EeSXB5lObuMx0Q" name="model">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dzUMcF-CEeSiC_8vQsLcmQ"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ktkuAFz_EeSXB5lObuMx0Q" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_p8tFUFz_EeSXB5lObuMx0Q" name="Attribute1"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_VJ8yoF0AEeSXB5lObuMx0Q" name="Attribute2"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_XXDPIF57EeSGEoSIn-CQ9A" name="Attribute3"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_oZr90F6IEeSkFutaog6joA" name="Attribute4"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_qi0NgF6IEeSkFutaog6joA" name="Attribute5"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_u_YfoF6tEeSX9eTjVyEyYw" name="Attribute6"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_60blkF6uEeSX9eTjVyEyYw" name="Attribute7"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_RCjl0F95EeS5UN4qxUcpWg" name="Attribute8"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_e_FLEF95EeS5UN4qxUcpWg" name="Attribute9"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_kDQ2oF95EeS5UN4qxUcpWg" name="Attribute10"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_SWCQ0F-CEeSiC_8vQsLcmQ"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_XZqygF0AEeSXB5lObuMx0Q" name="Operation1">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Y_LXwF0AEeSXB5lObuMx0Q" name="Parameter1"/>
+    </ownedOperation>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_m6Uc0F6IEeSkFutaog6joA" name="Class1"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_6Gzf0F6IEeSkFutaog6joA" name="Class2"/>
+    <nestedClassifier xmi:type="uml:UseCase" xmi:id="_c1Gq4F6JEeSkFutaog6joA" name="UseCase1"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_sRfWAF6tEeSX9eTjVyEyYw" name="Class3"/>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_uHgccF6tEeSX9eTjVyEyYw" name="Class4"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_r-4YcFz_EeSXB5lObuMx0Q" name="Class2sdfsdfsdf&#xD;&#xA;sdfsdf&#xD;&#xA;qsdfsdf&#xD;&#xA;"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_VddQQF57EeSGEoSIn-CQ9A" name="Class3"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_u6xpEF6EEeSMz8JhP-zl5g" name="Class4"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_7Lw5kF6EEeSMz8JhP-zl5g" name="Class5"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_OvWYgF6GEeSMz8JhP-zl5g" name="Class6"/>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_XX8rgF-CEeSiC_8vQsLcmQ"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/Activator.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/Activator.java
index f5016e66db2..0d26d393dfb 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/Activator.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/Activator.java
@@ -1,58 +1,58 @@
-package org.eclipse.papyrus.uml.nattable.clazz.config.tests;

-

-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.uml.nattable.clazz.config.tests"; //$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.uml.nattable.clazz.config.tests;
+
+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.uml.nattable.clazz.config.tests"; //$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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/bugs/MoveElementsTreeTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/bugs/MoveElementsTreeTableTest.java
index 6908ae6eda6..0f92a725376 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/bugs/MoveElementsTreeTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/bugs/MoveElementsTreeTableTest.java
@@ -1,680 +1,680 @@
-/*****************************************************************************

- * 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.bugs;

-

-import java.lang.reflect.Field;

-import java.util.ArrayList;

-import java.util.Arrays;

-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.edit.command.MoveCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ViewerDropAdapter;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.TableUtils;

-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.eclipse.papyrus.junit.utils.rules.ShowView;

-import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;

-import org.eclipse.papyrus.views.modelexplorer.CustomCommonViewer;

-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;

-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;

-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.internal.navigator.dnd.NavigatorDnDService;

-import org.eclipse.ui.navigator.CommonDropAdapter;

-import org.eclipse.ui.navigator.CommonDropAdapterAssistant;

-import org.eclipse.ui.navigator.CommonViewer;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * This class allows to test the sort in the Hierarchical NatTable

- */

-@SuppressWarnings("restriction")

-@PluginResource("resources/bugs/bug471903/MoveElementsTreeTableTest.di") //$NON-NLS-1$

-@ShowView(value = "org.eclipse.papyrus.views.modelexplorer.modelexplorer") //$NON-NLS-1$

-public class MoveElementsTreeTableTest extends AbstractPapyrusTest {

-

-	/**

-	 * The first class name in the model.

-	 */

-	private static final String FIRST_CLASS = "Class1"; //$NON-NLS-1$

-

-	/**

-	 * The second class name in the model.

-	 */

-	private static final String SECOND_CLASS = "Class2"; //$NON-NLS-1$

-

-	/**

-	 * The third class name in the model.

-	 */

-	private static final String THIRD_CLASS = "Class3"; //$NON-NLS-1$

-

-	/**

-	 * The fourth class name in the model.

-	 */

-	private static final String FOURTH_CLASS = "Class4"; //$NON-NLS-1$

-

-	/**

-	 * The first package name in the model.

-	 */

-	private static final String FIRST_PACKAGE = "Package1"; //$NON-NLS-1$

-

-	/**

-	 * The table name.

-	 */

-	private static final String TABLE_NAME = "GenericTreeTable0"; //$NON-NLS-1$

-

-	/**

-	 * The papyrus fixture.

-	 */

-	@Rule

-	public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();

-

-	/**

-	 * The current model.

-	 */

-	public Model model = null;

-

-	/**

-	 * The model explorer part.

-	 */

-	public IViewPart modelExplorerPart = null;

-

-	/**

-	 * The model explorer view.

-	 */

-	public ModelExplorerView modelExplorerView = null;

-	

-	/**

-	 * The nattable model manager.

-	 */

-	public INattableModelManager currentManager = null;

-

-	/**

-	 * Constructor.

-	 */

-	public MoveElementsTreeTableTest() {

-		super();

-	}

-

-	/**

-	 * Initialize.

-	 */

-	@Before

-	public void init() {

-		// Get the model

-		model = (Model) fixture.getModel();

-		Assert.assertNotNull("RootModel is null", model); //$NON-NLS-1$

-

-		// Get the table and open it

-		Table mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);

-		fixture.getPageManager().openPage(mainTable);

-		fixture.flushDisplayEvents();

-

-		// Get the model explorer part and view

-		IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();

-		modelExplorerPart = activeWorkbenchWindow.getActivePage().findView(ModelExplorerPageBookView.VIEW_ID); // $NON-NLS-1$

-		Assert.assertNotNull("The ModelExplorer view is not open", modelExplorerPart); //$NON-NLS-1$

-		Assert.assertTrue("The ModelExplorer is not a common navigator", modelExplorerPart instanceof ModelExplorerPageBookView); //$NON-NLS-1$

-		modelExplorerView = (ModelExplorerView) ((ModelExplorerPageBookView) modelExplorerPart).getActiveView();

-		Assert.assertNotNull("The model explorer view cannot be null", modelExplorerView); //$NON-NLS-1$

-		

-		// Get the table and its manager

-		final IPageManager pageManager = fixture.getPageManager();

-		final List<Object> pages = pageManager.allPages();

-		pageManager.openPage(pages.get(0));

-		final IEditorPart part = fixture.getEditor().getActiveEditor();

-		Assert.assertTrue(part instanceof NatTableEditor);

-		final NatTableEditor editor = (NatTableEditor) part;

-		currentManager = (INattableModelManager) editor.getAdapter(INattableModelManager.class);

-		Assert.assertTrue("The table manage must be a tree table manager", currentManager instanceof TreeNattableModelManager); //$NON-NLS-1$

-

-		// Expand the table

-		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);

-	}

-

-	/**

-	 * This allows to test the move in the same parent.

-	 * 

-	 * @throws Exception

-	 *             The exception

-	 */

-	@Test

-	public void testSimpleMoveSameParent() throws Exception {

-		// Check the initial table content

-		checkInitialTable(currentManager.getRowElementsList());

-

-		// Get the editing domain

-		TransactionalEditingDomain editingDomain = fixture.getEditingDomain();

-		Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$

-

-		// Get the first class

-		final EObject firstClass = model.getPackagedElement(FIRST_CLASS);

-

-		// Create the move command

-		Command moveCommand = MoveCommand.create(editingDomain, model, UMLPackage.eINSTANCE.getPackage_PackagedElement(), firstClass, 4);

-

-		// Execute the command

-		editingDomain.getCommandStack().execute(moveCommand);

-		fixture.flushDisplayEvents();

-

-		// Check the table content

-		checkSimpleMoveSameParentTable(currentManager.getRowElementsList());

-

-		// Undo the command

-		editingDomain.getCommandStack().undo();

-		fixture.flushDisplayEvents();

-

-		// check the table content

-		checkInitialTable(currentManager.getRowElementsList());

-

-		// Redo the command

-		editingDomain.getCommandStack().redo();

-		fixture.flushDisplayEvents();

-

-		// Check the table content

-		checkSimpleMoveSameParentTable(currentManager.getRowElementsList());

-	}

-	

-	/**

-	 * This allows to test the move in the same parent.

-	 * 

-	 * @throws Exception

-	 *             The exception

-	 */

-	@Test

-	public void testMultipleMoveSameParent() throws Exception {

-		// Check the initial table content

-		checkInitialTable(currentManager.getRowElementsList());

-

-		// Get the editing domain

-		TransactionalEditingDomain editingDomain = fixture.getEditingDomain();

-		Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$

-

-		// Get the first class

-		final EObject firstClass = model.getPackagedElement(FIRST_CLASS);

-		final EObject secondClass = model.getPackagedElement(SECOND_CLASS);

-

-		// Create the move command

-		final CompoundCommand multipleMoveCommand = new CompoundCommand();

-		multipleMoveCommand.append(MoveCommand.create(editingDomain, model, UMLPackage.eINSTANCE.getPackage_PackagedElement(), firstClass, 4));

-		multipleMoveCommand.append(MoveCommand.create(editingDomain, model, UMLPackage.eINSTANCE.getPackage_PackagedElement(), secondClass, 4));

-

-		// Execute the command

-		editingDomain.getCommandStack().execute(multipleMoveCommand);

-		fixture.flushDisplayEvents();

-

-		// Check the table content

-		checkMultipleMoveSameParentTable(currentManager.getRowElementsList());

-

-		// Undo the command

-		editingDomain.getCommandStack().undo();

-		fixture.flushDisplayEvents();

-

-		// check the table content

-		checkInitialTable(currentManager.getRowElementsList());

-

-		// Redo the command

-		editingDomain.getCommandStack().redo();

-		fixture.flushDisplayEvents();

-

-		// Check the table content

-		checkMultipleMoveSameParentTable(currentManager.getRowElementsList());

-	}

-

-	/**

-	 * This allows to test the move in a sub element of its current parent.

-	 * 

-	 * @throws Exception

-	 *             The exception

-	 */

-	@Test

-	public void testSimpleMoveSubElementParent() throws Exception {

-		// Check the initial table content

-		checkInitialTable(currentManager.getRowElementsList());

-

-		// Get the editing domain

-		TransactionalEditingDomain editingDomain = fixture.getEditingDomain();

-		Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$

-

-		// Get the first class

-		final EObject firstClass = model.getPackagedElement(FIRST_CLASS);

-		final EObject firstPackage = model.getPackagedElement(FIRST_PACKAGE);

-

-		// Get the move command

-		final Command moveCommand = getDropElementsCommand(Arrays.asList(firstClass), firstPackage);

-

-		// Execute the command

-		editingDomain.getCommandStack().execute(moveCommand);

-		fixture.flushDisplayEvents();

-		// Expand the table

-		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);

-		fixture.flushDisplayEvents();

-

-		// Check the table content

-		checkSimpleMoveSubElementsParentTable(currentManager.getRowElementsList());

-

-		// Undo the command

-		editingDomain.getCommandStack().undo();

-		fixture.flushDisplayEvents();

-

-		// check the table content

-		checkInitialTable(currentManager.getRowElementsList());

-

-		// Redo the command

-		editingDomain.getCommandStack().redo();

-		fixture.flushDisplayEvents();

-		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);

-		fixture.flushDisplayEvents();

-

-		// Check the table content

-		checkSimpleMoveSubElementsParentTable(currentManager.getRowElementsList());

-	}

-	

-	/**

-	 * This allows to test the move in a sub element of its current parent.

-	 * 

-	 * @throws Exception

-	 *             The exception

-	 */

-	@Test

-	public void testMultipleMoveSubElementParent() throws Exception {

-		// Check the initial table content

-		checkInitialTable(currentManager.getRowElementsList());

-

-		// Get the editing domain

-		TransactionalEditingDomain editingDomain = fixture.getEditingDomain();

-		Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$

-

-		// Get the first class

-		final EObject firstClass = model.getPackagedElement(FIRST_CLASS);

-		final EObject secondClass = model.getPackagedElement(SECOND_CLASS);

-		final EObject firstPackage = model.getPackagedElement(FIRST_PACKAGE);

-

-		// Get the move command

-		final List<EObject> classes = new ArrayList<EObject>(2);

-		classes.add(firstClass);

-		classes.add(secondClass);

-		final Command moveCommand = getDropElementsCommand(classes, firstPackage);

-

-		// Execute the command

-		editingDomain.getCommandStack().execute(moveCommand);

-		fixture.flushDisplayEvents();

-		// Expand the table

-		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);

-		fixture.flushDisplayEvents();

-

-		// Check the table content

-		checkMultipleMoveSubElementsParentTable(currentManager.getRowElementsList());

-

-		// Undo the command

-		editingDomain.getCommandStack().undo();

-		fixture.flushDisplayEvents();

-

-		// check the table content

-		checkInitialTable(currentManager.getRowElementsList());

-

-		// Redo the command

-		editingDomain.getCommandStack().redo();

-		fixture.flushDisplayEvents();

-		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);

-		fixture.flushDisplayEvents();

-

-		// Check the table content

-		checkMultipleMoveSubElementsParentTable(currentManager.getRowElementsList());

-	}

-	

-	/**

-	 * Get the drop elements command from sources Elements to a target element.

-	 * 

-	 * @param sourceElements

-	 *            The source elements to drag and drop.

-	 * @param targetElement

-	 *            The target element where drop the source elements.

-	 * @return The command corresponding to the drag and drop.

-	 * @throws Exception

-	 *             The exception.

-	 */

-	public Command getDropElementsCommand(final List<EObject> sourceElements, final EObject targetElement) throws Exception {

-		Command command = UnexecutableCommand.INSTANCE;

-

-		// Create the target element and select and reveal the first class

-		Object target = findSemanticModelElementItem(targetElement);

-		selectAndReveal(sourceElements);

-		fixture.flushDisplayEvents();

-

-		// Get the DnD service

-		final CommonViewer viewer = modelExplorerView.getCommonViewer();

-		NavigatorDnDService dndService = (NavigatorDnDService) viewer.getNavigatorContentService().getDnDService();

-		Assert.assertNotNull("Impossible to find dnd service", dndService); //$NON-NLS-1$

-

-		// Manage the drop gtom the papyris drop assistant

-		CommonDropAdapter commonDropAdapter = ((CustomCommonViewer) modelExplorerView.getCommonViewer()).getDropAdapter();

-		CommonDropAdapterAssistant[] commonDropAdapterAssistants = dndService.findCommonDropAdapterAssistants(target, (IStructuredSelection) viewer.getSelection());

-		for (CommonDropAdapterAssistant assistant : commonDropAdapterAssistants) {

-			// try to adapt to a Papyrus drop assistant. If not, send a warning

-			if (assistant instanceof org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant) {

-				org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant papyrusAssistant = (org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant) assistant;

-				Field currentOperationField = ViewerDropAdapter.class.getDeclaredField("currentOperation"); //$NON-NLS-1$

-				Assert.assertNotNull(currentOperationField);

-				currentOperationField.setAccessible(true);

-				currentOperationField.set(commonDropAdapter, DND.DROP_MOVE);

-				Field currentLocationField = ViewerDropAdapter.class.getDeclaredField("currentLocation"); //$NON-NLS-1$

-				Assert.assertNotNull(currentLocationField);

-				currentLocationField.setAccessible(true);

-				currentLocationField.set(commonDropAdapter, ViewerDropAdapter.LOCATION_ON);

-				LocalSelectionTransfer.getTransfer().setSelection(modelExplorerView.getCommonViewer().getSelection());

-				command = papyrusAssistant.getDrop(target);

-			}

-		}

-

-		return command;

-	}

-

-	/**

-	 * Retrieves the Model Element Item for the given EObject

-	 *

-	 * @param objectToFind

-	 *            object represented by the searched item

-	 * @return the {@link ModelElementItem} that corresponds to the diagram

-	 * @throws Exception

-	 *             exception thrown in case of issue

-	 */

-	protected EObjectTreeElement findSemanticModelElementItem(final EObject objectToFind) throws Exception {

-		selectAndReveal(Arrays.asList(objectToFind));

-		IStructuredSelection selection = (IStructuredSelection) modelExplorerPart.getSite().getSelectionProvider().getSelection();

-		Assert.assertEquals("One and only one object should be selected", 1, selection.size()); //$NON-NLS-1$

-		Object selectedElement = selection.getFirstElement();

-		Assert.assertTrue("Selection should be a model item element", selectedElement instanceof EObjectTreeElement); //$NON-NLS-1$

-		Assert.assertTrue("Selection should be linked to a EObject", ((EObjectTreeElement) selectedElement).getEObject() instanceof EObject); //$NON-NLS-1$

-		Assert.assertTrue("Selection should be linked to the Object: " + objectToFind, ((EObjectTreeElement) selectedElement).getEObject().equals(objectToFind)); //$NON-NLS-1$

-		return (EObjectTreeElement) selectedElement;

-	}

-

-	/**

-	 * Selects and reveal the specified list of elements

-	 *

-	 * @param newElements

-	 *            the list of objects to select

-	 * @throws Exception

-	 *             exception thrown in case element could not be selected

-	 */

-	protected static void selectAndReveal(final List<EObject> newElements) throws Exception {

-		Display.getDefault().syncExec(new Runnable() {

-

-			public void run() {

-				try {

-					// Retrieve model explorer

-					ModelExplorerView modelExplorerView = null;

-

-					ModelExplorerPageBookView bookViewPart = (ModelExplorerPageBookView) NavigatorUtils.findViewPart(ModelExplorerPageBookView.VIEW_ID);

-					if (bookViewPart != null) {

-						modelExplorerView = (ModelExplorerView) bookViewPart.getActiveView();

-					}

-

-					// Set selection on new element in the model explorer

-					if ((modelExplorerView != null) && (newElements != null)) {

-						List<EObject> semanticElementList = new ArrayList<EObject>();

-						semanticElementList.addAll(newElements);

-						modelExplorerView.revealSemanticElement(semanticElementList);

-					} else {

-						throw new Exception("Impossible to find the model explorer required to select: " + newElements); //$NON-NLS-1$

-					}

-				} catch (Exception ex) {

-					Activator.log.error(ex);

-				}

-			}

-		});

-	}

-

-	/**

-	 * Check the initial table content display.

-	 * 

-	 * @param rowElements

-	 *            the row elements

-	 * @throws Exception

-	 *             The exception

-	 */

-	private void checkInitialTable(final List<?> rowElements) throws Exception {

-		Assert.assertEquals("The initial table does not contains the correct number of rows", 6, rowElements.size()); //$NON-NLS-1$

-

-		final IAxis firstRow = (IAxis) rowElements.get(0);

-		final Object firstRowRepresentedElement = firstRow.getElement();

-		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$

-		

-		final IAxis secondRow = (IAxis) rowElements.get(1);

-		final Object secondRowRepresentedElement = secondRow.getElement();

-		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the first element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis thirdRow = (IAxis) rowElements.get(2);

-		final Object thirdRowRepresentedElement = thirdRow.getElement();

-		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the second element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis fourthRow = (IAxis) rowElements.get(3);

-		final Object fourthRowRepresentedElement = fourthRow.getElement();

-		Assert.assertEquals("The third element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the third element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) fourthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis fifthRow = (IAxis) rowElements.get(4);

-		final Object fifthRowRepresentedElement = fifthRow.getElement();

-		Assert.assertEquals("The fourth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fourth element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) fifthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis sixthRow = (IAxis) rowElements.get(5);

-		final Object sixthColumnRepresentedElement = sixthRow.getElement();

-		Assert.assertEquals("The fifth element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) sixthColumnRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fifth element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) sixthColumnRepresentedElement).getName()); //$NON-NLS-1$

-	}

-

-	/**

-	 * Check the initial table content display.

-	 * 

-	 * @param rowElements

-	 *            the row elements

-	 * @throws Exception

-	 *             The exception

-	 */

-	private void checkSimpleMoveSameParentTable(final List<?> rowElements) throws Exception {

-		Assert.assertEquals("The initial table does not contains the correct number of rows", 6, rowElements.size()); //$NON-NLS-1$

-

-		final IAxis firstRow = (IAxis) rowElements.get(0);

-		final Object firstRowRepresentedElement = firstRow.getElement();

-		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$

-		

-		final IAxis secondRow = (IAxis) rowElements.get(1);

-		final Object secondRowRepresentedElement = secondRow.getElement();

-		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the first element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis thirdRow = (IAxis) rowElements.get(2);

-		final Object thirdRowRepresentedElement = thirdRow.getElement();

-		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the second element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis fourthRow = (IAxis) rowElements.get(3);

-		final Object fourthRowRepresentedElement = fourthRow.getElement();

-		Assert.assertEquals("The third element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the third element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) fourthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis fifthRow = (IAxis) rowElements.get(4);

-		final Object fifthRowRepresentedElement = fifthRow.getElement();

-		Assert.assertEquals("The fourth element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fourth element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) fifthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis sixthRow = (IAxis) rowElements.get(5);

-		final Object sixthColumnRepresentedElement = sixthRow.getElement();

-		Assert.assertEquals("The fifth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) sixthColumnRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fifth element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) sixthColumnRepresentedElement).getName()); //$NON-NLS-1$

-	}

-	

-	/**

-	 * Check the initial table content display.

-	 * 

-	 * @param rowElements

-	 *            the row elements

-	 * @throws Exception

-	 *             The exception

-	 */

-	private void checkMultipleMoveSameParentTable(final List<?> rowElements) throws Exception {

-		Assert.assertEquals("The initial table does not contains the correct number of rows", 6, rowElements.size()); //$NON-NLS-1$

-

-		final IAxis firstRow = (IAxis) rowElements.get(0);

-		final Object firstRowRepresentedElement = firstRow.getElement();

-		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$

-		

-		final IAxis secondRow = (IAxis) rowElements.get(1);

-		final Object secondRowRepresentedElement = secondRow.getElement();

-		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the first element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis thirdRow = (IAxis) rowElements.get(2);

-		final Object thirdRowRepresentedElement = thirdRow.getElement();

-		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the second element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis fourthRow = (IAxis) rowElements.get(3);

-		final Object fourthRowRepresentedElement = fourthRow.getElement();

-		Assert.assertEquals("The third element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the third element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) fourthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis fifthRow = (IAxis) rowElements.get(4);

-		final Object fifthRowRepresentedElement = fifthRow.getElement();

-		Assert.assertEquals("The fourth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fourth element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) fifthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis sixthRow = (IAxis) rowElements.get(5);

-		final Object sixthColumnRepresentedElement = sixthRow.getElement();

-		Assert.assertEquals("The fifth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) sixthColumnRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fifth element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) sixthColumnRepresentedElement).getName()); //$NON-NLS-1$

-	}

-

-	/**

-	 * Check the initial table content display.

-	 * 

-	 * @param rowElements

-	 *            the row elements

-	 * @throws Exception

-	 *             The exception

-	 */

-	private void checkSimpleMoveSubElementsParentTable(final List<?> rowElements) throws Exception {

-		Assert.assertEquals("The initial table does not contains the correct number of rows", 7, rowElements.size()); //$NON-NLS-1$

-

-		final IAxis firstRow = (IAxis) rowElements.get(0);

-		final Object firstRowRepresentedElement = firstRow.getElement();

-		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$

-		

-		final IAxis secondRow = (IAxis) rowElements.get(1);

-		final Object secondRowRepresentedElement = secondRow.getElement();

-		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the first element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis thirdRow = (IAxis) rowElements.get(2);

-		final Object thirdRowRepresentedElement = thirdRow.getElement();

-		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the second element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis fourthRow = (IAxis) rowElements.get(3);

-		final Object fourthRowRepresentedElement = fourthRow.getElement();

-		Assert.assertEquals("The third element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the third element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) fourthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis fifthRow = (IAxis) rowElements.get(4);

-		final Object fifthRowRepresentedElement = fifthRow.getElement();

-		Assert.assertEquals("The fourth element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fourth element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) fifthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis sixthRow = (IAxis) rowElements.get(5);

-		final Object sixthRowRepresentedElement = sixthRow.getElement();

-		Assert.assertTrue("The sixth row must be a tree filling configuration", sixthRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$

-		

-		final IAxis seventhRow = (IAxis) rowElements.get(6);

-		final Object seventhColumnRepresentedElement = seventhRow.getElement();

-		Assert.assertEquals("The fifth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) seventhColumnRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fifth element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) seventhColumnRepresentedElement).getName()); //$NON-NLS-1$

-	}

-

-	/**

-	 * Check the initial table content display.

-	 * 

-	 * @param rowElements

-	 *            the row elements

-	 * @throws Exception

-	 *             The exception

-	 */

-	private void checkMultipleMoveSubElementsParentTable(final List<?> rowElements) throws Exception {

-		Assert.assertEquals("The initial table does not contains the correct number of rows", 7, rowElements.size()); //$NON-NLS-1$

-

-		final IAxis firstRow = (IAxis) rowElements.get(0);

-		final Object firstRowRepresentedElement = firstRow.getElement();

-		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$

-		

-		final IAxis secondRow = (IAxis) rowElements.get(1);

-		final Object secondRowRepresentedElement = secondRow.getElement();

-		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the first element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis thirdRow = (IAxis) rowElements.get(2);

-		final Object thirdRowRepresentedElement = thirdRow.getElement();

-		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the second element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis fourthRow = (IAxis) rowElements.get(3);

-		final Object fourthRowRepresentedElement = fourthRow.getElement();

-		Assert.assertEquals("The third element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the third element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) fourthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis sixthRow = (IAxis) rowElements.get(4);

-		final Object sixthRowRepresentedElement = sixthRow.getElement();

-		Assert.assertTrue("The sixth row must be a tree filling configuration", sixthRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$

-		

-		final IAxis fifthRow = (IAxis) rowElements.get(5);

-		final Object fifthRowRepresentedElement = fifthRow.getElement();

-		Assert.assertEquals("The fourth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fourth element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) fifthRowRepresentedElement).getName()); //$NON-NLS-1$

-

-		final IAxis seventhRow = (IAxis) rowElements.get(6);

-		final Object seventhColumnRepresentedElement = seventhRow.getElement();

-		Assert.assertEquals("The fifth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) seventhColumnRepresentedElement).eClass()); //$NON-NLS-1$

-		Assert.assertEquals("The name of the fifth element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) seventhColumnRepresentedElement).getName()); //$NON-NLS-1$

-	}

-	

-}

+/*****************************************************************************
+ * 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.bugs;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+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.edit.command.MoveCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ViewerDropAdapter;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.TableUtils;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.junit.utils.rules.ShowView;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;
+import org.eclipse.papyrus.views.modelexplorer.CustomCommonViewer;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
+import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.internal.navigator.dnd.NavigatorDnDService;
+import org.eclipse.ui.navigator.CommonDropAdapter;
+import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
+import org.eclipse.ui.navigator.CommonViewer;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * This class allows to test the sort in the Hierarchical NatTable
+ */
+@SuppressWarnings("restriction")
+@PluginResource("resources/bugs/bug471903/MoveElementsTreeTableTest.di") //$NON-NLS-1$
+@ShowView(value = "org.eclipse.papyrus.views.modelexplorer.modelexplorer") //$NON-NLS-1$
+public class MoveElementsTreeTableTest extends AbstractPapyrusTest {
+
+	/**
+	 * The first class name in the model.
+	 */
+	private static final String FIRST_CLASS = "Class1"; //$NON-NLS-1$
+
+	/**
+	 * The second class name in the model.
+	 */
+	private static final String SECOND_CLASS = "Class2"; //$NON-NLS-1$
+
+	/**
+	 * The third class name in the model.
+	 */
+	private static final String THIRD_CLASS = "Class3"; //$NON-NLS-1$
+
+	/**
+	 * The fourth class name in the model.
+	 */
+	private static final String FOURTH_CLASS = "Class4"; //$NON-NLS-1$
+
+	/**
+	 * The first package name in the model.
+	 */
+	private static final String FIRST_PACKAGE = "Package1"; //$NON-NLS-1$
+
+	/**
+	 * The table name.
+	 */
+	private static final String TABLE_NAME = "GenericTreeTable0"; //$NON-NLS-1$
+
+	/**
+	 * The papyrus fixture.
+	 */
+	@Rule
+	public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
+
+	/**
+	 * The current model.
+	 */
+	public Model model = null;
+
+	/**
+	 * The model explorer part.
+	 */
+	public IViewPart modelExplorerPart = null;
+
+	/**
+	 * The model explorer view.
+	 */
+	public ModelExplorerView modelExplorerView = null;
+	
+	/**
+	 * The nattable model manager.
+	 */
+	public INattableModelManager currentManager = null;
+
+	/**
+	 * Constructor.
+	 */
+	public MoveElementsTreeTableTest() {
+		super();
+	}
+
+	/**
+	 * Initialize.
+	 */
+	@Before
+	public void init() {
+		// Get the model
+		model = (Model) fixture.getModel();
+		Assert.assertNotNull("RootModel is null", model); //$NON-NLS-1$
+
+		// Get the table and open it
+		Table mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
+		fixture.getPageManager().openPage(mainTable);
+		fixture.flushDisplayEvents();
+
+		// Get the model explorer part and view
+		IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		modelExplorerPart = activeWorkbenchWindow.getActivePage().findView(ModelExplorerPageBookView.VIEW_ID); // $NON-NLS-1$
+		Assert.assertNotNull("The ModelExplorer view is not open", modelExplorerPart); //$NON-NLS-1$
+		Assert.assertTrue("The ModelExplorer is not a common navigator", modelExplorerPart instanceof ModelExplorerPageBookView); //$NON-NLS-1$
+		modelExplorerView = (ModelExplorerView) ((ModelExplorerPageBookView) modelExplorerPart).getActiveView();
+		Assert.assertNotNull("The model explorer view cannot be null", modelExplorerView); //$NON-NLS-1$
+		
+		// Get the table and its manager
+		final IPageManager pageManager = fixture.getPageManager();
+		final List<Object> pages = pageManager.allPages();
+		pageManager.openPage(pages.get(0));
+		final IEditorPart part = fixture.getEditor().getActiveEditor();
+		Assert.assertTrue(part instanceof NatTableEditor);
+		final NatTableEditor editor = (NatTableEditor) part;
+		currentManager = (INattableModelManager) editor.getAdapter(INattableModelManager.class);
+		Assert.assertTrue("The table manage must be a tree table manager", currentManager instanceof TreeNattableModelManager); //$NON-NLS-1$
+
+		// Expand the table
+		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
+	}
+
+	/**
+	 * This allows to test the move in the same parent.
+	 * 
+	 * @throws Exception
+	 *             The exception
+	 */
+	@Test
+	public void testSimpleMoveSameParent() throws Exception {
+		// Check the initial table content
+		checkInitialTable(currentManager.getRowElementsList());
+
+		// Get the editing domain
+		TransactionalEditingDomain editingDomain = fixture.getEditingDomain();
+		Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$
+
+		// Get the first class
+		final EObject firstClass = model.getPackagedElement(FIRST_CLASS);
+
+		// Create the move command
+		Command moveCommand = MoveCommand.create(editingDomain, model, UMLPackage.eINSTANCE.getPackage_PackagedElement(), firstClass, 4);
+
+		// Execute the command
+		editingDomain.getCommandStack().execute(moveCommand);
+		fixture.flushDisplayEvents();
+
+		// Check the table content
+		checkSimpleMoveSameParentTable(currentManager.getRowElementsList());
+
+		// Undo the command
+		editingDomain.getCommandStack().undo();
+		fixture.flushDisplayEvents();
+
+		// check the table content
+		checkInitialTable(currentManager.getRowElementsList());
+
+		// Redo the command
+		editingDomain.getCommandStack().redo();
+		fixture.flushDisplayEvents();
+
+		// Check the table content
+		checkSimpleMoveSameParentTable(currentManager.getRowElementsList());
+	}
+	
+	/**
+	 * This allows to test the move in the same parent.
+	 * 
+	 * @throws Exception
+	 *             The exception
+	 */
+	@Test
+	public void testMultipleMoveSameParent() throws Exception {
+		// Check the initial table content
+		checkInitialTable(currentManager.getRowElementsList());
+
+		// Get the editing domain
+		TransactionalEditingDomain editingDomain = fixture.getEditingDomain();
+		Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$
+
+		// Get the first class
+		final EObject firstClass = model.getPackagedElement(FIRST_CLASS);
+		final EObject secondClass = model.getPackagedElement(SECOND_CLASS);
+
+		// Create the move command
+		final CompoundCommand multipleMoveCommand = new CompoundCommand();
+		multipleMoveCommand.append(MoveCommand.create(editingDomain, model, UMLPackage.eINSTANCE.getPackage_PackagedElement(), firstClass, 4));
+		multipleMoveCommand.append(MoveCommand.create(editingDomain, model, UMLPackage.eINSTANCE.getPackage_PackagedElement(), secondClass, 4));
+
+		// Execute the command
+		editingDomain.getCommandStack().execute(multipleMoveCommand);
+		fixture.flushDisplayEvents();
+
+		// Check the table content
+		checkMultipleMoveSameParentTable(currentManager.getRowElementsList());
+
+		// Undo the command
+		editingDomain.getCommandStack().undo();
+		fixture.flushDisplayEvents();
+
+		// check the table content
+		checkInitialTable(currentManager.getRowElementsList());
+
+		// Redo the command
+		editingDomain.getCommandStack().redo();
+		fixture.flushDisplayEvents();
+
+		// Check the table content
+		checkMultipleMoveSameParentTable(currentManager.getRowElementsList());
+	}
+
+	/**
+	 * This allows to test the move in a sub element of its current parent.
+	 * 
+	 * @throws Exception
+	 *             The exception
+	 */
+	@Test
+	public void testSimpleMoveSubElementParent() throws Exception {
+		// Check the initial table content
+		checkInitialTable(currentManager.getRowElementsList());
+
+		// Get the editing domain
+		TransactionalEditingDomain editingDomain = fixture.getEditingDomain();
+		Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$
+
+		// Get the first class
+		final EObject firstClass = model.getPackagedElement(FIRST_CLASS);
+		final EObject firstPackage = model.getPackagedElement(FIRST_PACKAGE);
+
+		// Get the move command
+		final Command moveCommand = getDropElementsCommand(Arrays.asList(firstClass), firstPackage);
+
+		// Execute the command
+		editingDomain.getCommandStack().execute(moveCommand);
+		fixture.flushDisplayEvents();
+		// Expand the table
+		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
+		fixture.flushDisplayEvents();
+
+		// Check the table content
+		checkSimpleMoveSubElementsParentTable(currentManager.getRowElementsList());
+
+		// Undo the command
+		editingDomain.getCommandStack().undo();
+		fixture.flushDisplayEvents();
+
+		// check the table content
+		checkInitialTable(currentManager.getRowElementsList());
+
+		// Redo the command
+		editingDomain.getCommandStack().redo();
+		fixture.flushDisplayEvents();
+		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
+		fixture.flushDisplayEvents();
+
+		// Check the table content
+		checkSimpleMoveSubElementsParentTable(currentManager.getRowElementsList());
+	}
+	
+	/**
+	 * This allows to test the move in a sub element of its current parent.
+	 * 
+	 * @throws Exception
+	 *             The exception
+	 */
+	@Test
+	public void testMultipleMoveSubElementParent() throws Exception {
+		// Check the initial table content
+		checkInitialTable(currentManager.getRowElementsList());
+
+		// Get the editing domain
+		TransactionalEditingDomain editingDomain = fixture.getEditingDomain();
+		Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$
+
+		// Get the first class
+		final EObject firstClass = model.getPackagedElement(FIRST_CLASS);
+		final EObject secondClass = model.getPackagedElement(SECOND_CLASS);
+		final EObject firstPackage = model.getPackagedElement(FIRST_PACKAGE);
+
+		// Get the move command
+		final List<EObject> classes = new ArrayList<EObject>(2);
+		classes.add(firstClass);
+		classes.add(secondClass);
+		final Command moveCommand = getDropElementsCommand(classes, firstPackage);
+
+		// Execute the command
+		editingDomain.getCommandStack().execute(moveCommand);
+		fixture.flushDisplayEvents();
+		// Expand the table
+		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
+		fixture.flushDisplayEvents();
+
+		// Check the table content
+		checkMultipleMoveSubElementsParentTable(currentManager.getRowElementsList());
+
+		// Undo the command
+		editingDomain.getCommandStack().undo();
+		fixture.flushDisplayEvents();
+
+		// check the table content
+		checkInitialTable(currentManager.getRowElementsList());
+
+		// Redo the command
+		editingDomain.getCommandStack().redo();
+		fixture.flushDisplayEvents();
+		((TreeNattableModelManager) currentManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
+		fixture.flushDisplayEvents();
+
+		// Check the table content
+		checkMultipleMoveSubElementsParentTable(currentManager.getRowElementsList());
+	}
+	
+	/**
+	 * Get the drop elements command from sources Elements to a target element.
+	 * 
+	 * @param sourceElements
+	 *            The source elements to drag and drop.
+	 * @param targetElement
+	 *            The target element where drop the source elements.
+	 * @return The command corresponding to the drag and drop.
+	 * @throws Exception
+	 *             The exception.
+	 */
+	public Command getDropElementsCommand(final List<EObject> sourceElements, final EObject targetElement) throws Exception {
+		Command command = UnexecutableCommand.INSTANCE;
+
+		// Create the target element and select and reveal the first class
+		Object target = findSemanticModelElementItem(targetElement);
+		selectAndReveal(sourceElements);
+		fixture.flushDisplayEvents();
+
+		// Get the DnD service
+		final CommonViewer viewer = modelExplorerView.getCommonViewer();
+		NavigatorDnDService dndService = (NavigatorDnDService) viewer.getNavigatorContentService().getDnDService();
+		Assert.assertNotNull("Impossible to find dnd service", dndService); //$NON-NLS-1$
+
+		// Manage the drop gtom the papyris drop assistant
+		CommonDropAdapter commonDropAdapter = ((CustomCommonViewer) modelExplorerView.getCommonViewer()).getDropAdapter();
+		CommonDropAdapterAssistant[] commonDropAdapterAssistants = dndService.findCommonDropAdapterAssistants(target, (IStructuredSelection) viewer.getSelection());
+		for (CommonDropAdapterAssistant assistant : commonDropAdapterAssistants) {
+			// try to adapt to a Papyrus drop assistant. If not, send a warning
+			if (assistant instanceof org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant) {
+				org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant papyrusAssistant = (org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant) assistant;
+				Field currentOperationField = ViewerDropAdapter.class.getDeclaredField("currentOperation"); //$NON-NLS-1$
+				Assert.assertNotNull(currentOperationField);
+				currentOperationField.setAccessible(true);
+				currentOperationField.set(commonDropAdapter, DND.DROP_MOVE);
+				Field currentLocationField = ViewerDropAdapter.class.getDeclaredField("currentLocation"); //$NON-NLS-1$
+				Assert.assertNotNull(currentLocationField);
+				currentLocationField.setAccessible(true);
+				currentLocationField.set(commonDropAdapter, ViewerDropAdapter.LOCATION_ON);
+				LocalSelectionTransfer.getTransfer().setSelection(modelExplorerView.getCommonViewer().getSelection());
+				command = papyrusAssistant.getDrop(target);
+			}
+		}
+
+		return command;
+	}
+
+	/**
+	 * Retrieves the Model Element Item for the given EObject
+	 *
+	 * @param objectToFind
+	 *            object represented by the searched item
+	 * @return the {@link ModelElementItem} that corresponds to the diagram
+	 * @throws Exception
+	 *             exception thrown in case of issue
+	 */
+	protected EObjectTreeElement findSemanticModelElementItem(final EObject objectToFind) throws Exception {
+		selectAndReveal(Arrays.asList(objectToFind));
+		IStructuredSelection selection = (IStructuredSelection) modelExplorerPart.getSite().getSelectionProvider().getSelection();
+		Assert.assertEquals("One and only one object should be selected", 1, selection.size()); //$NON-NLS-1$
+		Object selectedElement = selection.getFirstElement();
+		Assert.assertTrue("Selection should be a model item element", selectedElement instanceof EObjectTreeElement); //$NON-NLS-1$
+		Assert.assertTrue("Selection should be linked to a EObject", ((EObjectTreeElement) selectedElement).getEObject() instanceof EObject); //$NON-NLS-1$
+		Assert.assertTrue("Selection should be linked to the Object: " + objectToFind, ((EObjectTreeElement) selectedElement).getEObject().equals(objectToFind)); //$NON-NLS-1$
+		return (EObjectTreeElement) selectedElement;
+	}
+
+	/**
+	 * Selects and reveal the specified list of elements
+	 *
+	 * @param newElements
+	 *            the list of objects to select
+	 * @throws Exception
+	 *             exception thrown in case element could not be selected
+	 */
+	protected static void selectAndReveal(final List<EObject> newElements) throws Exception {
+		Display.getDefault().syncExec(new Runnable() {
+
+			public void run() {
+				try {
+					// Retrieve model explorer
+					ModelExplorerView modelExplorerView = null;
+
+					ModelExplorerPageBookView bookViewPart = (ModelExplorerPageBookView) NavigatorUtils.findViewPart(ModelExplorerPageBookView.VIEW_ID);
+					if (bookViewPart != null) {
+						modelExplorerView = (ModelExplorerView) bookViewPart.getActiveView();
+					}
+
+					// Set selection on new element in the model explorer
+					if ((modelExplorerView != null) && (newElements != null)) {
+						List<EObject> semanticElementList = new ArrayList<EObject>();
+						semanticElementList.addAll(newElements);
+						modelExplorerView.revealSemanticElement(semanticElementList);
+					} else {
+						throw new Exception("Impossible to find the model explorer required to select: " + newElements); //$NON-NLS-1$
+					}
+				} catch (Exception ex) {
+					Activator.log.error(ex);
+				}
+			}
+		});
+	}
+
+	/**
+	 * Check the initial table content display.
+	 * 
+	 * @param rowElements
+	 *            the row elements
+	 * @throws Exception
+	 *             The exception
+	 */
+	private void checkInitialTable(final List<?> rowElements) throws Exception {
+		Assert.assertEquals("The initial table does not contains the correct number of rows", 6, rowElements.size()); //$NON-NLS-1$
+
+		final IAxis firstRow = (IAxis) rowElements.get(0);
+		final Object firstRowRepresentedElement = firstRow.getElement();
+		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$
+		
+		final IAxis secondRow = (IAxis) rowElements.get(1);
+		final Object secondRowRepresentedElement = secondRow.getElement();
+		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the first element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis thirdRow = (IAxis) rowElements.get(2);
+		final Object thirdRowRepresentedElement = thirdRow.getElement();
+		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the second element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis fourthRow = (IAxis) rowElements.get(3);
+		final Object fourthRowRepresentedElement = fourthRow.getElement();
+		Assert.assertEquals("The third element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the third element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) fourthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis fifthRow = (IAxis) rowElements.get(4);
+		final Object fifthRowRepresentedElement = fifthRow.getElement();
+		Assert.assertEquals("The fourth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fourth element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) fifthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis sixthRow = (IAxis) rowElements.get(5);
+		final Object sixthColumnRepresentedElement = sixthRow.getElement();
+		Assert.assertEquals("The fifth element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) sixthColumnRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fifth element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) sixthColumnRepresentedElement).getName()); //$NON-NLS-1$
+	}
+
+	/**
+	 * Check the initial table content display.
+	 * 
+	 * @param rowElements
+	 *            the row elements
+	 * @throws Exception
+	 *             The exception
+	 */
+	private void checkSimpleMoveSameParentTable(final List<?> rowElements) throws Exception {
+		Assert.assertEquals("The initial table does not contains the correct number of rows", 6, rowElements.size()); //$NON-NLS-1$
+
+		final IAxis firstRow = (IAxis) rowElements.get(0);
+		final Object firstRowRepresentedElement = firstRow.getElement();
+		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$
+		
+		final IAxis secondRow = (IAxis) rowElements.get(1);
+		final Object secondRowRepresentedElement = secondRow.getElement();
+		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the first element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis thirdRow = (IAxis) rowElements.get(2);
+		final Object thirdRowRepresentedElement = thirdRow.getElement();
+		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the second element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis fourthRow = (IAxis) rowElements.get(3);
+		final Object fourthRowRepresentedElement = fourthRow.getElement();
+		Assert.assertEquals("The third element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the third element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) fourthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis fifthRow = (IAxis) rowElements.get(4);
+		final Object fifthRowRepresentedElement = fifthRow.getElement();
+		Assert.assertEquals("The fourth element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fourth element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) fifthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis sixthRow = (IAxis) rowElements.get(5);
+		final Object sixthColumnRepresentedElement = sixthRow.getElement();
+		Assert.assertEquals("The fifth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) sixthColumnRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fifth element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) sixthColumnRepresentedElement).getName()); //$NON-NLS-1$
+	}
+	
+	/**
+	 * Check the initial table content display.
+	 * 
+	 * @param rowElements
+	 *            the row elements
+	 * @throws Exception
+	 *             The exception
+	 */
+	private void checkMultipleMoveSameParentTable(final List<?> rowElements) throws Exception {
+		Assert.assertEquals("The initial table does not contains the correct number of rows", 6, rowElements.size()); //$NON-NLS-1$
+
+		final IAxis firstRow = (IAxis) rowElements.get(0);
+		final Object firstRowRepresentedElement = firstRow.getElement();
+		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$
+		
+		final IAxis secondRow = (IAxis) rowElements.get(1);
+		final Object secondRowRepresentedElement = secondRow.getElement();
+		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the first element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis thirdRow = (IAxis) rowElements.get(2);
+		final Object thirdRowRepresentedElement = thirdRow.getElement();
+		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the second element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis fourthRow = (IAxis) rowElements.get(3);
+		final Object fourthRowRepresentedElement = fourthRow.getElement();
+		Assert.assertEquals("The third element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the third element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) fourthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis fifthRow = (IAxis) rowElements.get(4);
+		final Object fifthRowRepresentedElement = fifthRow.getElement();
+		Assert.assertEquals("The fourth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fourth element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) fifthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis sixthRow = (IAxis) rowElements.get(5);
+		final Object sixthColumnRepresentedElement = sixthRow.getElement();
+		Assert.assertEquals("The fifth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) sixthColumnRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fifth element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) sixthColumnRepresentedElement).getName()); //$NON-NLS-1$
+	}
+
+	/**
+	 * Check the initial table content display.
+	 * 
+	 * @param rowElements
+	 *            the row elements
+	 * @throws Exception
+	 *             The exception
+	 */
+	private void checkSimpleMoveSubElementsParentTable(final List<?> rowElements) throws Exception {
+		Assert.assertEquals("The initial table does not contains the correct number of rows", 7, rowElements.size()); //$NON-NLS-1$
+
+		final IAxis firstRow = (IAxis) rowElements.get(0);
+		final Object firstRowRepresentedElement = firstRow.getElement();
+		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$
+		
+		final IAxis secondRow = (IAxis) rowElements.get(1);
+		final Object secondRowRepresentedElement = secondRow.getElement();
+		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the first element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis thirdRow = (IAxis) rowElements.get(2);
+		final Object thirdRowRepresentedElement = thirdRow.getElement();
+		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the second element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis fourthRow = (IAxis) rowElements.get(3);
+		final Object fourthRowRepresentedElement = fourthRow.getElement();
+		Assert.assertEquals("The third element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the third element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) fourthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis fifthRow = (IAxis) rowElements.get(4);
+		final Object fifthRowRepresentedElement = fifthRow.getElement();
+		Assert.assertEquals("The fourth element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fourth element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) fifthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis sixthRow = (IAxis) rowElements.get(5);
+		final Object sixthRowRepresentedElement = sixthRow.getElement();
+		Assert.assertTrue("The sixth row must be a tree filling configuration", sixthRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$
+		
+		final IAxis seventhRow = (IAxis) rowElements.get(6);
+		final Object seventhColumnRepresentedElement = seventhRow.getElement();
+		Assert.assertEquals("The fifth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) seventhColumnRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fifth element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) seventhColumnRepresentedElement).getName()); //$NON-NLS-1$
+	}
+
+	/**
+	 * Check the initial table content display.
+	 * 
+	 * @param rowElements
+	 *            the row elements
+	 * @throws Exception
+	 *             The exception
+	 */
+	private void checkMultipleMoveSubElementsParentTable(final List<?> rowElements) throws Exception {
+		Assert.assertEquals("The initial table does not contains the correct number of rows", 7, rowElements.size()); //$NON-NLS-1$
+
+		final IAxis firstRow = (IAxis) rowElements.get(0);
+		final Object firstRowRepresentedElement = firstRow.getElement();
+		Assert.assertTrue("The first row must be a tree filling configuration", firstRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$
+		
+		final IAxis secondRow = (IAxis) rowElements.get(1);
+		final Object secondRowRepresentedElement = secondRow.getElement();
+		Assert.assertEquals("The first element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) secondRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the first element is not corresponding to the third class", THIRD_CLASS, ((org.eclipse.uml2.uml.Class) secondRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis thirdRow = (IAxis) rowElements.get(2);
+		final Object thirdRowRepresentedElement = thirdRow.getElement();
+		Assert.assertEquals("The second element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) thirdRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the second element is not corresponding to the fourth class", FOURTH_CLASS, ((org.eclipse.uml2.uml.Class) thirdRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis fourthRow = (IAxis) rowElements.get(3);
+		final Object fourthRowRepresentedElement = fourthRow.getElement();
+		Assert.assertEquals("The third element must be a package", UMLPackage.eINSTANCE.getPackage(), ((EObject) fourthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the third element is not corresponding to the first package", FIRST_PACKAGE, ((org.eclipse.uml2.uml.Package) fourthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis sixthRow = (IAxis) rowElements.get(4);
+		final Object sixthRowRepresentedElement = sixthRow.getElement();
+		Assert.assertTrue("The sixth row must be a tree filling configuration", sixthRowRepresentedElement instanceof TreeFillingConfiguration); //$NON-NLS-1$
+		
+		final IAxis fifthRow = (IAxis) rowElements.get(5);
+		final Object fifthRowRepresentedElement = fifthRow.getElement();
+		Assert.assertEquals("The fourth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) fifthRowRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fourth element is not corresponding to the first class", FIRST_CLASS, ((org.eclipse.uml2.uml.Class) fifthRowRepresentedElement).getName()); //$NON-NLS-1$
+
+		final IAxis seventhRow = (IAxis) rowElements.get(6);
+		final Object seventhColumnRepresentedElement = seventhRow.getElement();
+		Assert.assertEquals("The fifth element must be a class", UMLPackage.eINSTANCE.getClass_(), ((EObject) seventhColumnRepresentedElement).eClass()); //$NON-NLS-1$
+		Assert.assertEquals("The name of the fifth element is not corresponding to the second class", SECOND_CLASS, ((org.eclipse.uml2.uml.Class) seventhColumnRepresentedElement).getName()); //$NON-NLS-1$
+	}
+	
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/ContentsAndExpandWithCategories_0_1_2_Tests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/ContentsAndExpandWithCategories_0_1_2_Tests.java
index 2a794fbafe8..166db0117e5 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/ContentsAndExpandWithCategories_0_1_2_Tests.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/ContentsAndExpandWithCategories_0_1_2_Tests.java
@@ -1,185 +1,185 @@
-/*****************************************************************************

- * 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.uml.nattable.clazz.config.tests.tests;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;

-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.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.junit.utils.GenericUtils;

-import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.AfterClass;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class ContentsAndExpandWithCategories_0_1_2_Tests extends AbstractOpenTableTest {

-

-	public static String fileName = "contents_with_categories_0_1_2"; //$NON-NLS-1$

-

-	private static final String CLASS1_NAME = "Class1"; //$NON-NLS-1$

-

-	private static final String OPERATION1_NAME = "Operation1"; //$NON-NLS-1$

-

-	@Before

-	public void initModel() throws Exception {

-		initModel("classTreeTable", fileName, getBundle()); //$NON-NLS-1$

-	};

-

-

-	/**

-	 * This method tests the contents of the tree table and its filling expanding level one by one

-	 *

-	 * @throws Exception

-	 */

-	@Test

-	public void testExpand_1_by_1() throws Exception {

-		testOpenExistingTable("classTreeTable", "openTest"); //$NON-NLS-1$ //$NON-NLS-2$

-		IEditorPart tableEditor = editor.getActiveEditor();

-		Assert.assertTrue(tableEditor instanceof NatTableEditor);

-		INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);

-		Assert.assertTrue(manager instanceof ITreeNattableModelManager);

-		ITreeNattableModelManager treeTableManager = (ITreeNattableModelManager) manager;

-		List<?> rowElements = manager.getRowElementsList();

-		int size = rowElements.size();

-

-		// nothing is expanded into the table,

-		Assert.assertEquals(1, size);

-		ITreeItemAxis axis = (ITreeItemAxis) rowElements.get(0);

-		Object representedElement = AxisUtils.getRepresentedElement(axis);

-		Assert.assertTrue(representedElement instanceof TreeFillingConfiguration);

-		Assert.assertEquals(UMLPackage.eINSTANCE.getPackage_PackagedElement(), ((TreeFillingConfiguration) representedElement).getAxisUsedAsAxisProvider().getElement());

-		Assert.assertEquals(6, axis.getChildren().size());

-

-		// the elements have no children because nothing has been expanded

-		for (ITreeItemAxis child : axis.getChildren()) {

-			Assert.assertEquals(0, child.getChildren().size());

-		}

-

-		// we expand the first class owned by the root package

-		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(axis));

-

-		Class class1 = null;

-		ITreeItemAxis class1Representation = null;

-		// now the children must have elements

-		for (ITreeItemAxis child : axis.getChildren()) {

-			Object tmp = AxisUtils.getRepresentedElement(child);

-			Assert.assertTrue(tmp instanceof Class);

-			class1 = (Class) tmp;

-			if (CLASS1_NAME.equals(class1.getName())) {

-				class1Representation = child;

-				Assert.assertEquals(3, child.getChildren().size());

-			} else {

-				Assert.assertEquals(0, child.getChildren().size());

-			}

-		}

-		Assert.assertNotNull(class1);

-

-

-

-

-

-		for (ITreeItemAxis child : class1Representation.getChildren()) {

-			Assert.assertEquals(0, child.getChildren().size());

-		}

-		// we expand class1 in order to fill its children

-		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(class1Representation));

-

-		// the children of class1 must have children now

-		ITreeItemAxis ownedOperationAxis = null;

-		for (ITreeItemAxis child : class1Representation.getChildren()) {

-			Assert.assertEquals(3, child.getChildren().size());

-

-			TreeFillingConfiguration conf = (TreeFillingConfiguration) child.getElement();

-			if (conf.getAxisUsedAsAxisProvider().getElement() == UMLPackage.eINSTANCE.getClass_OwnedOperation()) {

-				ownedOperationAxis = child;

-			}

-			// we expand each filling configuration to fill children

-			treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(child));

-		}

-

-		Assert.assertNotNull(ownedOperationAxis);

-		// we expand the ownedOperation axis

-		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(ownedOperationAxis));

-

-		ITreeItemAxis operation1Representation = null;

-

-		for (ITreeItemAxis child : ownedOperationAxis.getChildren()) {

-			Assert.assertTrue(child.getElement() instanceof Operation);

-			Operation op = (Operation) child.getElement();

-			if (OPERATION1_NAME.equals(op.getName())) {

-				operation1Representation = child;

-				Assert.assertEquals(1, child.getChildren().size());

-			} else {

-				Assert.assertEquals(0, child.getChildren().size());

-			}

-		}

-

-		Assert.assertNotNull(operation1Representation);

-		// we expand operation1

-		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(operation1Representation));

-

-		ITreeItemAxis parametersFeatureAxis = operation1Representation.getChildren().get(0);

-		Assert.assertEquals(parametersFeatureAxis.getChildren().size(), 3);

-	}

-

-	@Test

-	public void testExpandAll() throws Exception {

-		testOpenExistingTable("classTreeTable", "openTest"); //$NON-NLS-1$ //$NON-NLS-2$

-		IEditorPart tableEditor = editor.getActiveEditor();

-		Assert.assertTrue(tableEditor instanceof NatTableEditor);

-		INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);

-		Assert.assertTrue(manager instanceof ITreeNattableModelManager);

-		ITreeNattableModelManager treeTableManager = (ITreeNattableModelManager) manager;

-		List<?> rowElements = manager.getRowElementsList();

-		int size = rowElements.size();

-

-		// nothing is expanded into the table,

-		Assert.assertEquals(1, size);

-		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);

-

-		size = rowElements.size();

-		Assert.assertEquals(23, size);

-	}

-

-	@Override

-	protected String getSourcePath() {

-		return "/resources/contents_and_expand_tests_resources/"; //$NON-NLS-1$

-	}

-

-	@Override

-	protected Bundle getBundle() {

-		return Activator.getDefault().getBundle();

-	}

-

-	@AfterClass

-	public static void endOfTest() {

-		GenericUtils.closeAllEditors();

-	}

-}

+/*****************************************************************************
+ * 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.uml.nattable.clazz.config.tests.tests;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+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.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class ContentsAndExpandWithCategories_0_1_2_Tests extends AbstractOpenTableTest {
+
+	public static String fileName = "contents_with_categories_0_1_2"; //$NON-NLS-1$
+
+	private static final String CLASS1_NAME = "Class1"; //$NON-NLS-1$
+
+	private static final String OPERATION1_NAME = "Operation1"; //$NON-NLS-1$
+
+	@Before
+	public void initModel() throws Exception {
+		initModel("classTreeTable", fileName, getBundle()); //$NON-NLS-1$
+	};
+
+
+	/**
+	 * This method tests the contents of the tree table and its filling expanding level one by one
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void testExpand_1_by_1() throws Exception {
+		testOpenExistingTable("classTreeTable", "openTest"); //$NON-NLS-1$ //$NON-NLS-2$
+		IEditorPart tableEditor = editor.getActiveEditor();
+		Assert.assertTrue(tableEditor instanceof NatTableEditor);
+		INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);
+		Assert.assertTrue(manager instanceof ITreeNattableModelManager);
+		ITreeNattableModelManager treeTableManager = (ITreeNattableModelManager) manager;
+		List<?> rowElements = manager.getRowElementsList();
+		int size = rowElements.size();
+
+		// nothing is expanded into the table,
+		Assert.assertEquals(1, size);
+		ITreeItemAxis axis = (ITreeItemAxis) rowElements.get(0);
+		Object representedElement = AxisUtils.getRepresentedElement(axis);
+		Assert.assertTrue(representedElement instanceof TreeFillingConfiguration);
+		Assert.assertEquals(UMLPackage.eINSTANCE.getPackage_PackagedElement(), ((TreeFillingConfiguration) representedElement).getAxisUsedAsAxisProvider().getElement());
+		Assert.assertEquals(6, axis.getChildren().size());
+
+		// the elements have no children because nothing has been expanded
+		for (ITreeItemAxis child : axis.getChildren()) {
+			Assert.assertEquals(0, child.getChildren().size());
+		}
+
+		// we expand the first class owned by the root package
+		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(axis));
+
+		Class class1 = null;
+		ITreeItemAxis class1Representation = null;
+		// now the children must have elements
+		for (ITreeItemAxis child : axis.getChildren()) {
+			Object tmp = AxisUtils.getRepresentedElement(child);
+			Assert.assertTrue(tmp instanceof Class);
+			class1 = (Class) tmp;
+			if (CLASS1_NAME.equals(class1.getName())) {
+				class1Representation = child;
+				Assert.assertEquals(3, child.getChildren().size());
+			} else {
+				Assert.assertEquals(0, child.getChildren().size());
+			}
+		}
+		Assert.assertNotNull(class1);
+
+
+
+
+
+		for (ITreeItemAxis child : class1Representation.getChildren()) {
+			Assert.assertEquals(0, child.getChildren().size());
+		}
+		// we expand class1 in order to fill its children
+		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(class1Representation));
+
+		// the children of class1 must have children now
+		ITreeItemAxis ownedOperationAxis = null;
+		for (ITreeItemAxis child : class1Representation.getChildren()) {
+			Assert.assertEquals(3, child.getChildren().size());
+
+			TreeFillingConfiguration conf = (TreeFillingConfiguration) child.getElement();
+			if (conf.getAxisUsedAsAxisProvider().getElement() == UMLPackage.eINSTANCE.getClass_OwnedOperation()) {
+				ownedOperationAxis = child;
+			}
+			// we expand each filling configuration to fill children
+			treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(child));
+		}
+
+		Assert.assertNotNull(ownedOperationAxis);
+		// we expand the ownedOperation axis
+		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(ownedOperationAxis));
+
+		ITreeItemAxis operation1Representation = null;
+
+		for (ITreeItemAxis child : ownedOperationAxis.getChildren()) {
+			Assert.assertTrue(child.getElement() instanceof Operation);
+			Operation op = (Operation) child.getElement();
+			if (OPERATION1_NAME.equals(op.getName())) {
+				operation1Representation = child;
+				Assert.assertEquals(1, child.getChildren().size());
+			} else {
+				Assert.assertEquals(0, child.getChildren().size());
+			}
+		}
+
+		Assert.assertNotNull(operation1Representation);
+		// we expand operation1
+		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, Collections.singletonList(operation1Representation));
+
+		ITreeItemAxis parametersFeatureAxis = operation1Representation.getChildren().get(0);
+		Assert.assertEquals(parametersFeatureAxis.getChildren().size(), 3);
+	}
+
+	@Test
+	public void testExpandAll() throws Exception {
+		testOpenExistingTable("classTreeTable", "openTest"); //$NON-NLS-1$ //$NON-NLS-2$
+		IEditorPart tableEditor = editor.getActiveEditor();
+		Assert.assertTrue(tableEditor instanceof NatTableEditor);
+		INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);
+		Assert.assertTrue(manager instanceof ITreeNattableModelManager);
+		ITreeNattableModelManager treeTableManager = (ITreeNattableModelManager) manager;
+		List<?> rowElements = manager.getRowElementsList();
+		int size = rowElements.size();
+
+		// nothing is expanded into the table,
+		Assert.assertEquals(1, size);
+		treeTableManager.doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
+
+		size = rowElements.size();
+		Assert.assertEquals(23, size);
+	}
+
+	@Override
+	protected String getSourcePath() {
+		return "/resources/contents_and_expand_tests_resources/"; //$NON-NLS-1$
+	}
+
+	@Override
+	protected Bundle getBundle() {
+		return Activator.getDefault().getBundle();
+	}
+
+	@AfterClass
+	public static void endOfTest() {
+		GenericUtils.closeAllEditors();
+	}
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/OpenTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/OpenTableTest.java
index 3fd401f375b..7d6c3bef263 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/OpenTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/OpenTableTest.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * 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.uml.nattable.clazz.config.tests.tests;

-

-import org.eclipse.papyrus.junit.utils.GenericUtils;

-import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;

-import org.junit.AfterClass;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class OpenTableTest extends AbstractOpenTableTest {

-

-	@Before

-	public void initModel() throws Exception {

-		initModel("classTreeTable", "openTest", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-	};

-

-	/**

-	 * This test allows to be sure that we doesn't break existing table model

-	 *

-	 * @throws Exception

-	 */

-	@Test

-	public void testOpenExistingTable() throws Exception {

-		testOpenExistingTable("classTreeTable", "openTest"); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	@Override

-	protected String getSourcePath() {

-		return "/resources/"; //$NON-NLS-1$

-	}

-

-	@Override

-	protected Bundle getBundle() {

-		return Activator.getDefault().getBundle();

-	}

-

-	@AfterClass

-	public static void endOfTest() {

-		GenericUtils.closeAllEditors();

-	}

-

-}

+/*****************************************************************************
+ * 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.uml.nattable.clazz.config.tests.tests;
+
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class OpenTableTest extends AbstractOpenTableTest {
+
+	@Before
+	public void initModel() throws Exception {
+		initModel("classTreeTable", "openTest", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+	};
+
+	/**
+	 * This test allows to be sure that we doesn't break existing table model
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void testOpenExistingTable() throws Exception {
+		testOpenExistingTable("classTreeTable", "openTest"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	@Override
+	protected String getSourcePath() {
+		return "/resources/"; //$NON-NLS-1$
+	}
+
+	@Override
+	protected Bundle getBundle() {
+		return Activator.getDefault().getBundle();
+	}
+
+	@AfterClass
+	public static void endOfTest() {
+		GenericUtils.closeAllEditors();
+	}
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/TableFillingAndExpandTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/TableFillingAndExpandTest.java
index a365a9ccf2b..43c709fc828 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/TableFillingAndExpandTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/TableFillingAndExpandTest.java
@@ -1,140 +1,140 @@
-/*****************************************************************************

- * 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.uml.nattable.clazz.config.tests.tests;

-

-import java.io.IOException;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.junit.utils.GenericUtils;

-import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;

-import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Package;

-import org.junit.AfterClass;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-

-import ca.odell.glazedlists.TreeList;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class TableFillingAndExpandTest extends AbstractEditorTest {

-	protected Resource di;

-

-	protected Resource notation;

-

-	protected Resource uml;

-

-	protected Model rootModel;

-

-	protected Class classTest;

-

-	protected List<?> elementListTest;

-

-	protected Package packageTest;

-

-	private List<?> root;

-

-	private Object diagramTest;

-

-	private final String modelName = "tableFillingAndTableExpandTest"; //$NON-NLS-1$

-

-	private final String uml_EXT = "uml"; //$NON-NLS-1$

-	private final String notation_EXT = "notation"; //$NON-NLS-1$

-	private final String di_EXT = "di"; //$NON-NLS-1$

-	private final String DOT = "."; //$NON-NLS-1$

-	private final StringBuilder umlBuiler = new StringBuilder(modelName).append(DOT).append(uml_EXT);

-	private final StringBuilder notationBuiler = new StringBuilder(modelName).append(DOT).append(notation_EXT);

-	private final StringBuilder diBuilder = new StringBuilder(modelName).append(DOT).append(di_EXT);

-

-	@Before

-	public void initTests() throws CoreException, IOException {

-		try {

-			initModel(modelName, modelName, getBundle());

-		} catch (Exception e) {

-			Activator.log.error(e);

-		}

-

-		ResourceSet set = null;

-		try {

-			set = getModelSet();

-		} catch (ServiceException e) {

-			e.printStackTrace();

-		}

-

-		List<Resource> resources = set.getResources();

-

-		for (Resource current : resources) {

-			if (current.getURI().lastSegment().equals(umlBuiler.toString())) {

-				uml = current;

-			} else if (current.getURI().lastSegment().equals(notationBuiler.toString())) {

-				notation = current;

-			} else if (current.getURI().lastSegment().equals(diBuilder.toString())) {

-				di = current;

-			}

-		}

-

-		rootModel = (Model) uml.getContents().get(0);

-		root = notation.getContents();

-		// TODO on luna : open diagram

-	}

-

-	@Override

-	protected String getSourcePath() {

-		return "/resources/"; //$NON-NLS-1$

-	}

-

-	@Override

-	protected Bundle getBundle() {

-		return Activator.getDefault().getBundle();

-	}

-

-	@AfterClass

-	public static void endOfTest() {

-		GenericUtils.closeAllEditors();

-	}

-

-	@Test

-	public void fullTest() {

-		selectTablePage(0);

-		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);

-		List<?> elements = manager.getRowElementsList();

-		Assert.isTrue(elements instanceof TreeList<?>, " the list managing the rows in not a TreeList"); //$NON-NLS-1$

-		int size = elements.size();

-		int i = 0;

-		i++;

-	}

-

-	protected void selectTablePage(int index) {

-		try {

-			Object tablePage = getPageManager().allPages().get(index);

-			// getPageManager().closeAllOpenedPages();

-			// getPageManager().openPage(tablePage);

-			getPageManager().selectPage(tablePage);

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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.uml.nattable.clazz.config.tests.tests;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Package;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+import ca.odell.glazedlists.TreeList;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class TableFillingAndExpandTest extends AbstractEditorTest {
+	protected Resource di;
+
+	protected Resource notation;
+
+	protected Resource uml;
+
+	protected Model rootModel;
+
+	protected Class classTest;
+
+	protected List<?> elementListTest;
+
+	protected Package packageTest;
+
+	private List<?> root;
+
+	private Object diagramTest;
+
+	private final String modelName = "tableFillingAndTableExpandTest"; //$NON-NLS-1$
+
+	private final String uml_EXT = "uml"; //$NON-NLS-1$
+	private final String notation_EXT = "notation"; //$NON-NLS-1$
+	private final String di_EXT = "di"; //$NON-NLS-1$
+	private final String DOT = "."; //$NON-NLS-1$
+	private final StringBuilder umlBuiler = new StringBuilder(modelName).append(DOT).append(uml_EXT);
+	private final StringBuilder notationBuiler = new StringBuilder(modelName).append(DOT).append(notation_EXT);
+	private final StringBuilder diBuilder = new StringBuilder(modelName).append(DOT).append(di_EXT);
+
+	@Before
+	public void initTests() throws CoreException, IOException {
+		try {
+			initModel(modelName, modelName, getBundle());
+		} catch (Exception e) {
+			Activator.log.error(e);
+		}
+
+		ResourceSet set = null;
+		try {
+			set = getModelSet();
+		} catch (ServiceException e) {
+			e.printStackTrace();
+		}
+
+		List<Resource> resources = set.getResources();
+
+		for (Resource current : resources) {
+			if (current.getURI().lastSegment().equals(umlBuiler.toString())) {
+				uml = current;
+			} else if (current.getURI().lastSegment().equals(notationBuiler.toString())) {
+				notation = current;
+			} else if (current.getURI().lastSegment().equals(diBuilder.toString())) {
+				di = current;
+			}
+		}
+
+		rootModel = (Model) uml.getContents().get(0);
+		root = notation.getContents();
+		// TODO on luna : open diagram
+	}
+
+	@Override
+	protected String getSourcePath() {
+		return "/resources/"; //$NON-NLS-1$
+	}
+
+	@Override
+	protected Bundle getBundle() {
+		return Activator.getDefault().getBundle();
+	}
+
+	@AfterClass
+	public static void endOfTest() {
+		GenericUtils.closeAllEditors();
+	}
+
+	@Test
+	public void fullTest() {
+		selectTablePage(0);
+		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);
+		List<?> elements = manager.getRowElementsList();
+		Assert.isTrue(elements instanceof TreeList<?>, " the list managing the rows in not a TreeList"); //$NON-NLS-1$
+		int size = elements.size();
+		int i = 0;
+		i++;
+	}
+
+	protected void selectTablePage(int index) {
+		try {
+			Object tablePage = getPageManager().allPages().get(index);
+			// getPageManager().closeAllOpenedPages();
+			// getPageManager().openPage(tablePage);
+			getPageManager().selectPage(tablePage);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+	}
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.project b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.project
index 10f1cb289dc..0715468c4d3 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.project
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.generic.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.generic.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/about.html b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/about.html
index 82d49bf5f81..d35d5aed64c 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/about.html
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties
index c672072f1a8..4cb3ab7b83e 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               resources/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               resources/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/org.eclipse.papyrus.uml.nattable.generic.tests.launch b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/org.eclipse.papyrus.uml.nattable.generic.tests.launch
index ae194f40944..83515a1d108 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/org.eclipse.papyrus.uml.nattable.generic.tests.launch
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/org.eclipse.papyrus.uml.nattable.generic.tests.launch
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="false"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.generic.tests.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.nattable.generic.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx4096m"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava*15.0.0.v201403281430@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.gradleware.tooling.client@default:default,com.gradleware.tooling.model@default:default,com.gradleware.tooling.utils@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default,org.apache.httpcomponents.httpcore*4.3.3.v201411290715@default:default,org.apache.httpcomponents.httpcore*4.4.6.v20170210-0925@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.lucene.core*6.1.0.v20161115-1612@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.aether.maven@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.buildship.branding@default:default,org.eclipse.buildship.core@default:default,org.eclipse.buildship.stsmigration@default:default,org.eclipse.buildship.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.tools.compat@default:default,org.eclipse.e4.tools.emf.editor3x@default:default,org.eclipse.e4.tools.emf.ui@default:default,org.eclipse.e4.tools.jdt.templates@default:default,org.eclipse.e4.tools.services@default:default,org.eclipse.e4.tools@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.mylyn.ui@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.epp.logging.aeri.core@default:default,org.eclipse.epp.logging.aeri.ide@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.committers@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.http.apache@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.importer@default:default,org.eclipse.m2e.jdt.ui@default:false,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.profiles.core@default:default,org.eclipse.m2e.profiles.ui@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml.common.ui@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.debug.core@default:default,org.eclipse.m2m.qvt.oml.debug.ui@default:default,org.eclipse.m2m.qvt.oml.doc@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.editor.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.ocl@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime.jdt@default:default,org.eclipse.m2m.qvt.oml.runtime.ui@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml.samples@default:default,org.eclipse.m2m.qvt.oml.trace.edit@default:default,org.eclipse.m2m.qvt.oml.ui@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.builds.core@default:default,org.eclipse.mylyn.builds.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.http.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@default:default,org.eclipse.mylyn.gerrit.dashboard.core@default:default,org.eclipse.mylyn.gerrit.dashboard.ui@default:default,org.eclipse.mylyn.gerrit.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.hudson.core@default:default,org.eclipse.mylyn.hudson.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.edit@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.asciidoc.ui@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.nebula.widgets.nattable.extension.nebula@default:default,org.eclipse.nebula.widgets.richtext@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.debug.vm.ui@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.pivot.ui@default:default,org.eclipse.ocl.pivot.uml@default:default,org.eclipse.ocl.pivot@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl.xtext.base.ui@default:default,org.eclipse.ocl.xtext.base@default:default,org.eclipse.ocl.xtext.completeocl.ui@default:default,org.eclipse.ocl.xtext.completeocl@default:default,org.eclipse.ocl.xtext.essentialocl.ui@default:default,org.eclipse.ocl.xtext.essentialocl@default:default,org.eclipse.ocl.xtext.markup.ui@default:default,org.eclipse.ocl.xtext.markup@default:default,org.eclipse.ocl.xtext.oclinecore.ui@default:default,org.eclipse.ocl.xtext.oclinecore@default:default,org.eclipse.ocl.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.sync@default:default,org.eclipse.oomph.setup.targlets@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup.workingsets@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.targlets.core@default:default,org.eclipse.oomph.targlets@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util.pde@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.dsml.validation@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.types.doc@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.sysml14.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml14.diagram.common@default:default,org.eclipse.papyrus.sysml14.diagram.internalblock@default:default,org.eclipse.papyrus.sysml14.diagram.parametric@default:default,org.eclipse.papyrus.sysml14.diagram.requirement@default:default,org.eclipse.papyrus.sysml14.edit@default:default,org.eclipse.papyrus.sysml14.nattable.allocation@default:default,org.eclipse.papyrus.sysml14.nattable.common@default:default,org.eclipse.papyrus.sysml14.nattable.requirement@default:default,org.eclipse.papyrus.sysml14.nattable.ui@default:default,org.eclipse.papyrus.sysml14.service.types@default:default,org.eclipse.papyrus.sysml14.ui@default:default,org.eclipse.papyrus.sysml14.validation@default:default,org.eclipse.papyrus.sysml14@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.views.references.doc@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.recommenders.apidocs.rcp@default:default,org.eclipse.recommenders.apidocs@default:default,org.eclipse.recommenders.calls.rcp@default:default,org.eclipse.recommenders.calls@default:default,org.eclipse.recommenders.chain.rcp@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.constructors.rcp@default:default,org.eclipse.recommenders.constructors@default:default,org.eclipse.recommenders.coordinates.rcp@default:default,org.eclipse.recommenders.coordinates@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.io@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.jdt@default:default,org.eclipse.recommenders.models.rcp@default:default,org.eclipse.recommenders.models@default:default,org.eclipse.recommenders.mylyn.rcp@default:default,org.eclipse.recommenders.net@default:default,org.eclipse.recommenders.news.api@default:default,org.eclipse.recommenders.news.impl@default:default,org.eclipse.recommenders.news.rcp@default:default,org.eclipse.recommenders.news@default:default,org.eclipse.recommenders.overrides.rcp@default:default,org.eclipse.recommenders.overrides@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.snipmatch.rcp@default:default,org.eclipse.recommenders.snipmatch@default:default,org.eclipse.recommenders.subwords.rcp@default:default,org.eclipse.recommenders.types.rcp@default:default,org.eclipse.recommenders.utils.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.search@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.upr.utp@default:default,org.eclipse.userstorage.ui@default:default,org.eclipse.userstorage@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext@default:default,org.eclipse.xwt@default:default,org.gradle.toolingapi@default:default,org.hamcrest.core@default:default,org.jsoup@default:default,org.junit@default:default,org.kohsuke.args4j@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>

-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.customization.nattableconfiguration@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.nattable.common.tests@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.gmfdiag@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.representation.edit@default:default,org.eclipse.papyrus.infra.nattable.representation@default:default,org.eclipse.papyrus.infra.nattable.suite.tests@default:default,org.eclipse.papyrus.infra.nattable.tests@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.tests@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.uml.dynamic.profile.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.tests@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.matrix@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.properties@default:default,org.eclipse.papyrus.uml.nattable.richtext@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display.tests@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display@default:default,org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests@default:default,org.eclipse.papyrus.uml.nattable.suite.tests@default:default,org.eclipse.papyrus.uml.nattable.tests@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.generic.tests.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.nattable.generic.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx4096m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava*15.0.0.v201403281430@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.gradleware.tooling.client@default:default,com.gradleware.tooling.model@default:default,com.gradleware.tooling.utils@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default,org.apache.httpcomponents.httpcore*4.3.3.v201411290715@default:default,org.apache.httpcomponents.httpcore*4.4.6.v20170210-0925@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.lucene.core*6.1.0.v20161115-1612@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.aether.maven@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.buildship.branding@default:default,org.eclipse.buildship.core@default:default,org.eclipse.buildship.stsmigration@default:default,org.eclipse.buildship.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.tools.compat@default:default,org.eclipse.e4.tools.emf.editor3x@default:default,org.eclipse.e4.tools.emf.ui@default:default,org.eclipse.e4.tools.jdt.templates@default:default,org.eclipse.e4.tools.services@default:default,org.eclipse.e4.tools@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.mylyn.ui@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.epp.logging.aeri.core@default:default,org.eclipse.epp.logging.aeri.ide@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.committers@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.http.apache@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.importer@default:default,org.eclipse.m2e.jdt.ui@default:false,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.profiles.core@default:default,org.eclipse.m2e.profiles.ui@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml.common.ui@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.debug.core@default:default,org.eclipse.m2m.qvt.oml.debug.ui@default:default,org.eclipse.m2m.qvt.oml.doc@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.editor.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.ocl@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime.jdt@default:default,org.eclipse.m2m.qvt.oml.runtime.ui@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml.samples@default:default,org.eclipse.m2m.qvt.oml.trace.edit@default:default,org.eclipse.m2m.qvt.oml.ui@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.builds.core@default:default,org.eclipse.mylyn.builds.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.http.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@default:default,org.eclipse.mylyn.gerrit.dashboard.core@default:default,org.eclipse.mylyn.gerrit.dashboard.ui@default:default,org.eclipse.mylyn.gerrit.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.hudson.core@default:default,org.eclipse.mylyn.hudson.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.edit@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.asciidoc.ui@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.nebula.widgets.nattable.extension.nebula@default:default,org.eclipse.nebula.widgets.richtext@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.debug.vm.ui@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.pivot.ui@default:default,org.eclipse.ocl.pivot.uml@default:default,org.eclipse.ocl.pivot@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl.xtext.base.ui@default:default,org.eclipse.ocl.xtext.base@default:default,org.eclipse.ocl.xtext.completeocl.ui@default:default,org.eclipse.ocl.xtext.completeocl@default:default,org.eclipse.ocl.xtext.essentialocl.ui@default:default,org.eclipse.ocl.xtext.essentialocl@default:default,org.eclipse.ocl.xtext.markup.ui@default:default,org.eclipse.ocl.xtext.markup@default:default,org.eclipse.ocl.xtext.oclinecore.ui@default:default,org.eclipse.ocl.xtext.oclinecore@default:default,org.eclipse.ocl.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.sync@default:default,org.eclipse.oomph.setup.targlets@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup.workingsets@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.targlets.core@default:default,org.eclipse.oomph.targlets@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util.pde@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.dsml.validation@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.types.doc@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.sysml14.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml14.diagram.common@default:default,org.eclipse.papyrus.sysml14.diagram.internalblock@default:default,org.eclipse.papyrus.sysml14.diagram.parametric@default:default,org.eclipse.papyrus.sysml14.diagram.requirement@default:default,org.eclipse.papyrus.sysml14.edit@default:default,org.eclipse.papyrus.sysml14.nattable.allocation@default:default,org.eclipse.papyrus.sysml14.nattable.common@default:default,org.eclipse.papyrus.sysml14.nattable.requirement@default:default,org.eclipse.papyrus.sysml14.nattable.ui@default:default,org.eclipse.papyrus.sysml14.service.types@default:default,org.eclipse.papyrus.sysml14.ui@default:default,org.eclipse.papyrus.sysml14.validation@default:default,org.eclipse.papyrus.sysml14@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.views.references.doc@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.recommenders.apidocs.rcp@default:default,org.eclipse.recommenders.apidocs@default:default,org.eclipse.recommenders.calls.rcp@default:default,org.eclipse.recommenders.calls@default:default,org.eclipse.recommenders.chain.rcp@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.constructors.rcp@default:default,org.eclipse.recommenders.constructors@default:default,org.eclipse.recommenders.coordinates.rcp@default:default,org.eclipse.recommenders.coordinates@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.io@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.jdt@default:default,org.eclipse.recommenders.models.rcp@default:default,org.eclipse.recommenders.models@default:default,org.eclipse.recommenders.mylyn.rcp@default:default,org.eclipse.recommenders.net@default:default,org.eclipse.recommenders.news.api@default:default,org.eclipse.recommenders.news.impl@default:default,org.eclipse.recommenders.news.rcp@default:default,org.eclipse.recommenders.news@default:default,org.eclipse.recommenders.overrides.rcp@default:default,org.eclipse.recommenders.overrides@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.snipmatch.rcp@default:default,org.eclipse.recommenders.snipmatch@default:default,org.eclipse.recommenders.subwords.rcp@default:default,org.eclipse.recommenders.types.rcp@default:default,org.eclipse.recommenders.utils.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.search@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.upr.utp@default:default,org.eclipse.userstorage.ui@default:default,org.eclipse.userstorage@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext@default:default,org.eclipse.xwt@default:default,org.gradle.toolingapi@default:default,org.hamcrest.core@default:default,org.jsoup@default:default,org.junit@default:default,org.kohsuke.args4j@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.customization.nattableconfiguration@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.nattable.common.tests@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.gmfdiag@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.representation.edit@default:default,org.eclipse.papyrus.infra.nattable.representation@default:default,org.eclipse.papyrus.infra.nattable.suite.tests@default:default,org.eclipse.papyrus.infra.nattable.tests@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.tests@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.uml.dynamic.profile.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.tests@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.matrix@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.properties@default:default,org.eclipse.papyrus.uml.nattable.richtext@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display.tests@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display@default:default,org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests@default:default,org.eclipse.papyrus.uml.nattable.suite.tests@default:default,org.eclipse.papyrus.uml.nattable.tests@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.notation
index ebb5e9ce729..ed41fcb81ab 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.notation
@@ -1,427 +1,427 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_d_AKgBvsEeWhvZnJLpKdGQ" name="GenericTable0" currentRowAxisProvider="_d_AKghvsEeWhvZnJLpKdGQ" currentColumnAxisProvider="_d_AKgRvsEeWhvZnJLpKdGQ">

-  <context xmi:type="uml:Model" href="OpenAndDeleteTest.uml#_i3QR8BszEeWpHqoKlVqIAQ"/>

-  <owner xmi:type="uml:Model" href="OpenAndDeleteTest.uml#_i3QR8BszEeWpHqoKlVqIAQ"/>

-  <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="_d_AKgRvsEeWhvZnJLpKdGQ" 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="_e7xUwBvsEeWhvZnJLpKdGQ">

-      <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="_e7xUwRvsEeWhvZnJLpKdGQ">

-      <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="_e7xUwhvsEeWhvZnJLpKdGQ">

-      <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="_e7xUwxvsEeWhvZnJLpKdGQ">

-      <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="_e7xUxBvsEeWhvZnJLpKdGQ">

-      <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="_e7xUxRvsEeWhvZnJLpKdGQ">

-      <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="_e7xUxhvsEeWhvZnJLpKdGQ">

-      <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="_e7xUxxvsEeWhvZnJLpKdGQ">

-      <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="_e7xUyBvsEeWhvZnJLpKdGQ">

-      <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="_e7xUyRvsEeWhvZnJLpKdGQ">

-      <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="_e7xUyhvsEeWhvZnJLpKdGQ">

-      <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="_e7xUyxvsEeWhvZnJLpKdGQ">

-      <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="_e7xUzBvsEeWhvZnJLpKdGQ">

-      <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="_e7xUzRvsEeWhvZnJLpKdGQ">

-      <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="_e7xUzhvsEeWhvZnJLpKdGQ">

-      <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="_e7xUzxvsEeWhvZnJLpKdGQ">

-      <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="_e7xU0BvsEeWhvZnJLpKdGQ">

-      <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="_e7xU0RvsEeWhvZnJLpKdGQ">

-      <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="_e7xU0hvsEeWhvZnJLpKdGQ">

-      <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="_e7xU0xvsEeWhvZnJLpKdGQ">

-      <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="_e7xU1BvsEeWhvZnJLpKdGQ">

-      <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="_e7xU1RvsEeWhvZnJLpKdGQ">

-      <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="_e7xU1hvsEeWhvZnJLpKdGQ">

-      <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="_e7xU1xvsEeWhvZnJLpKdGQ">

-      <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="_e7xU2BvsEeWhvZnJLpKdGQ">

-      <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="_e7xU2RvsEeWhvZnJLpKdGQ">

-      <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="_e7xU2hvsEeWhvZnJLpKdGQ">

-      <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="_e7xU2xvsEeWhvZnJLpKdGQ">

-      <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="_e7xU3BvsEeWhvZnJLpKdGQ">

-      <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="_e7xU3RvsEeWhvZnJLpKdGQ">

-      <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="_e7xU3hvsEeWhvZnJLpKdGQ">

-      <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="_e7xU3xvsEeWhvZnJLpKdGQ">

-      <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="_e7xU4BvsEeWhvZnJLpKdGQ">

-      <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="_e7xU4RvsEeWhvZnJLpKdGQ">

-      <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="_e7xU4hvsEeWhvZnJLpKdGQ">

-      <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="_e7xU4xvsEeWhvZnJLpKdGQ">

-      <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="_e7xU5BvsEeWhvZnJLpKdGQ">

-      <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="_e7xU5RvsEeWhvZnJLpKdGQ">

-      <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="_e7xU5hvsEeWhvZnJLpKdGQ">

-      <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="_e7xU5xvsEeWhvZnJLpKdGQ">

-      <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="_e7xU6BvsEeWhvZnJLpKdGQ">

-      <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="_e7xU6RvsEeWhvZnJLpKdGQ">

-      <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="_e7xU6hvsEeWhvZnJLpKdGQ">

-      <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="_e7xU6xvsEeWhvZnJLpKdGQ">

-      <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="_e7xU7BvsEeWhvZnJLpKdGQ">

-      <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="_e7xU7RvsEeWhvZnJLpKdGQ">

-      <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="_e7xU7hvsEeWhvZnJLpKdGQ">

-      <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="_e7xU7xvsEeWhvZnJLpKdGQ">

-      <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="_e7xU8BvsEeWhvZnJLpKdGQ">

-      <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="_e7xU8RvsEeWhvZnJLpKdGQ">

-      <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="_e7xU8hvsEeWhvZnJLpKdGQ">

-      <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="_fHzloBvsEeWhvZnJLpKdGQ">

-      <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="_fHzloRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlohvsEeWhvZnJLpKdGQ">

-      <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="_fHzloxvsEeWhvZnJLpKdGQ">

-      <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="_fHzlpBvsEeWhvZnJLpKdGQ">

-      <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="_fHzlpRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlphvsEeWhvZnJLpKdGQ">

-      <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="_fHzlpxvsEeWhvZnJLpKdGQ">

-      <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="_fHzlqBvsEeWhvZnJLpKdGQ">

-      <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="_fHzlqRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlqhvsEeWhvZnJLpKdGQ">

-      <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="_fHzlqxvsEeWhvZnJLpKdGQ">

-      <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="_fHzlrBvsEeWhvZnJLpKdGQ">

-      <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="_fHzlrRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlrhvsEeWhvZnJLpKdGQ">

-      <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="_fHzlrxvsEeWhvZnJLpKdGQ">

-      <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="_fHzlsBvsEeWhvZnJLpKdGQ">

-      <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="_fHzlsRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlshvsEeWhvZnJLpKdGQ">

-      <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="_fHzlsxvsEeWhvZnJLpKdGQ">

-      <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="_fHzltBvsEeWhvZnJLpKdGQ">

-      <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="_fHzltRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlthvsEeWhvZnJLpKdGQ">

-      <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="_fHzltxvsEeWhvZnJLpKdGQ">

-      <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="_fHzluBvsEeWhvZnJLpKdGQ">

-      <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="_fHzluRvsEeWhvZnJLpKdGQ">

-      <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="_fHzluhvsEeWhvZnJLpKdGQ">

-      <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="_fHzluxvsEeWhvZnJLpKdGQ">

-      <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="_fHzlvBvsEeWhvZnJLpKdGQ">

-      <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="_fHzlvRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlvhvsEeWhvZnJLpKdGQ">

-      <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="_fHzlvxvsEeWhvZnJLpKdGQ">

-      <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="_fHzlwBvsEeWhvZnJLpKdGQ">

-      <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="_fHzlwRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlwhvsEeWhvZnJLpKdGQ">

-      <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="_fHzlwxvsEeWhvZnJLpKdGQ">

-      <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="_fHzlxBvsEeWhvZnJLpKdGQ">

-      <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="_fHzlxRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlxhvsEeWhvZnJLpKdGQ">

-      <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="_fHzlxxvsEeWhvZnJLpKdGQ">

-      <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="_fHzlyBvsEeWhvZnJLpKdGQ">

-      <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="_fHzlyRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlyhvsEeWhvZnJLpKdGQ">

-      <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="_fHzlyxvsEeWhvZnJLpKdGQ">

-      <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="_fHzlzBvsEeWhvZnJLpKdGQ">

-      <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="_fHzlzRvsEeWhvZnJLpKdGQ">

-      <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="_fHzlzhvsEeWhvZnJLpKdGQ">

-      <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="_fHzlzxvsEeWhvZnJLpKdGQ">

-      <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="_fHzl0BvsEeWhvZnJLpKdGQ">

-      <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="_fHzl0RvsEeWhvZnJLpKdGQ">

-      <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="_fHzl0hvsEeWhvZnJLpKdGQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_d_AKghvsEeWhvZnJLpKdGQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

-    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_e7vfkBvsEeWhvZnJLpKdGQ">

-      <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:Class" href="OpenAndDeleteTest.uml#_MkPtcBs0EeWnBYfbvylYbw"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_fHy-kBvsEeWhvZnJLpKdGQ">

-      <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:Class" href="OpenAndDeleteTest.uml#_L_VpkBs0EeWnBYfbvylYbw"/>

-    </axis>

-  </rowAxisProvidersHistory>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_d_AKgBvsEeWhvZnJLpKdGQ" name="GenericTable0" currentRowAxisProvider="_d_AKghvsEeWhvZnJLpKdGQ" currentColumnAxisProvider="_d_AKgRvsEeWhvZnJLpKdGQ">
+  <context xmi:type="uml:Model" href="OpenAndDeleteTest.uml#_i3QR8BszEeWpHqoKlVqIAQ"/>
+  <owner xmi:type="uml:Model" href="OpenAndDeleteTest.uml#_i3QR8BszEeWpHqoKlVqIAQ"/>
+  <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="_d_AKgRvsEeWhvZnJLpKdGQ" 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="_e7xUwBvsEeWhvZnJLpKdGQ">
+      <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="_e7xUwRvsEeWhvZnJLpKdGQ">
+      <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="_e7xUwhvsEeWhvZnJLpKdGQ">
+      <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="_e7xUwxvsEeWhvZnJLpKdGQ">
+      <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="_e7xUxBvsEeWhvZnJLpKdGQ">
+      <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="_e7xUxRvsEeWhvZnJLpKdGQ">
+      <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="_e7xUxhvsEeWhvZnJLpKdGQ">
+      <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="_e7xUxxvsEeWhvZnJLpKdGQ">
+      <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="_e7xUyBvsEeWhvZnJLpKdGQ">
+      <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="_e7xUyRvsEeWhvZnJLpKdGQ">
+      <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="_e7xUyhvsEeWhvZnJLpKdGQ">
+      <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="_e7xUyxvsEeWhvZnJLpKdGQ">
+      <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="_e7xUzBvsEeWhvZnJLpKdGQ">
+      <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="_e7xUzRvsEeWhvZnJLpKdGQ">
+      <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="_e7xUzhvsEeWhvZnJLpKdGQ">
+      <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="_e7xUzxvsEeWhvZnJLpKdGQ">
+      <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="_e7xU0BvsEeWhvZnJLpKdGQ">
+      <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="_e7xU0RvsEeWhvZnJLpKdGQ">
+      <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="_e7xU0hvsEeWhvZnJLpKdGQ">
+      <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="_e7xU0xvsEeWhvZnJLpKdGQ">
+      <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="_e7xU1BvsEeWhvZnJLpKdGQ">
+      <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="_e7xU1RvsEeWhvZnJLpKdGQ">
+      <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="_e7xU1hvsEeWhvZnJLpKdGQ">
+      <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="_e7xU1xvsEeWhvZnJLpKdGQ">
+      <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="_e7xU2BvsEeWhvZnJLpKdGQ">
+      <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="_e7xU2RvsEeWhvZnJLpKdGQ">
+      <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="_e7xU2hvsEeWhvZnJLpKdGQ">
+      <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="_e7xU2xvsEeWhvZnJLpKdGQ">
+      <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="_e7xU3BvsEeWhvZnJLpKdGQ">
+      <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="_e7xU3RvsEeWhvZnJLpKdGQ">
+      <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="_e7xU3hvsEeWhvZnJLpKdGQ">
+      <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="_e7xU3xvsEeWhvZnJLpKdGQ">
+      <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="_e7xU4BvsEeWhvZnJLpKdGQ">
+      <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="_e7xU4RvsEeWhvZnJLpKdGQ">
+      <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="_e7xU4hvsEeWhvZnJLpKdGQ">
+      <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="_e7xU4xvsEeWhvZnJLpKdGQ">
+      <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="_e7xU5BvsEeWhvZnJLpKdGQ">
+      <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="_e7xU5RvsEeWhvZnJLpKdGQ">
+      <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="_e7xU5hvsEeWhvZnJLpKdGQ">
+      <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="_e7xU5xvsEeWhvZnJLpKdGQ">
+      <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="_e7xU6BvsEeWhvZnJLpKdGQ">
+      <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="_e7xU6RvsEeWhvZnJLpKdGQ">
+      <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="_e7xU6hvsEeWhvZnJLpKdGQ">
+      <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="_e7xU6xvsEeWhvZnJLpKdGQ">
+      <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="_e7xU7BvsEeWhvZnJLpKdGQ">
+      <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="_e7xU7RvsEeWhvZnJLpKdGQ">
+      <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="_e7xU7hvsEeWhvZnJLpKdGQ">
+      <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="_e7xU7xvsEeWhvZnJLpKdGQ">
+      <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="_e7xU8BvsEeWhvZnJLpKdGQ">
+      <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="_e7xU8RvsEeWhvZnJLpKdGQ">
+      <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="_e7xU8hvsEeWhvZnJLpKdGQ">
+      <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="_fHzloBvsEeWhvZnJLpKdGQ">
+      <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="_fHzloRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlohvsEeWhvZnJLpKdGQ">
+      <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="_fHzloxvsEeWhvZnJLpKdGQ">
+      <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="_fHzlpBvsEeWhvZnJLpKdGQ">
+      <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="_fHzlpRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlphvsEeWhvZnJLpKdGQ">
+      <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="_fHzlpxvsEeWhvZnJLpKdGQ">
+      <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="_fHzlqBvsEeWhvZnJLpKdGQ">
+      <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="_fHzlqRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlqhvsEeWhvZnJLpKdGQ">
+      <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="_fHzlqxvsEeWhvZnJLpKdGQ">
+      <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="_fHzlrBvsEeWhvZnJLpKdGQ">
+      <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="_fHzlrRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlrhvsEeWhvZnJLpKdGQ">
+      <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="_fHzlrxvsEeWhvZnJLpKdGQ">
+      <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="_fHzlsBvsEeWhvZnJLpKdGQ">
+      <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="_fHzlsRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlshvsEeWhvZnJLpKdGQ">
+      <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="_fHzlsxvsEeWhvZnJLpKdGQ">
+      <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="_fHzltBvsEeWhvZnJLpKdGQ">
+      <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="_fHzltRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlthvsEeWhvZnJLpKdGQ">
+      <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="_fHzltxvsEeWhvZnJLpKdGQ">
+      <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="_fHzluBvsEeWhvZnJLpKdGQ">
+      <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="_fHzluRvsEeWhvZnJLpKdGQ">
+      <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="_fHzluhvsEeWhvZnJLpKdGQ">
+      <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="_fHzluxvsEeWhvZnJLpKdGQ">
+      <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="_fHzlvBvsEeWhvZnJLpKdGQ">
+      <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="_fHzlvRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlvhvsEeWhvZnJLpKdGQ">
+      <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="_fHzlvxvsEeWhvZnJLpKdGQ">
+      <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="_fHzlwBvsEeWhvZnJLpKdGQ">
+      <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="_fHzlwRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlwhvsEeWhvZnJLpKdGQ">
+      <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="_fHzlwxvsEeWhvZnJLpKdGQ">
+      <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="_fHzlxBvsEeWhvZnJLpKdGQ">
+      <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="_fHzlxRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlxhvsEeWhvZnJLpKdGQ">
+      <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="_fHzlxxvsEeWhvZnJLpKdGQ">
+      <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="_fHzlyBvsEeWhvZnJLpKdGQ">
+      <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="_fHzlyRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlyhvsEeWhvZnJLpKdGQ">
+      <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="_fHzlyxvsEeWhvZnJLpKdGQ">
+      <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="_fHzlzBvsEeWhvZnJLpKdGQ">
+      <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="_fHzlzRvsEeWhvZnJLpKdGQ">
+      <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="_fHzlzhvsEeWhvZnJLpKdGQ">
+      <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="_fHzlzxvsEeWhvZnJLpKdGQ">
+      <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="_fHzl0BvsEeWhvZnJLpKdGQ">
+      <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="_fHzl0RvsEeWhvZnJLpKdGQ">
+      <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="_fHzl0hvsEeWhvZnJLpKdGQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_d_AKghvsEeWhvZnJLpKdGQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_e7vfkBvsEeWhvZnJLpKdGQ">
+      <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:Class" href="OpenAndDeleteTest.uml#_MkPtcBs0EeWnBYfbvylYbw"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_fHy-kBvsEeWhvZnJLpKdGQ">
+      <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:Class" href="OpenAndDeleteTest.uml#_L_VpkBs0EeWnBYfbvylYbw"/>
+    </axis>
+  </rowAxisProvidersHistory>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.uml
index 9af8281e0d2..fbe6f5700c6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/bugs/bug470811/OpenAndDeleteTest.uml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_i3QR8BszEeWpHqoKlVqIAQ" name="RootElement">

-  <packagedElement xmi:type="uml:Class" xmi:id="_L_VpkBs0EeWnBYfbvylYbw" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_NMO6gBs0EeWnBYfbvylYbw" name="Class2"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_MkPtcBs0EeWnBYfbvylYbw" name="Class2">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_OZU_wBs0EeWnBYfbvylYbw" name="Attribute1"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_i3QR8BszEeWpHqoKlVqIAQ" name="RootElement">
+  <packagedElement xmi:type="uml:Class" xmi:id="_L_VpkBs0EeWnBYfbvylYbw" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_NMO6gBs0EeWnBYfbvylYbw" name="Class2"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_MkPtcBs0EeWnBYfbvylYbw" name="Class2">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_OZU_wBs0EeWnBYfbvylYbw" name="Attribute1"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/contents_tests_resources/contents_sort_invert_edit_model.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/contents_tests_resources/contents_sort_invert_edit_model.uml
index c3130b7328d..cd6bb0fa3c2 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/contents_tests_resources/contents_sort_invert_edit_model.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/contents_tests_resources/contents_sort_invert_edit_model.uml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ChwcMOpdEeSLn7DaLatDYg" name="model">

-  <packagedElement xmi:type="uml:Class" xmi:id="_2zQYQOpdEeSLn7DaLatDYg" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_A9HkMOpeEeSLn7DaLatDYg" name="Attribute11" visibility="public" type="_2zQYQOpdEeSLn7DaLatDYg">

-      <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_keGwcOpeEeSLn7DaLatDYg" name="testB"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Ic69oOpeEeSLn7DaLatDYg" name="Attribute12" visibility="public" type="_4ZeIIOpdEeSLn7DaLatDYg">

-      <defaultValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lEmIsOpeEeSLn7DaLatDYg" value="123"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_4ZeIIOpdEeSLn7DaLatDYg" name="Class2">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_D3RoMOpeEeSLn7DaLatDYg" name="Attribute21" visibility="public" type="_2zQYQOpdEeSLn7DaLatDYg">

-      <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_lx_aMOpeEeSLn7DaLatDYg" name="testA"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_I04JcOy1EeSlh_vGEa7fQw" name="Class3"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_z4d5wABkEeWWp-uvBoz03w" name="Class4"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ChwcMOpdEeSLn7DaLatDYg" name="model">
+  <packagedElement xmi:type="uml:Class" xmi:id="_2zQYQOpdEeSLn7DaLatDYg" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_A9HkMOpeEeSLn7DaLatDYg" name="Attribute11" visibility="public" type="_2zQYQOpdEeSLn7DaLatDYg">
+      <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_keGwcOpeEeSLn7DaLatDYg" name="testB"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Ic69oOpeEeSLn7DaLatDYg" name="Attribute12" visibility="public" type="_4ZeIIOpdEeSLn7DaLatDYg">
+      <defaultValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lEmIsOpeEeSLn7DaLatDYg" value="123"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_4ZeIIOpdEeSLn7DaLatDYg" name="Class2">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_D3RoMOpeEeSLn7DaLatDYg" name="Attribute21" visibility="public" type="_2zQYQOpdEeSLn7DaLatDYg">
+      <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_lx_aMOpeEeSLn7DaLatDYg" name="testA"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_I04JcOy1EeSlh_vGEa7fQw" name="Class3"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_z4d5wABkEeWWp-uvBoz03w" name="Class4"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.di
index 2217bda8e8f..d0ac0fffaeb 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.di
@@ -1,29 +1,29 @@
-<?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="modelUMLClass.notation#_IbRcdgKNEeSZ5cZUOQKWkw"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="modelUMLClass.notation#_wPPgkAKNEeSZ5cZUOQKWkw"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="modelUMLClass.notation#_xVcToAKNEeSZ5cZUOQKWkw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="modelUMLClass.notation#_xVcToAKNEeSZ5cZUOQKWkw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="modelUMLClass.notation#_IbRcdgKNEeSZ5cZUOQKWkw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="modelUMLClass.notation#_wPPgkAKNEeSZ5cZUOQKWkw"/>

-        </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="modelUMLClass.notation#_IbRcdgKNEeSZ5cZUOQKWkw"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="modelUMLClass.notation#_wPPgkAKNEeSZ5cZUOQKWkw"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="modelUMLClass.notation#_xVcToAKNEeSZ5cZUOQKWkw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="modelUMLClass.notation#_xVcToAKNEeSZ5cZUOQKWkw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="modelUMLClass.notation#_IbRcdgKNEeSZ5cZUOQKWkw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="modelUMLClass.notation#_wPPgkAKNEeSZ5cZUOQKWkw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.notation
index ada89afca8b..eb7404e1903 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.notation
@@ -1,1712 +1,1712 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/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="_IbRcdgKNEeSZ5cZUOQKWkw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_Rk1owAKNEeSZ5cZUOQKWkw" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Rk1owgKNEeSZ5cZUOQKWkw" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Rk1owwKNEeSZ5cZUOQKWkw" type="7016">

-        <children xmi:type="notation:Shape" xmi:id="_PYK84QKNEeSZ5cZUOQKWkw" type="2008">

-          <children xmi:type="notation:DecorationNode" xmi:id="_PYK84wKNEeSZ5cZUOQKWkw" type="5029"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK85AKNEeSZ5cZUOQKWkw" type="7017">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK85QKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK85gKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK85wKNEeSZ5cZUOQKWkw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK86AKNEeSZ5cZUOQKWkw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK86QKNEeSZ5cZUOQKWkw" type="7018">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK86gKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK86wKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK87AKNEeSZ5cZUOQKWkw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK87QKNEeSZ5cZUOQKWkw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK87gKNEeSZ5cZUOQKWkw" type="7019">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK87wKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK88AKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK88QKNEeSZ5cZUOQKWkw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK88gKNEeSZ5cZUOQKWkw"/>

-          </children>

-          <element xmi:type="uml:Class" href="modelUMLClass.uml#_PYK84AKNEeSZ5cZUOQKWkw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK84gKNEeSZ5cZUOQKWkw" x="16" y="50"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_P-y4AQKNEeSZ5cZUOQKWkw" type="2008">

-          <children xmi:type="notation:DecorationNode" xmi:id="_P-y4AwKNEeSZ5cZUOQKWkw" type="5029"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4BAKNEeSZ5cZUOQKWkw" type="7017">

-            <children xmi:type="notation:Shape" xmi:id="_qU6QIQKNEeSZ5cZUOQKWkw" type="3012">

-              <element xmi:type="uml:Property" href="modelUMLClass.uml#_qU6QIAKNEeSZ5cZUOQKWkw"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_qU6QIgKNEeSZ5cZUOQKWkw"/>

-            </children>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4BQKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4BgKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4BwKNEeSZ5cZUOQKWkw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4CAKNEeSZ5cZUOQKWkw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4CQKNEeSZ5cZUOQKWkw" type="7018">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4CgKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4CwKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4DAKNEeSZ5cZUOQKWkw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4DQKNEeSZ5cZUOQKWkw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4DgKNEeSZ5cZUOQKWkw" type="7019">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4DwKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4EAKNEeSZ5cZUOQKWkw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4EQKNEeSZ5cZUOQKWkw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4EgKNEeSZ5cZUOQKWkw"/>

-          </children>

-          <element xmi:type="uml:Class" href="modelUMLClass.uml#_P-y4AAKNEeSZ5cZUOQKWkw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4AgKNEeSZ5cZUOQKWkw" x="350" y="44" width="109" height="119"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Rk1oxAKNEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rk1oxQKNEeSZ5cZUOQKWkw"/>

-      </children>

-      <element xmi:type="uml:Package" href="modelUMLClass.uml#_RkviIAKNEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rk1owQKNEeSZ5cZUOQKWkw" x="26" y="10" width="499" height="291"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_UdqQAQKNEeSZ5cZUOQKWkw" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_UdqQAwKNEeSZ5cZUOQKWkw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQBAKNEeSZ5cZUOQKWkw" type="7017">

-        <children xmi:type="notation:Shape" xmi:id="_pq7fAQKNEeSZ5cZUOQKWkw" type="3012">

-          <element xmi:type="uml:Property" href="modelUMLClass.uml#_pq7fAAKNEeSZ5cZUOQKWkw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pq7fAgKNEeSZ5cZUOQKWkw"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQBQKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQBgKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQBwKNEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQCAKNEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQCQKNEeSZ5cZUOQKWkw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQCgKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQCwKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQDAKNEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQDQKNEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQDgKNEeSZ5cZUOQKWkw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQDwKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQEAKNEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQEQKNEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQEgKNEeSZ5cZUOQKWkw"/>

-      </children>

-      <element xmi:type="uml:Class" href="modelUMLClass.uml#_UdqQAAKNEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQAgKNEeSZ5cZUOQKWkw" x="581" y="69" width="172" height="178"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_IbRcdwKNEeSZ5cZUOQKWkw"/>

-    <element xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>

-    <edges xmi:type="notation:Connector" xmi:id="_VlqZ4AKNEeSZ5cZUOQKWkw" type="4001" source="_PYK84QKNEeSZ5cZUOQKWkw" target="_P-y4AQKNEeSZ5cZUOQKWkw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ4wKNEeSZ5cZUOQKWkw" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ5AKNEeSZ5cZUOQKWkw" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ5QKNEeSZ5cZUOQKWkw" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ5gKNEeSZ5cZUOQKWkw" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ5wKNEeSZ5cZUOQKWkw" type="6003">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ6AKNEeSZ5cZUOQKWkw" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ6QKNEeSZ5cZUOQKWkw" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ6gKNEeSZ5cZUOQKWkw" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ6wKNEeSZ5cZUOQKWkw" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ7AKNEeSZ5cZUOQKWkw" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ7QKNEeSZ5cZUOQKWkw" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ7gKNEeSZ5cZUOQKWkw" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_VlqZ4QKNEeSZ5cZUOQKWkw"/>

-      <element xmi:type="uml:Association" href="modelUMLClass.uml#_VlkTQwKNEeSZ5cZUOQKWkw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VlqZ4gKNEeSZ5cZUOQKWkw" points="[12, -1, -114, 0]$[107, -3, -19, -2]"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VmncIQKNEeSZ5cZUOQKWkw" id="(0.0,0.46218487394957986)"/>

-    </edges>

-  </notation:Diagram>

-  <nattable:Table xmi:id="_wPPgkAKNEeSZ5cZUOQKWkw" name="TableOfViews0" currentRowAxisProvider="_wPPglgKNEeSZ5cZUOQKWkw" currentColumnAxisProvider="_wPPgkQKNEeSZ5cZUOQKWkw">

-    <context xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_wPPgkQKNEeSZ5cZUOQKWkw" description="Provides the features of the views" name="Papyrus Views feature provider">

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPgkgKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/name">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPgkwKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/context">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPglAKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/isOpen">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPglQKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/type">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_wPPglgKNEeSZ5cZUOQKWkw"/>

-  </nattable:Table>

-  <nattable:Table xmi:id="_xVcToAKNEeSZ5cZUOQKWkw" name="GenericTable0" currentRowAxisProvider="_xVcTogKNEeSZ5cZUOQKWkw" currentColumnAxisProvider="_xVcToQKNEeSZ5cZUOQKWkw">

-    <context xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>

-    <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="_xVcToQKNEeSZ5cZUOQKWkw" 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="_x3AvoAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvoQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packagedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvogKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvowKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestedPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestingPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedType"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/profileApplication"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packageMerge"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvswKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedStereotype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvugKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packagedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestedPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestingPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedType"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/profileApplication"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packageMerge"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedStereotype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9wKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-QKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-gKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-wKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL435AKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL435QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ggKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ConnectableElement/end"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/qualifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--igKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/defaultValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/association"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/interface"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/associationEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/subsettedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/owningAssociation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/class"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ngKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TypedElement/type"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--oAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/redefinedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--oQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/opposite"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ogKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--owKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Feature/featuringClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/datatype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Relationship/relatedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7AKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Association/memberEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8AKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Association/isDerived"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8QKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Association/endType"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Association/navigableOwnedEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-gKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_AKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_QKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_gKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_wKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Association/ownedEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5gQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ggKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5gwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5igKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ConnectableElement/end"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/qualifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/defaultValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/association"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/interface"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/associationEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/subsettedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/owningAssociation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ngKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5oAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5oQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ogKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/class"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5owKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TypedElement/type"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/redefinedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/opposite"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Feature/featuringClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/datatype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5rAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPaAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPaQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPagKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPawKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ConnectableElement/end"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/qualifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/defaultValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/association"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/interface"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/associationEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPeAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPeQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/subsettedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPegKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPewKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/owningAssociation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//DeploymentTarget/deployment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfgKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgAKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPggKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/class"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgwKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhQKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TypedElement/type"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhgKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/redefinedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/opposite"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiQKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPigKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Feature/featuringClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiwKNEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Property/datatype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPjAKNEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_xVcTogKNEeSZ5cZUOQKWkw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_x26pAAKNEeSZ5cZUOQKWkw">

-        <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:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_ygZq4AKNEeSZ5cZUOQKWkw">

-        <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:Package" href="modelUMLClass.uml#_RkviIAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_ywnRIAKNEeSZ5cZUOQKWkw">

-        <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:Class" href="modelUMLClass.uml#_PYK84AKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_y9G1AAKNEeSZ5cZUOQKWkw">

-        <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:Class" href="modelUMLClass.uml#_P-y4AAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_zL434AKNEeSZ5cZUOQKWkw">

-        <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:Property" href="modelUMLClass.uml#_qU6QIAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_0DlU4AKNEeSZ5cZUOQKWkw">

-        <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:Association" href="modelUMLClass.uml#_VlkTQwKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_0gq5gAKNEeSZ5cZUOQKWkw">

-        <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:Property" href="modelUMLClass.uml#_VlkTRAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_1xKRAAKNEeSZ5cZUOQKWkw">

-        <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:Class" href="modelUMLClass.uml#_UdqQAAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_1-CPYAKNEeSZ5cZUOQKWkw">

-        <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:Property" href="modelUMLClass.uml#_pq7fAAKNEeSZ5cZUOQKWkw"/>

-      </axis>

-    </rowAxisProvidersHistory>

-  </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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/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="_IbRcdgKNEeSZ5cZUOQKWkw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Rk1owAKNEeSZ5cZUOQKWkw" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Rk1owgKNEeSZ5cZUOQKWkw" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Rk1owwKNEeSZ5cZUOQKWkw" type="7016">
+        <children xmi:type="notation:Shape" xmi:id="_PYK84QKNEeSZ5cZUOQKWkw" type="2008">
+          <children xmi:type="notation:DecorationNode" xmi:id="_PYK84wKNEeSZ5cZUOQKWkw" type="5029"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK85AKNEeSZ5cZUOQKWkw" type="7017">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK85QKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK85gKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK85wKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK86AKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK86QKNEeSZ5cZUOQKWkw" type="7018">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK86gKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK86wKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK87AKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK87QKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_PYK87gKNEeSZ5cZUOQKWkw" type="7019">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_PYK87wKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PYK88AKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PYK88QKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK88gKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <element xmi:type="uml:Class" href="modelUMLClass.uml#_PYK84AKNEeSZ5cZUOQKWkw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PYK84gKNEeSZ5cZUOQKWkw" x="16" y="50"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_P-y4AQKNEeSZ5cZUOQKWkw" type="2008">
+          <children xmi:type="notation:DecorationNode" xmi:id="_P-y4AwKNEeSZ5cZUOQKWkw" type="5029"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4BAKNEeSZ5cZUOQKWkw" type="7017">
+            <children xmi:type="notation:Shape" xmi:id="_qU6QIQKNEeSZ5cZUOQKWkw" type="3012">
+              <element xmi:type="uml:Property" href="modelUMLClass.uml#_qU6QIAKNEeSZ5cZUOQKWkw"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_qU6QIgKNEeSZ5cZUOQKWkw"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4BQKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4BgKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4BwKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4CAKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4CQKNEeSZ5cZUOQKWkw" type="7018">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4CgKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4CwKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4DAKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4DQKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_P-y4DgKNEeSZ5cZUOQKWkw" type="7019">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_P-y4DwKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_P-y4EAKNEeSZ5cZUOQKWkw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_P-y4EQKNEeSZ5cZUOQKWkw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4EgKNEeSZ5cZUOQKWkw"/>
+          </children>
+          <element xmi:type="uml:Class" href="modelUMLClass.uml#_P-y4AAKNEeSZ5cZUOQKWkw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P-y4AgKNEeSZ5cZUOQKWkw" x="350" y="44" width="109" height="119"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Rk1oxAKNEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rk1oxQKNEeSZ5cZUOQKWkw"/>
+      </children>
+      <element xmi:type="uml:Package" href="modelUMLClass.uml#_RkviIAKNEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rk1owQKNEeSZ5cZUOQKWkw" x="26" y="10" width="499" height="291"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UdqQAQKNEeSZ5cZUOQKWkw" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UdqQAwKNEeSZ5cZUOQKWkw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQBAKNEeSZ5cZUOQKWkw" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_pq7fAQKNEeSZ5cZUOQKWkw" type="3012">
+          <element xmi:type="uml:Property" href="modelUMLClass.uml#_pq7fAAKNEeSZ5cZUOQKWkw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_pq7fAgKNEeSZ5cZUOQKWkw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQBQKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQBgKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQBwKNEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQCAKNEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQCQKNEeSZ5cZUOQKWkw" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQCgKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQCwKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQDAKNEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQDQKNEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UdqQDgKNEeSZ5cZUOQKWkw" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UdqQDwKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UdqQEAKNEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UdqQEQKNEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQEgKNEeSZ5cZUOQKWkw"/>
+      </children>
+      <element xmi:type="uml:Class" href="modelUMLClass.uml#_UdqQAAKNEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdqQAgKNEeSZ5cZUOQKWkw" x="581" y="69" width="172" height="178"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_IbRcdwKNEeSZ5cZUOQKWkw"/>
+    <element xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_VlqZ4AKNEeSZ5cZUOQKWkw" type="4001" source="_PYK84QKNEeSZ5cZUOQKWkw" target="_P-y4AQKNEeSZ5cZUOQKWkw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ4wKNEeSZ5cZUOQKWkw" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ5AKNEeSZ5cZUOQKWkw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ5QKNEeSZ5cZUOQKWkw" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ5gKNEeSZ5cZUOQKWkw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ5wKNEeSZ5cZUOQKWkw" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ6AKNEeSZ5cZUOQKWkw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ6QKNEeSZ5cZUOQKWkw" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ6gKNEeSZ5cZUOQKWkw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ6wKNEeSZ5cZUOQKWkw" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ7AKNEeSZ5cZUOQKWkw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VlqZ7QKNEeSZ5cZUOQKWkw" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlqZ7gKNEeSZ5cZUOQKWkw" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_VlqZ4QKNEeSZ5cZUOQKWkw"/>
+      <element xmi:type="uml:Association" href="modelUMLClass.uml#_VlkTQwKNEeSZ5cZUOQKWkw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VlqZ4gKNEeSZ5cZUOQKWkw" points="[12, -1, -114, 0]$[107, -3, -19, -2]"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VmncIQKNEeSZ5cZUOQKWkw" id="(0.0,0.46218487394957986)"/>
+    </edges>
+  </notation:Diagram>
+  <nattable:Table xmi:id="_wPPgkAKNEeSZ5cZUOQKWkw" name="TableOfViews0" currentRowAxisProvider="_wPPglgKNEeSZ5cZUOQKWkw" currentColumnAxisProvider="_wPPgkQKNEeSZ5cZUOQKWkw">
+    <context xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_wPPgkQKNEeSZ5cZUOQKWkw" description="Provides the features of the views" name="Papyrus Views feature provider">
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPgkgKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/name">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPgkwKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/context">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPglAKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/isOpen">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_wPPglQKNEeSZ5cZUOQKWkw" element="nattable_editor_pages:/type">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_wPPglgKNEeSZ5cZUOQKWkw"/>
+  </nattable:Table>
+  <nattable:Table xmi:id="_xVcToAKNEeSZ5cZUOQKWkw" name="GenericTable0" currentRowAxisProvider="_xVcTogKNEeSZ5cZUOQKWkw" currentColumnAxisProvider="_xVcToQKNEeSZ5cZUOQKWkw">
+    <context xmi:type="uml:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>
+    <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="_xVcToQKNEeSZ5cZUOQKWkw" 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="_x3AvoAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvoQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packagedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvogKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvowKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestedPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvpwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestingPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedType"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvqwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/profileApplication"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packageMerge"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvrwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvsgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvswKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedStereotype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvtwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvugKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_x3AvuwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packagedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq4wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestedPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq5wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestingPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedType"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq6wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/profileApplication"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packageMerge"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq7wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq8wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedStereotype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq9wKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-QKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-gKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ygZq-wKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRIwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRJwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRKwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRLwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRMwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRNwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnROwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRPwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRQwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRRwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRSwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRTwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ywnRUwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1AwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1BwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1CwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1DwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1EwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1FwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1GwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1HwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1IwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1JwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1KwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1LwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_y9G1MwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL434wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL435AKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL435QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ggKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--gwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--hwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ConnectableElement/end"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/qualifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--igKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--iwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/defaultValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/association"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/interface"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--jwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/associationEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--kwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/subsettedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/owningAssociation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--lwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--mwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/class"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ngKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--nwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TypedElement/type"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--oAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/redefinedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--oQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/opposite"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--ogKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--owKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Feature/featuringClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/datatype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zL--pgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Relationship/relatedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU4wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU5wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU6wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7AKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Association/memberEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU7wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8AKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Association/isDerived"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8QKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU8wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Association/endType"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU9wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Association/navigableOwnedEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-gKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU-wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_AKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_QKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_gKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlU_wKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVAwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Association/ownedEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVBwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0DlVCwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5gQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ggKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5gwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5hwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5igKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5iwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ConnectableElement/end"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5jwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/qualifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/defaultValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/association"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5kwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/interface"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5lwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/associationEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/subsettedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5mwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/owningAssociation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ngKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5nwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5oAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5oQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5ogKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/class"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5owKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TypedElement/type"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/redefinedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5pwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/opposite"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Feature/featuringClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5qwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/datatype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0gq5rAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRAwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRBwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRCwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRDwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKREwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRFwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRGwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRHwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRIwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRJwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRKwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRLwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1xKRMwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPYwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPZwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPaAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPaQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPagKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPawKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ConnectableElement/end"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPbwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/qualifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/defaultValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/association"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPcwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/interface"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPdwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/associationEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPeAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPeQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/subsettedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPegKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPewKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/owningAssociation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//DeploymentTarget/deployment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfgKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPfwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgAKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPggKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/class"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPgwKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhQKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TypedElement/type"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhgKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/redefinedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPhwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/opposite"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiQKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPigKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Feature/featuringClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPiwKNEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Property/datatype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_1-CPjAKNEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_xVcTogKNEeSZ5cZUOQKWkw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_x26pAAKNEeSZ5cZUOQKWkw">
+        <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:Model" href="modelUMLClass.uml#_IbRcdAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_ygZq4AKNEeSZ5cZUOQKWkw">
+        <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:Package" href="modelUMLClass.uml#_RkviIAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_ywnRIAKNEeSZ5cZUOQKWkw">
+        <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:Class" href="modelUMLClass.uml#_PYK84AKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_y9G1AAKNEeSZ5cZUOQKWkw">
+        <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:Class" href="modelUMLClass.uml#_P-y4AAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_zL434AKNEeSZ5cZUOQKWkw">
+        <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:Property" href="modelUMLClass.uml#_qU6QIAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_0DlU4AKNEeSZ5cZUOQKWkw">
+        <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:Association" href="modelUMLClass.uml#_VlkTQwKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_0gq5gAKNEeSZ5cZUOQKWkw">
+        <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:Property" href="modelUMLClass.uml#_VlkTRAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_1xKRAAKNEeSZ5cZUOQKWkw">
+        <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:Class" href="modelUMLClass.uml#_UdqQAAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_1-CPYAKNEeSZ5cZUOQKWkw">
+        <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:Property" href="modelUMLClass.uml#_pq7fAAKNEeSZ5cZUOQKWkw"/>
+      </axis>
+    </rowAxisProvidersHistory>
+  </nattable:Table>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.uml
index 43c57333080..2412b76831b 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/modelUMLClass.uml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_IbRcdAKNEeSZ5cZUOQKWkw" name="Model">

-  <packagedElement xmi:type="uml:Package" xmi:id="_RkviIAKNEeSZ5cZUOQKWkw" name="Package1">

-    <packagedElement xmi:type="uml:Class" xmi:id="_PYK84AKNEeSZ5cZUOQKWkw" name="Class1">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VlkTQAKNEeSZ5cZUOQKWkw" name="class2" type="_P-y4AAKNEeSZ5cZUOQKWkw" association="_VlkTQwKNEeSZ5cZUOQKWkw">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VlkTQQKNEeSZ5cZUOQKWkw" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VlkTQgKNEeSZ5cZUOQKWkw" value="1"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_P-y4AAKNEeSZ5cZUOQKWkw" name="Class2">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_qU6QIAKNEeSZ5cZUOQKWkw" name="Attribute2.1" visibility="public">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qg758AKNEeSZ5cZUOQKWkw" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qhCAkAKNEeSZ5cZUOQKWkw" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_qhCAkQKNEeSZ5cZUOQKWkw">

-          <value xsi:nil="true"/>

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_VlkTQwKNEeSZ5cZUOQKWkw" name="class1_class2_1" memberEnd="_VlkTRAKNEeSZ5cZUOQKWkw _VlkTQAKNEeSZ5cZUOQKWkw">

-      <ownedEnd xmi:type="uml:Property" xmi:id="_VlkTRAKNEeSZ5cZUOQKWkw" name="class1" type="_PYK84AKNEeSZ5cZUOQKWkw" association="_VlkTQwKNEeSZ5cZUOQKWkw">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VlkTRQKNEeSZ5cZUOQKWkw" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VlkTRgKNEeSZ5cZUOQKWkw" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_UdqQAAKNEeSZ5cZUOQKWkw" name="Class3">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_pq7fAAKNEeSZ5cZUOQKWkw" name="Attribute3.1" visibility="public">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p4ZTQAKNEeSZ5cZUOQKWkw" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p4ZTQQKNEeSZ5cZUOQKWkw" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_p4fZ4AKNEeSZ5cZUOQKWkw">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_IbRcdAKNEeSZ5cZUOQKWkw" name="Model">
+  <packagedElement xmi:type="uml:Package" xmi:id="_RkviIAKNEeSZ5cZUOQKWkw" name="Package1">
+    <packagedElement xmi:type="uml:Class" xmi:id="_PYK84AKNEeSZ5cZUOQKWkw" name="Class1">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VlkTQAKNEeSZ5cZUOQKWkw" name="class2" type="_P-y4AAKNEeSZ5cZUOQKWkw" association="_VlkTQwKNEeSZ5cZUOQKWkw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VlkTQQKNEeSZ5cZUOQKWkw" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VlkTQgKNEeSZ5cZUOQKWkw" value="1"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_P-y4AAKNEeSZ5cZUOQKWkw" name="Class2">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_qU6QIAKNEeSZ5cZUOQKWkw" name="Attribute2.1" visibility="public">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qg758AKNEeSZ5cZUOQKWkw" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qhCAkAKNEeSZ5cZUOQKWkw" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_qhCAkQKNEeSZ5cZUOQKWkw">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_VlkTQwKNEeSZ5cZUOQKWkw" name="class1_class2_1" memberEnd="_VlkTRAKNEeSZ5cZUOQKWkw _VlkTQAKNEeSZ5cZUOQKWkw">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VlkTRAKNEeSZ5cZUOQKWkw" name="class1" type="_PYK84AKNEeSZ5cZUOQKWkw" association="_VlkTQwKNEeSZ5cZUOQKWkw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VlkTRQKNEeSZ5cZUOQKWkw" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VlkTRgKNEeSZ5cZUOQKWkw" value="1"/>
+      </ownedEnd>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_UdqQAAKNEeSZ5cZUOQKWkw" name="Class3">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_pq7fAAKNEeSZ5cZUOQKWkw" name="Attribute3.1" visibility="public">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p4ZTQAKNEeSZ5cZUOQKWkw" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p4ZTQQKNEeSZ5cZUOQKWkw" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_p4fZ4AKNEeSZ5cZUOQKWkw">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/Activator.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/Activator.java
index 087181f1d23..7f0719536ce 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/Activator.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/Activator.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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.generic.tests;

-

-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.uml.nattable.generic.tests"; //$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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.generic.tests;
+
+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.uml.nattable.generic.tests"; //$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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/RevealGenericTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/RevealGenericTableTest.java
index c75661c3ca1..be448f55d80 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/RevealGenericTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/RevealGenericTableTest.java
@@ -1,492 +1,492 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.generic.tests.tests;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;

-import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;

-import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;

-import org.eclipse.papyrus.uml.nattable.generic.tests.Activator;

-import org.eclipse.ui.ISelectionService;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Package;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-

-

-public class RevealGenericTableTest extends AbstractEditorTest {

-

-	protected Resource di;

-

-	protected Resource notation;

-

-	protected Resource uml;

-

-	protected Model rootModel;

-

-	protected Class classTest;

-

-	protected List<?> elementListTest;

-

-	protected Package packageTest;

-

-

-	/**

-	 * 

-	 * Constructor.

-	 * This plugin test the ModelExplorerView

-	 */

-	public RevealGenericTableTest() {

-		super();

-	}

-

-	@Before

-	public void initTests() throws CoreException, IOException {

-		try {

-			initModel("RevealGenericTableTest", "modelUMLClass", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-

-		ResourceSet set = null;

-		try {

-			set = getModelSet();

-		} catch (ServiceException e) {

-			e.printStackTrace();

-		}

-

-		List<Resource> resources = set.getResources();

-

-		for (Resource current : resources) {

-			if (current.getURI().lastSegment().equals("modelUMLClass.uml")) { //$NON-NLS-1$

-				this.uml = current;

-			} else if (current.getURI().lastSegment().equals("modelUMLClass.notation")) { //$NON-NLS-1$

-				this.notation = current;

-			} else if (current.getURI().lastSegment().equals("modelUMLClass.di")) { //$NON-NLS-1$

-				this.di = current;

-			}

-		}

-

-		this.rootModel = (Model) this.uml.getContents().get(0);

-	}

-

-	protected List<Integer> convertRowPositionToRowIndex(int[] rowPosition, SelectionLayer layer) {

-		List<Integer> rowIndex = new ArrayList<Integer>();

-		for (int i = 0; i < rowPosition.length; i++) {

-			Integer index = Integer.valueOf(layer.getRowIndexByPosition(rowPosition[i]));

-			rowIndex.add(index);

-		}

-		return rowIndex;

-	}

-

-	protected List<Integer> convertColumnPositionToColumnIndex(int[] columnPosition, SelectionLayer layer) {

-		List<Integer> columnIndex = new ArrayList<Integer>();

-		for (int i = 0; i < columnPosition.length; i++) {

-			Integer index = Integer.valueOf(layer.getColumnIndexByPosition((columnPosition[i])));

-			columnIndex.add(index);

-		}

-		return columnIndex;

-	}

-

-	/**

-	 * select an element from the model and seek it in the generic table,

-	 * then proceed to check that its row has been correctly selected and that none of the columns are

-	 */

-	@Test

-	public void test1_SelectElement() {

-		// select the element

-		this.classTest = (Class) this.rootModel.getMember("Class3"); //$NON-NLS-1$

-		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);

-		// verify that the axis is not inverted

-		if (manager.getTable().isInvertAxis()) {

-			manager.invertAxis();

-		}

-

-		Assert.assertTrue("failed to find: " + this.classTest.getName(), this.classTest.getName().equals("Class3")); //$NON-NLS-1$//$NON-NLS-2$

-

-		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);

-		// spoofs the behavior when the link with editor button is activated

-		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.classTest);

-		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-		final ISelection selection = serv.getSelection();

-

-		Assert.assertTrue(selection instanceof IStructuredSelection);

-		Object currentAxisObject = ((IStructuredSelection) selection).getFirstElement();

-		Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);

-		// verify that the same element has been selected on both sides

-		Assert.assertTrue("failed to match the selection with: " + this.classTest.getName(), this.classTest.equals(currentRealObject)); //$NON-NLS-1$

-

-		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();

-		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();

-

-

-		// verify that the line selected is indeed the line corresponding to the element selected in the model explorer

-		// Assert.assertTrue("index of row does not match: " + rowSelectedPositions[0], rowSelectedPositions[0] == 7); //$NON-NLS-1$

-		// Assert.assertTrue("number of selected columns does not match: " + columnSelectedPositions.length, columnSelectedPositions.length == 0); //$NON-NLS-1$

-

-		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);

-		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);

-		Assert.assertEquals("number of selected rows does not match", 1, rowIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("number of selected columns does not match", 0, columnIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("index of selected row does not match", 7, rowIndex.get(0).intValue()); //$NON-NLS-1$

-	}

-

-	/**

-	 * select multiple elements from the model and seek them in the generic table,

-	 * then proceed to check that their rows have been correctly selected and that none of the columns are

-	 */

-	@Test

-	public void test2_SelectMultipleElements() {

-		this.elementListTest = (this.rootModel.getMember("Package1").getOwnedElements()); //$NON-NLS-1$

-		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);

-		if (manager.getTable().isInvertAxis()) {

-			manager.invertAxis();

-		}

-

-		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);

-		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.elementListTest);

-		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-		final ISelection selection = serv.getSelection();

-

-		Assert.assertTrue(selection instanceof IStructuredSelection);

-		List<?> selectedRowElements = ((IStructuredSelection) selection).toList();

-		for (int index = 0; index < selectedRowElements.size(); index++) {

-			Object currentAxisObject = selectedRowElements.get(index);

-			Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);

-			Assert.assertTrue("failed to match the selection", this.elementListTest.contains(currentRealObject)); //$NON-NLS-1$

-		}

-

-		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();

-		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();

-

-		// Assert.assertTrue("index of row does not match", rowSelectedPositions.length == 3); //$NON-NLS-1$

-		// Assert.assertTrue("index of row does not match", rowSelectedPositions[0] == 5); //$NON-NLS-1$

-		// Assert.assertTrue("index of row does not match", rowSelectedPositions[1] == 2); //$NON-NLS-1$

-		// Assert.assertTrue("index of row does not match", rowSelectedPositions[2] == 3); //$NON-NLS-1$

-		// Assert.assertTrue("number of selected columns does not match: " + columnSelectedPositions.length, columnSelectedPositions.length == 0); //$NON-NLS-1$

-

-		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);

-		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);

-		Assert.assertEquals("number of selected rows does not match", 3, rowIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("number of selected columns does not match", 0, columnIndex.size()); //$NON-NLS-1$

-		Assert.assertTrue("row 2 is not in the selection", rowIndex.contains(Integer.valueOf(2))); //$NON-NLS-1$

-		Assert.assertTrue("row 3 is not in the selection", rowIndex.contains(Integer.valueOf(3))); //$NON-NLS-1$

-		Assert.assertTrue("row 5 is not in the selection", rowIndex.contains(Integer.valueOf(5))); //$NON-NLS-1$

-

-	}

-

-	/**

-	 * select an element from the model and seek it in the generic table that has had its axis inverted,

-	 * then proceed to check that its column has been correctly selected and that none of the rows are

-	 */

-	@Test

-	public void test3_SelectElementInvertAxis() {

-		this.classTest = (Class) this.rootModel.getMember("Class3"); //$NON-NLS-1$

-		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);

-		if (!manager.getTable().isInvertAxis()) {

-			manager.invertAxis();

-		}

-

-		Assert.assertTrue("failed to find: " + this.classTest.getName(), this.classTest.getName().equals("Class3")); //$NON-NLS-1$//$NON-NLS-2$

-

-		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);

-		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.classTest);

-		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-		final ISelection selection = serv.getSelection();

-

-		Assert.assertTrue(selection instanceof IStructuredSelection);

-		Object currentAxisObject = ((IStructuredSelection) selection).getFirstElement();

-		Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);

-		Assert.assertTrue("failed to match the selection with: " + this.classTest.getName(), this.classTest.equals(currentRealObject)); //$NON-NLS-1$

-

-		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();

-		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();

-		// Assert.assertTrue("index of row does not match: " + columnSelectedPositions[0], columnSelectedPositions[0] == 7); //$NON-NLS-1$

-		// Assert.assertTrue("number of selected columns does not match: " + rowSelectedPositions.length, rowSelectedPositions.length == 0); //$NON-NLS-1$

-

-		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);

-		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);

-		Assert.assertEquals("number of selected rows does not match", 0, rowIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("number of selected columns does not match", 1, columnIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("index of selected row does not match", 7, columnIndex.get(0).intValue()); //$NON-NLS-1$

-

-	}

-

-	/**

-	 * select multiple elements from the model and seek them in the generic table that has had its axis inverted,

-	 * then proceed to check that their columns have been correctly selected and that none of the rows are

-	 */

-	@Test

-	public void test4_SelectMultipleElementsInvertAxis() {

-		this.elementListTest = (this.rootModel.getMember("Package1").getOwnedElements()); //$NON-NLS-1$

-		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);

-		if (!manager.getTable().isInvertAxis()) {

-			manager.invertAxis();

-		}

-

-		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);

-		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.elementListTest);

-		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-		final ISelection selection = serv.getSelection();

-

-		Assert.assertTrue(selection instanceof IStructuredSelection);

-		List<?> selectedRowElements = ((IStructuredSelection) selection).toList();

-		for (int index = 0; index < selectedRowElements.size(); index++) {

-			Object currentAxisObject = selectedRowElements.get(index);

-			Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);

-			Assert.assertTrue("failed to match the selection", this.elementListTest.contains(currentRealObject)); //$NON-NLS-1$

-		}

-

-		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();

-		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();

-

-		// Assert.assertTrue("index of column does not match", columnSelectedPositions.length == 3); //$NON-NLS-1$

-		// Assert.assertTrue("index of column does not match", columnSelectedPositions[0] == 2); //$NON-NLS-1$

-		// Assert.assertTrue("index of column does not match", columnSelectedPositions[1] == 3); //$NON-NLS-1$

-		// Assert.assertTrue("index of column does not match", columnSelectedPositions[2] == 5); //$NON-NLS-1$

-		// Assert.assertTrue("number of selected rows does not match: " + rowSelectedPositions.length, rowSelectedPositions.length == 0); //$NON-NLS-1$

-

-		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);

-		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);

-		Assert.assertEquals("number of selected rows does not match", 3, columnIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("number of selected columns does not match", 0, rowIndex.size()); //$NON-NLS-1$

-		Assert.assertTrue("row 2 is not in the selection", columnIndex.contains(Integer.valueOf(2))); //$NON-NLS-1$

-		Assert.assertTrue("row 3 is not in the selection", columnIndex.contains(Integer.valueOf(3))); //$NON-NLS-1$

-		Assert.assertTrue("row 5 is not in the selection", columnIndex.contains(Integer.valueOf(5))); //$NON-NLS-1$

-

-	}

-

-

-	/**

-	 * select an element from the model and seek it in the sorted generic table,

-	 * then proceed to check that its row has been correctly selected and that none of the columns are

-	 */

-	@Test

-	public void test5_SelectSortedElement() {

-		this.classTest = (Class) this.rootModel.getMember("Class3"); //$NON-NLS-1$

-		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);

-		if (manager.getTable().isInvertAxis()) {

-			manager.invertAxis();

-		}

-		manager.sortRowsByName(true);

-

-		Assert.assertTrue("failed to find: " + this.classTest.getName(), this.classTest.getName().equals("Class3")); //$NON-NLS-1$//$NON-NLS-2$

-

-		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);

-		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.classTest);

-		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-		final ISelection selection = serv.getSelection();

-

-		Assert.assertTrue(selection instanceof IStructuredSelection);

-		Object currentAxisObject = ((IStructuredSelection) selection).getFirstElement();

-		Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);

-		Assert.assertTrue("failed to match the selection with: " + this.classTest.getName(), this.classTest.equals(currentRealObject)); //$NON-NLS-1$

-

-		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();

-		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();

-//		Assert.assertTrue("index of row does not match: " + rowSelectedPositions[0], rowSelectedPositions[0] == 6); //$NON-NLS-1$

-//		Assert.assertTrue("number of selected columns does not match: " + columnSelectedPositions.length, columnSelectedPositions.length == 0); //$NON-NLS-1$

-

-

-		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);

-		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);

-		Assert.assertEquals("number of selected rows does not match", 1, rowIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("number of selected columns does not match", 0, columnIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("index of selected row does not match", 6, rowIndex.get(0).intValue()); //$NON-NLS-1$

-

-

-	}

-

-	/**

-	 * select multiple elements from the model and seek them in the sorted generic table,

-	 * then proceed to check that their rows have been correctly selected and that none of the columns are

-	 */

-	@Test

-	public void test6_SelectMultipleSortedElements() {

-		this.elementListTest = (this.rootModel.getMember("Package1").getOwnedElements()); //$NON-NLS-1$

-		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);

-		if (manager.getTable().isInvertAxis()) {

-			manager.invertAxis();

-		}

-		manager.sortRowsByName(true);

-

-		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);

-		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.elementListTest);

-		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-		final ISelection selection = serv.getSelection();

-

-		Assert.assertTrue(selection instanceof IStructuredSelection);

-		List<?> selectedRowElements = ((IStructuredSelection) selection).toList();

-		for (int index = 0; index < selectedRowElements.size(); index++) {

-			Object currentAxisObject = selectedRowElements.get(index);

-			Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);

-			Assert.assertTrue("failed to match the selection", this.elementListTest.contains(currentRealObject)); //$NON-NLS-1$

-		}

-

-		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();

-		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();

-

-//		Assert.assertTrue("index of row does not match", rowSelectedPositions.length == 3); //$NON-NLS-1$

-//		Assert.assertTrue("index of row does not match", rowSelectedPositions[0] == 2); //$NON-NLS-1$

-//		Assert.assertTrue("index of row does not match", rowSelectedPositions[1] == 4); //$NON-NLS-1$

-//		Assert.assertTrue("index of row does not match", rowSelectedPositions[2] == 5); //$NON-NLS-1$

-//		Assert.assertTrue("number of selected columns does not match: " + columnSelectedPositions.length, columnSelectedPositions.length == 0); //$NON-NLS-1$

-		

-		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);

-		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);

-		Assert.assertEquals("number of selected rows does not match", 3, rowIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("number of selected columns does not match", 0, columnIndex.size()); //$NON-NLS-1$

-		Assert.assertTrue("row 2 is not in the selection", rowIndex.contains(Integer.valueOf(2))); //$NON-NLS-1$

-		Assert.assertTrue("row 4 is not in the selection", rowIndex.contains(Integer.valueOf(4))); //$NON-NLS-1$

-		Assert.assertTrue("row 5 is not in the selection", rowIndex.contains(Integer.valueOf(5))); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * select an element from the model and seek it in the generic table that has had its axis inverted and its elements sorted,

-	 * then proceed to check that its column has been correctly selected and that none of the rows are

-	 */

-	@Test

-	@Ignore

-	// sortColumns/Rows is not yet supported with invertAxis

-	public void test7_SelectSortedElementInvertAxis() {

-		this.classTest = (Class) this.rootModel.getMember("Class3"); //$NON-NLS-1$

-		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);

-		if (!manager.getTable().isInvertAxis()) {

-			manager.invertAxis();

-		}

-		manager.sortColumnsByName(true);

-

-		Assert.assertTrue("failed to find: " + this.classTest.getName(), this.classTest.getName().equals("Class3")); //$NON-NLS-1$//$NON-NLS-2$

-

-		Assert.assertTrue(editor.getActiveEditor() instanceof IRevealSemanticElement);

-		((IRevealSemanticElement) this.editor.getActiveEditor()).revealSemanticElement(Collections.singletonList(this.classTest));

-		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-		final ISelection selection = serv.getSelection();

-

-		Assert.assertTrue(selection instanceof IStructuredSelection);

-		Object currentAxisObject = ((IStructuredSelection) selection).getFirstElement();

-		Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);

-		Assert.assertTrue("failed to match the selection with: " + this.classTest.getName(), this.classTest.equals(currentRealObject)); //$NON-NLS-1$

-

-		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();

-		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();

-//		Assert.assertTrue("index of row does not match: " + columnSelectedPositions[0], columnSelectedPositions[0] == 6); //$NON-NLS-1$

-//		Assert.assertTrue("number of selected columns does not match: " + rowSelectedPositions.length, rowSelectedPositions.length == 0); //$NON-NLS-1$

-

-		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);

-		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);

-		Assert.assertEquals("number of selected rows does not match", 0, rowIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("number of selected columns does not match", 1, columnIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("index of selected column does not match", 6, columnIndex.get(0).intValue()); //$NON-NLS-1$

-	}

-

-	/**

-	 * select multiple elements from the model and seek them in the generic table that has had its axis inverted and its elements sorted,

-	 * then proceed to check that their columns have been correctly selected and that none of the rows are

-	 */

-	@Test

-	@Ignore

-	// sortColumns/Rows is not yet supported with invertAxis

-	public void test8_SelectMultipleSortedElementsInvertAxis() {

-		this.elementListTest = (this.rootModel.getMember("Package1").getOwnedElements()); //$NON-NLS-1$

-		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);

-		if (!manager.getTable().isInvertAxis()) {

-			manager.invertAxis();

-		}

-		manager.sortColumnsByName(true);

-

-		Assert.assertTrue(editor.getActiveEditor() instanceof IRevealSemanticElement);

-		((IRevealSemanticElement) this.editor.getActiveEditor()).revealSemanticElement(this.elementListTest);

-		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-		final ISelection selection = serv.getSelection();

-

-		Assert.assertTrue(selection instanceof IStructuredSelection);

-		List<?> selectedRowElements = ((IStructuredSelection) selection).toList();

-		for (int index = 0; index < selectedRowElements.size(); index++) {

-			Object currentAxisObject = selectedRowElements.get(index);

-			Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);

-			Assert.assertTrue("failed to match the selection", this.elementListTest.contains(currentRealObject)); //$NON-NLS-1$

-		}

-

-		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();

-		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();

-

-		Assert.assertTrue("index of column does not match", columnSelectedPositions.length == 3); //$NON-NLS-1$

-		Assert.assertTrue("index of column does not match", columnSelectedPositions[0] == 2); //$NON-NLS-1$

-		Assert.assertTrue("index of column does not match", columnSelectedPositions[1] == 4); //$NON-NLS-1$

-		Assert.assertTrue("index of column does not match", columnSelectedPositions[2] == 5); //$NON-NLS-1$

-		Assert.assertTrue("number of selected rows does not match: " + rowSelectedPositions.length, rowSelectedPositions.length == 0); //$NON-NLS-1$

-		

-		

-		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);

-		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);

-		Assert.assertEquals("number of selected rows does not match", 0, rowIndex.size()); //$NON-NLS-1$

-		Assert.assertEquals("number of selected columns does not match", 3, columnIndex.size()); //$NON-NLS-1$

-		Assert.assertTrue("column 2 is not in the selection", columnIndex.contains(Integer.valueOf(2))); //$NON-NLS-1$

-		Assert.assertTrue("column 4 is not in the selection", columnIndex.contains(Integer.valueOf(4))); //$NON-NLS-1$

-		Assert.assertTrue("column 5 is not in the selection", columnIndex.contains(Integer.valueOf(5))); //$NON-NLS-1$

-

-	}

-

-

-	@Override

-	protected Bundle getBundle() {

-		return Activator.getDefault().getBundle();

-	}

-

-	@Override

-	protected String getSourcePath() {

-		return "resources/"; //$NON-NLS-1$

-	}

-

-	protected void selectTablePage(int index) {

-		try {

-			Object tablePage = getPageManager().allPages().get(index);

-			// getPageManager().closeAllOpenedPages();

-			// getPageManager().openPage(tablePage);

-			getPageManager().selectPage(tablePage);

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.generic.tests.tests;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;
+import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;
+import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.nattable.generic.tests.Activator;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Package;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+
+public class RevealGenericTableTest extends AbstractEditorTest {
+
+	protected Resource di;
+
+	protected Resource notation;
+
+	protected Resource uml;
+
+	protected Model rootModel;
+
+	protected Class classTest;
+
+	protected List<?> elementListTest;
+
+	protected Package packageTest;
+
+
+	/**
+	 * 
+	 * Constructor.
+	 * This plugin test the ModelExplorerView
+	 */
+	public RevealGenericTableTest() {
+		super();
+	}
+
+	@Before
+	public void initTests() throws CoreException, IOException {
+		try {
+			initModel("RevealGenericTableTest", "modelUMLClass", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		ResourceSet set = null;
+		try {
+			set = getModelSet();
+		} catch (ServiceException e) {
+			e.printStackTrace();
+		}
+
+		List<Resource> resources = set.getResources();
+
+		for (Resource current : resources) {
+			if (current.getURI().lastSegment().equals("modelUMLClass.uml")) { //$NON-NLS-1$
+				this.uml = current;
+			} else if (current.getURI().lastSegment().equals("modelUMLClass.notation")) { //$NON-NLS-1$
+				this.notation = current;
+			} else if (current.getURI().lastSegment().equals("modelUMLClass.di")) { //$NON-NLS-1$
+				this.di = current;
+			}
+		}
+
+		this.rootModel = (Model) this.uml.getContents().get(0);
+	}
+
+	protected List<Integer> convertRowPositionToRowIndex(int[] rowPosition, SelectionLayer layer) {
+		List<Integer> rowIndex = new ArrayList<Integer>();
+		for (int i = 0; i < rowPosition.length; i++) {
+			Integer index = Integer.valueOf(layer.getRowIndexByPosition(rowPosition[i]));
+			rowIndex.add(index);
+		}
+		return rowIndex;
+	}
+
+	protected List<Integer> convertColumnPositionToColumnIndex(int[] columnPosition, SelectionLayer layer) {
+		List<Integer> columnIndex = new ArrayList<Integer>();
+		for (int i = 0; i < columnPosition.length; i++) {
+			Integer index = Integer.valueOf(layer.getColumnIndexByPosition((columnPosition[i])));
+			columnIndex.add(index);
+		}
+		return columnIndex;
+	}
+
+	/**
+	 * select an element from the model and seek it in the generic table,
+	 * then proceed to check that its row has been correctly selected and that none of the columns are
+	 */
+	@Test
+	public void test1_SelectElement() {
+		// select the element
+		this.classTest = (Class) this.rootModel.getMember("Class3"); //$NON-NLS-1$
+		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);
+		// verify that the axis is not inverted
+		if (manager.getTable().isInvertAxis()) {
+			manager.invertAxis();
+		}
+
+		Assert.assertTrue("failed to find: " + this.classTest.getName(), this.classTest.getName().equals("Class3")); //$NON-NLS-1$//$NON-NLS-2$
+
+		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);
+		// spoofs the behavior when the link with editor button is activated
+		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.classTest);
+		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+		final ISelection selection = serv.getSelection();
+
+		Assert.assertTrue(selection instanceof IStructuredSelection);
+		Object currentAxisObject = ((IStructuredSelection) selection).getFirstElement();
+		Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);
+		// verify that the same element has been selected on both sides
+		Assert.assertTrue("failed to match the selection with: " + this.classTest.getName(), this.classTest.equals(currentRealObject)); //$NON-NLS-1$
+
+		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();
+		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();
+		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();
+
+
+		// verify that the line selected is indeed the line corresponding to the element selected in the model explorer
+		// Assert.assertTrue("index of row does not match: " + rowSelectedPositions[0], rowSelectedPositions[0] == 7); //$NON-NLS-1$
+		// Assert.assertTrue("number of selected columns does not match: " + columnSelectedPositions.length, columnSelectedPositions.length == 0); //$NON-NLS-1$
+
+		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);
+		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);
+		Assert.assertEquals("number of selected rows does not match", 1, rowIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("number of selected columns does not match", 0, columnIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("index of selected row does not match", 7, rowIndex.get(0).intValue()); //$NON-NLS-1$
+	}
+
+	/**
+	 * select multiple elements from the model and seek them in the generic table,
+	 * then proceed to check that their rows have been correctly selected and that none of the columns are
+	 */
+	@Test
+	public void test2_SelectMultipleElements() {
+		this.elementListTest = (this.rootModel.getMember("Package1").getOwnedElements()); //$NON-NLS-1$
+		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);
+		if (manager.getTable().isInvertAxis()) {
+			manager.invertAxis();
+		}
+
+		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);
+		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.elementListTest);
+		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+		final ISelection selection = serv.getSelection();
+
+		Assert.assertTrue(selection instanceof IStructuredSelection);
+		List<?> selectedRowElements = ((IStructuredSelection) selection).toList();
+		for (int index = 0; index < selectedRowElements.size(); index++) {
+			Object currentAxisObject = selectedRowElements.get(index);
+			Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);
+			Assert.assertTrue("failed to match the selection", this.elementListTest.contains(currentRealObject)); //$NON-NLS-1$
+		}
+
+		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();
+		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();
+		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();
+
+		// Assert.assertTrue("index of row does not match", rowSelectedPositions.length == 3); //$NON-NLS-1$
+		// Assert.assertTrue("index of row does not match", rowSelectedPositions[0] == 5); //$NON-NLS-1$
+		// Assert.assertTrue("index of row does not match", rowSelectedPositions[1] == 2); //$NON-NLS-1$
+		// Assert.assertTrue("index of row does not match", rowSelectedPositions[2] == 3); //$NON-NLS-1$
+		// Assert.assertTrue("number of selected columns does not match: " + columnSelectedPositions.length, columnSelectedPositions.length == 0); //$NON-NLS-1$
+
+		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);
+		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);
+		Assert.assertEquals("number of selected rows does not match", 3, rowIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("number of selected columns does not match", 0, columnIndex.size()); //$NON-NLS-1$
+		Assert.assertTrue("row 2 is not in the selection", rowIndex.contains(Integer.valueOf(2))); //$NON-NLS-1$
+		Assert.assertTrue("row 3 is not in the selection", rowIndex.contains(Integer.valueOf(3))); //$NON-NLS-1$
+		Assert.assertTrue("row 5 is not in the selection", rowIndex.contains(Integer.valueOf(5))); //$NON-NLS-1$
+
+	}
+
+	/**
+	 * select an element from the model and seek it in the generic table that has had its axis inverted,
+	 * then proceed to check that its column has been correctly selected and that none of the rows are
+	 */
+	@Test
+	public void test3_SelectElementInvertAxis() {
+		this.classTest = (Class) this.rootModel.getMember("Class3"); //$NON-NLS-1$
+		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);
+		if (!manager.getTable().isInvertAxis()) {
+			manager.invertAxis();
+		}
+
+		Assert.assertTrue("failed to find: " + this.classTest.getName(), this.classTest.getName().equals("Class3")); //$NON-NLS-1$//$NON-NLS-2$
+
+		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);
+		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.classTest);
+		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+		final ISelection selection = serv.getSelection();
+
+		Assert.assertTrue(selection instanceof IStructuredSelection);
+		Object currentAxisObject = ((IStructuredSelection) selection).getFirstElement();
+		Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);
+		Assert.assertTrue("failed to match the selection with: " + this.classTest.getName(), this.classTest.equals(currentRealObject)); //$NON-NLS-1$
+
+		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();
+		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();
+		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();
+		// Assert.assertTrue("index of row does not match: " + columnSelectedPositions[0], columnSelectedPositions[0] == 7); //$NON-NLS-1$
+		// Assert.assertTrue("number of selected columns does not match: " + rowSelectedPositions.length, rowSelectedPositions.length == 0); //$NON-NLS-1$
+
+		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);
+		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);
+		Assert.assertEquals("number of selected rows does not match", 0, rowIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("number of selected columns does not match", 1, columnIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("index of selected row does not match", 7, columnIndex.get(0).intValue()); //$NON-NLS-1$
+
+	}
+
+	/**
+	 * select multiple elements from the model and seek them in the generic table that has had its axis inverted,
+	 * then proceed to check that their columns have been correctly selected and that none of the rows are
+	 */
+	@Test
+	public void test4_SelectMultipleElementsInvertAxis() {
+		this.elementListTest = (this.rootModel.getMember("Package1").getOwnedElements()); //$NON-NLS-1$
+		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);
+		if (!manager.getTable().isInvertAxis()) {
+			manager.invertAxis();
+		}
+
+		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);
+		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.elementListTest);
+		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+		final ISelection selection = serv.getSelection();
+
+		Assert.assertTrue(selection instanceof IStructuredSelection);
+		List<?> selectedRowElements = ((IStructuredSelection) selection).toList();
+		for (int index = 0; index < selectedRowElements.size(); index++) {
+			Object currentAxisObject = selectedRowElements.get(index);
+			Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);
+			Assert.assertTrue("failed to match the selection", this.elementListTest.contains(currentRealObject)); //$NON-NLS-1$
+		}
+
+		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();
+		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();
+		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();
+
+		// Assert.assertTrue("index of column does not match", columnSelectedPositions.length == 3); //$NON-NLS-1$
+		// Assert.assertTrue("index of column does not match", columnSelectedPositions[0] == 2); //$NON-NLS-1$
+		// Assert.assertTrue("index of column does not match", columnSelectedPositions[1] == 3); //$NON-NLS-1$
+		// Assert.assertTrue("index of column does not match", columnSelectedPositions[2] == 5); //$NON-NLS-1$
+		// Assert.assertTrue("number of selected rows does not match: " + rowSelectedPositions.length, rowSelectedPositions.length == 0); //$NON-NLS-1$
+
+		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);
+		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);
+		Assert.assertEquals("number of selected rows does not match", 3, columnIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("number of selected columns does not match", 0, rowIndex.size()); //$NON-NLS-1$
+		Assert.assertTrue("row 2 is not in the selection", columnIndex.contains(Integer.valueOf(2))); //$NON-NLS-1$
+		Assert.assertTrue("row 3 is not in the selection", columnIndex.contains(Integer.valueOf(3))); //$NON-NLS-1$
+		Assert.assertTrue("row 5 is not in the selection", columnIndex.contains(Integer.valueOf(5))); //$NON-NLS-1$
+
+	}
+
+
+	/**
+	 * select an element from the model and seek it in the sorted generic table,
+	 * then proceed to check that its row has been correctly selected and that none of the columns are
+	 */
+	@Test
+	public void test5_SelectSortedElement() {
+		this.classTest = (Class) this.rootModel.getMember("Class3"); //$NON-NLS-1$
+		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);
+		if (manager.getTable().isInvertAxis()) {
+			manager.invertAxis();
+		}
+		manager.sortRowsByName(true);
+
+		Assert.assertTrue("failed to find: " + this.classTest.getName(), this.classTest.getName().equals("Class3")); //$NON-NLS-1$//$NON-NLS-2$
+
+		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);
+		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.classTest);
+		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+		final ISelection selection = serv.getSelection();
+
+		Assert.assertTrue(selection instanceof IStructuredSelection);
+		Object currentAxisObject = ((IStructuredSelection) selection).getFirstElement();
+		Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);
+		Assert.assertTrue("failed to match the selection with: " + this.classTest.getName(), this.classTest.equals(currentRealObject)); //$NON-NLS-1$
+
+		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();
+		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();
+		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();
+//		Assert.assertTrue("index of row does not match: " + rowSelectedPositions[0], rowSelectedPositions[0] == 6); //$NON-NLS-1$
+//		Assert.assertTrue("number of selected columns does not match: " + columnSelectedPositions.length, columnSelectedPositions.length == 0); //$NON-NLS-1$
+
+
+		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);
+		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);
+		Assert.assertEquals("number of selected rows does not match", 1, rowIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("number of selected columns does not match", 0, columnIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("index of selected row does not match", 6, rowIndex.get(0).intValue()); //$NON-NLS-1$
+
+
+	}
+
+	/**
+	 * select multiple elements from the model and seek them in the sorted generic table,
+	 * then proceed to check that their rows have been correctly selected and that none of the columns are
+	 */
+	@Test
+	public void test6_SelectMultipleSortedElements() {
+		this.elementListTest = (this.rootModel.getMember("Package1").getOwnedElements()); //$NON-NLS-1$
+		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);
+		if (manager.getTable().isInvertAxis()) {
+			manager.invertAxis();
+		}
+		manager.sortRowsByName(true);
+
+		Assert.assertTrue(editor.getActiveEditor() instanceof NavigationTarget);
+		((NavigationTarget) this.editor.getActiveEditor()).revealElement(this.elementListTest);
+		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+		final ISelection selection = serv.getSelection();
+
+		Assert.assertTrue(selection instanceof IStructuredSelection);
+		List<?> selectedRowElements = ((IStructuredSelection) selection).toList();
+		for (int index = 0; index < selectedRowElements.size(); index++) {
+			Object currentAxisObject = selectedRowElements.get(index);
+			Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);
+			Assert.assertTrue("failed to match the selection", this.elementListTest.contains(currentRealObject)); //$NON-NLS-1$
+		}
+
+		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();
+		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();
+		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();
+
+//		Assert.assertTrue("index of row does not match", rowSelectedPositions.length == 3); //$NON-NLS-1$
+//		Assert.assertTrue("index of row does not match", rowSelectedPositions[0] == 2); //$NON-NLS-1$
+//		Assert.assertTrue("index of row does not match", rowSelectedPositions[1] == 4); //$NON-NLS-1$
+//		Assert.assertTrue("index of row does not match", rowSelectedPositions[2] == 5); //$NON-NLS-1$
+//		Assert.assertTrue("number of selected columns does not match: " + columnSelectedPositions.length, columnSelectedPositions.length == 0); //$NON-NLS-1$
+		
+		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);
+		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);
+		Assert.assertEquals("number of selected rows does not match", 3, rowIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("number of selected columns does not match", 0, columnIndex.size()); //$NON-NLS-1$
+		Assert.assertTrue("row 2 is not in the selection", rowIndex.contains(Integer.valueOf(2))); //$NON-NLS-1$
+		Assert.assertTrue("row 4 is not in the selection", rowIndex.contains(Integer.valueOf(4))); //$NON-NLS-1$
+		Assert.assertTrue("row 5 is not in the selection", rowIndex.contains(Integer.valueOf(5))); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * select an element from the model and seek it in the generic table that has had its axis inverted and its elements sorted,
+	 * then proceed to check that its column has been correctly selected and that none of the rows are
+	 */
+	@Test
+	@Ignore
+	// sortColumns/Rows is not yet supported with invertAxis
+	public void test7_SelectSortedElementInvertAxis() {
+		this.classTest = (Class) this.rootModel.getMember("Class3"); //$NON-NLS-1$
+		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);
+		if (!manager.getTable().isInvertAxis()) {
+			manager.invertAxis();
+		}
+		manager.sortColumnsByName(true);
+
+		Assert.assertTrue("failed to find: " + this.classTest.getName(), this.classTest.getName().equals("Class3")); //$NON-NLS-1$//$NON-NLS-2$
+
+		Assert.assertTrue(editor.getActiveEditor() instanceof IRevealSemanticElement);
+		((IRevealSemanticElement) this.editor.getActiveEditor()).revealSemanticElement(Collections.singletonList(this.classTest));
+		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+		final ISelection selection = serv.getSelection();
+
+		Assert.assertTrue(selection instanceof IStructuredSelection);
+		Object currentAxisObject = ((IStructuredSelection) selection).getFirstElement();
+		Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);
+		Assert.assertTrue("failed to match the selection with: " + this.classTest.getName(), this.classTest.equals(currentRealObject)); //$NON-NLS-1$
+
+		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();
+		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();
+		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();
+//		Assert.assertTrue("index of row does not match: " + columnSelectedPositions[0], columnSelectedPositions[0] == 6); //$NON-NLS-1$
+//		Assert.assertTrue("number of selected columns does not match: " + rowSelectedPositions.length, rowSelectedPositions.length == 0); //$NON-NLS-1$
+
+		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);
+		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);
+		Assert.assertEquals("number of selected rows does not match", 0, rowIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("number of selected columns does not match", 1, columnIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("index of selected column does not match", 6, columnIndex.get(0).intValue()); //$NON-NLS-1$
+	}
+
+	/**
+	 * select multiple elements from the model and seek them in the generic table that has had its axis inverted and its elements sorted,
+	 * then proceed to check that their columns have been correctly selected and that none of the rows are
+	 */
+	@Test
+	@Ignore
+	// sortColumns/Rows is not yet supported with invertAxis
+	public void test8_SelectMultipleSortedElementsInvertAxis() {
+		this.elementListTest = (this.rootModel.getMember("Package1").getOwnedElements()); //$NON-NLS-1$
+		INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class);
+		if (!manager.getTable().isInvertAxis()) {
+			manager.invertAxis();
+		}
+		manager.sortColumnsByName(true);
+
+		Assert.assertTrue(editor.getActiveEditor() instanceof IRevealSemanticElement);
+		((IRevealSemanticElement) this.editor.getActiveEditor()).revealSemanticElement(this.elementListTest);
+		ISelectionService serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+		final ISelection selection = serv.getSelection();
+
+		Assert.assertTrue(selection instanceof IStructuredSelection);
+		List<?> selectedRowElements = ((IStructuredSelection) selection).toList();
+		for (int index = 0; index < selectedRowElements.size(); index++) {
+			Object currentAxisObject = selectedRowElements.get(index);
+			Object currentRealObject = AxisUtils.getRepresentedElement(currentAxisObject);
+			Assert.assertTrue("failed to match the selection", this.elementListTest.contains(currentRealObject)); //$NON-NLS-1$
+		}
+
+		SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();
+		int[] rowSelectedPositions = layer.getFullySelectedRowPositions();
+		int[] columnSelectedPositions = layer.getFullySelectedColumnPositions();
+
+		Assert.assertTrue("index of column does not match", columnSelectedPositions.length == 3); //$NON-NLS-1$
+		Assert.assertTrue("index of column does not match", columnSelectedPositions[0] == 2); //$NON-NLS-1$
+		Assert.assertTrue("index of column does not match", columnSelectedPositions[1] == 4); //$NON-NLS-1$
+		Assert.assertTrue("index of column does not match", columnSelectedPositions[2] == 5); //$NON-NLS-1$
+		Assert.assertTrue("number of selected rows does not match: " + rowSelectedPositions.length, rowSelectedPositions.length == 0); //$NON-NLS-1$
+		
+		
+		List<Integer> rowIndex = convertRowPositionToRowIndex(rowSelectedPositions, layer);
+		List<Integer> columnIndex = convertColumnPositionToColumnIndex(columnSelectedPositions, layer);
+		Assert.assertEquals("number of selected rows does not match", 0, rowIndex.size()); //$NON-NLS-1$
+		Assert.assertEquals("number of selected columns does not match", 3, columnIndex.size()); //$NON-NLS-1$
+		Assert.assertTrue("column 2 is not in the selection", columnIndex.contains(Integer.valueOf(2))); //$NON-NLS-1$
+		Assert.assertTrue("column 4 is not in the selection", columnIndex.contains(Integer.valueOf(4))); //$NON-NLS-1$
+		Assert.assertTrue("column 5 is not in the selection", columnIndex.contains(Integer.valueOf(5))); //$NON-NLS-1$
+
+	}
+
+
+	@Override
+	protected Bundle getBundle() {
+		return Activator.getDefault().getBundle();
+	}
+
+	@Override
+	protected String getSourcePath() {
+		return "resources/"; //$NON-NLS-1$
+	}
+
+	protected void selectTablePage(int index) {
+		try {
+			Object tablePage = getPageManager().allPages().get(index);
+			// getPageManager().closeAllOpenedPages();
+			// getPageManager().openPage(tablePage);
+			getPageManager().selectPage(tablePage);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+	}
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.di
index 08128862c28..8c549eecdc6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.notation
index 4fe3b459ce5..cc31d3b2da7 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.notation
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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:nattablecelleditor="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattablewrapper="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper" 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/table/nattablecelleditor http://www.eclipse.org/papyrus/nattable/model#//nattablecelleditor 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 http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper http://www.eclipse.org/papyrus/nattable/model#//nattablewrapper" xmi:id="_iQyPQJoSEeeMicUUPua1Vw" name="RelationshipGenericMatrix" currentRowAxisProvider="_iQyPQ5oSEeeMicUUPua1Vw" currentColumnAxisProvider="_iQyPQpoSEeeMicUUPua1Vw" tableKindId="org.eclipse.papyrus.uml.table.matrix">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQy2UJoSEeeMicUUPua1Vw" source="http://www.eclipse.org/papyrus/infra/nattable/version">

-    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQy2UZoSEeeMicUUPua1Vw" key="version" value="1.3.0"/>

-  </eAnnotations>

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_iQyPQZoSEeeMicUUPua1Vw" name="hiddenCategoriesByDepth">

-    <intListValue>1</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="DeleteObjectWrapperForSourceElements.uml#_Mipu4JoSEeeMicUUPua1Vw"/>

-  <owner xmi:type="uml:Model" href="DeleteObjectWrapperForSourceElements.uml#_Mipu4JoSEeeMicUUPua1Vw"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_iQyPQpoSEeeMicUUPua1Vw" description="This axis provider manages the columns, according to the wanted hierarchy" name="HierarchicalColumnsAxisManager" disconnectSlave="true">

-    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_oQ1tMJoSEeeMicUUPua1Vw">

-      <element xmi:type="uml:Package" href="DeleteObjectWrapperForSourceElements.uml#_TzF2oJoSEeeMicUUPua1Vw"/>

-    </sources>

-    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_oQ1tMZoSEeeMicUUPua1Vw">

-      <element xmi:type="uml:Package" href="DeleteObjectWrapperForSourceElements.uml#_YHPMYJoSEeeMicUUPua1Vw"/>

-    </sources>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_iQyPQ5oSEeeMicUUPua1Vw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true">

-    <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_qUbVkpoSEeeMicUUPua1Vw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="uml:Interface" href="DeleteObjectWrapperForSourceElements.uml#_d_8FIJoSEeeMicUUPua1Vw"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_qUbVk5oSEeeMicUUPua1Vw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="uml:Interface" href="DeleteObjectWrapperForSourceElements.uml#_fCThEJoSEeeMicUUPua1Vw"/>

-    </axis>

-    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_qUbVkJoSEeeMicUUPua1Vw">

-      <element xmi:type="uml:Interface" href="DeleteObjectWrapperForSourceElements.uml#_d_8FIJoSEeeMicUUPua1Vw"/>

-    </sources>

-    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_qUbVkZoSEeeMicUUPua1Vw">

-      <element xmi:type="uml:Interface" href="DeleteObjectWrapperForSourceElements.uml#_fCThEJoSEeeMicUUPua1Vw"/>

-    </sources>

-  </rowAxisProvidersHistory>

-  <ownedCellEditorConfigurations xmi:type="nattablecelleditor:GenericRelationshipMatrixCellEditorConfiguration" xmi:id="_iQyPRJoSEeeMicUUPua1Vw" cellEditorId="GenericRelationshipMatrixEditorConfiguration"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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:nattablecelleditor="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattablewrapper="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper" 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/table/nattablecelleditor http://www.eclipse.org/papyrus/nattable/model#//nattablecelleditor 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 http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper http://www.eclipse.org/papyrus/nattable/model#//nattablewrapper" xmi:id="_iQyPQJoSEeeMicUUPua1Vw" name="RelationshipGenericMatrix" currentRowAxisProvider="_iQyPQ5oSEeeMicUUPua1Vw" currentColumnAxisProvider="_iQyPQpoSEeeMicUUPua1Vw" tableKindId="org.eclipse.papyrus.uml.table.matrix">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQy2UJoSEeeMicUUPua1Vw" source="http://www.eclipse.org/papyrus/infra/nattable/version">
+    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQy2UZoSEeeMicUUPua1Vw" key="version" value="1.3.0"/>
+  </eAnnotations>
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_iQyPQZoSEeeMicUUPua1Vw" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="DeleteObjectWrapperForSourceElements.uml#_Mipu4JoSEeeMicUUPua1Vw"/>
+  <owner xmi:type="uml:Model" href="DeleteObjectWrapperForSourceElements.uml#_Mipu4JoSEeeMicUUPua1Vw"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_iQyPQpoSEeeMicUUPua1Vw" description="This axis provider manages the columns, according to the wanted hierarchy" name="HierarchicalColumnsAxisManager" disconnectSlave="true">
+    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_oQ1tMJoSEeeMicUUPua1Vw">
+      <element xmi:type="uml:Package" href="DeleteObjectWrapperForSourceElements.uml#_TzF2oJoSEeeMicUUPua1Vw"/>
+    </sources>
+    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_oQ1tMZoSEeeMicUUPua1Vw">
+      <element xmi:type="uml:Package" href="DeleteObjectWrapperForSourceElements.uml#_YHPMYJoSEeeMicUUPua1Vw"/>
+    </sources>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_iQyPQ5oSEeeMicUUPua1Vw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true">
+    <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_qUbVkpoSEeeMicUUPua1Vw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="uml:Interface" href="DeleteObjectWrapperForSourceElements.uml#_d_8FIJoSEeeMicUUPua1Vw"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_qUbVk5oSEeeMicUUPua1Vw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="uml:Interface" href="DeleteObjectWrapperForSourceElements.uml#_fCThEJoSEeeMicUUPua1Vw"/>
+    </axis>
+    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_qUbVkJoSEeeMicUUPua1Vw">
+      <element xmi:type="uml:Interface" href="DeleteObjectWrapperForSourceElements.uml#_d_8FIJoSEeeMicUUPua1Vw"/>
+    </sources>
+    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_qUbVkZoSEeeMicUUPua1Vw">
+      <element xmi:type="uml:Interface" href="DeleteObjectWrapperForSourceElements.uml#_fCThEJoSEeeMicUUPua1Vw"/>
+    </sources>
+  </rowAxisProvidersHistory>
+  <ownedCellEditorConfigurations xmi:type="nattablecelleditor:GenericRelationshipMatrixCellEditorConfiguration" xmi:id="_iQyPRJoSEeeMicUUPua1Vw" cellEditorId="GenericRelationshipMatrixEditorConfiguration"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.uml
index 8f883ecf86f..69f11574afa 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/deleteObjectWrapperForSourceElementsTest/DeleteObjectWrapperForSourceElements.uml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Mipu4JoSEeeMicUUPua1Vw" name="Root">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_MpyRoJoSEeeMicUUPua1Vw">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Package" xmi:id="_SbcHMJoSEeeMicUUPua1Vw" name="Package1">

-    <packagedElement xmi:type="uml:Package" xmi:id="_TzF2oJoSEeeMicUUPua1Vw" name="Package2">

-      <packagedElement xmi:type="uml:Class" xmi:id="_Ut8VUJoSEeeMicUUPua1Vw" name="Class1"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_VWXAMJoSEeeMicUUPua1Vw" name="Class2"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Package" xmi:id="_YHPMYJoSEeeMicUUPua1Vw" name="Package3">

-      <packagedElement xmi:type="uml:Component" xmi:id="_ZV_egJoSEeeMicUUPua1Vw" name="Component1"/>

-      <packagedElement xmi:type="uml:Component" xmi:id="_aByNgJoSEeeMicUUPua1Vw" name="Component2"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Package" xmi:id="_cHTvkJoSEeeMicUUPua1Vw" name="Package4">

-      <packagedElement xmi:type="uml:Interface" xmi:id="_d_8FIJoSEeeMicUUPua1Vw" name="Interface1"/>

-      <packagedElement xmi:type="uml:Interface" xmi:id="_fCThEJoSEeeMicUUPua1Vw" name="Interface2"/>

-    </packagedElement>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Mipu4JoSEeeMicUUPua1Vw" name="Root">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_MpyRoJoSEeeMicUUPua1Vw">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Package" xmi:id="_SbcHMJoSEeeMicUUPua1Vw" name="Package1">
+    <packagedElement xmi:type="uml:Package" xmi:id="_TzF2oJoSEeeMicUUPua1Vw" name="Package2">
+      <packagedElement xmi:type="uml:Class" xmi:id="_Ut8VUJoSEeeMicUUPua1Vw" name="Class1"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_VWXAMJoSEeeMicUUPua1Vw" name="Class2"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_YHPMYJoSEeeMicUUPua1Vw" name="Package3">
+      <packagedElement xmi:type="uml:Component" xmi:id="_ZV_egJoSEeeMicUUPua1Vw" name="Component1"/>
+      <packagedElement xmi:type="uml:Component" xmi:id="_aByNgJoSEeeMicUUPua1Vw" name="Component2"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_cHTvkJoSEeeMicUUPua1Vw" name="Package4">
+      <packagedElement xmi:type="uml:Interface" xmi:id="_d_8FIJoSEeeMicUUPua1Vw" name="Interface1"/>
+      <packagedElement xmi:type="uml:Interface" xmi:id="_fCThEJoSEeeMicUUPua1Vw" name="Interface2"/>
+    </packagedElement>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.di
index 08128862c28..8c549eecdc6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.notation
index 9758be5c890..f3217411974 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.notation
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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:nattablecelleditor="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattablewrapper="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper" 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/table/nattablecelleditor http://www.eclipse.org/papyrus/nattable/model#//nattablecelleditor 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 http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper http://www.eclipse.org/papyrus/nattable/model#//nattablewrapper" xmi:id="__dqcoKnKEeeZP8TFsrH34Q" name="Relationship Generic Matrix" currentRowAxisProvider="__dqco6nKEeeZP8TFsrH34Q" currentColumnAxisProvider="__dqcoqnKEeeZP8TFsrH34Q" tableKindId="org.eclipse.papyrus.uml.table.matrix">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eRgoKnKEeeZP8TFsrH34Q" source="http://www.eclipse.org/papyrus/infra/nattable/version">

-    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eRgoanKEeeZP8TFsrH34Q" key="version" value="1.3.0"/>

-  </eAnnotations>

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="__dqcoanKEeeZP8TFsrH34Q" name="hiddenCategoriesByDepth">

-    <intListValue>1</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="UpdateMatrixAxisColumnTest.uml#_Mipu4JoSEeeMicUUPua1Vw"/>

-  <owner xmi:type="uml:Model" href="UpdateMatrixAxisColumnTest.uml#_Mipu4JoSEeeMicUUPua1Vw"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="__dqcoqnKEeeZP8TFsrH34Q" description="This axis provider manages the columns, according to the wanted hierarchy" name="HierarchicalColumnsAxisManager" disconnectSlave="true">

-    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_FO8ewKnLEeeZP8TFsrH34Q">

-      <element xmi:type="uml:Package" href="UpdateMatrixAxisColumnTest.uml#_TzF2oJoSEeeMicUUPua1Vw"/>

-    </sources>

-    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_FO8ewanLEeeZP8TFsrH34Q">

-      <element xmi:type="uml:Package" href="UpdateMatrixAxisColumnTest.uml#_YHPMYJoSEeeMicUUPua1Vw"/>

-    </sources>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="__dqco6nKEeeZP8TFsrH34Q" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true">

-    <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_L010sKnLEeeZP8TFsrH34Q">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="uml:Interface" href="UpdateMatrixAxisColumnTest.uml#_d_8FIJoSEeeMicUUPua1Vw"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_L010sanLEeeZP8TFsrH34Q">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="uml:Interface" href="UpdateMatrixAxisColumnTest.uml#_fCThEJoSEeeMicUUPua1Vw"/>

-    </axis>

-    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_L010sqnLEeeZP8TFsrH34Q">

-      <element xmi:type="uml:Interface" href="UpdateMatrixAxisColumnTest.uml#_d_8FIJoSEeeMicUUPua1Vw"/>

-    </sources>

-    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_L010s6nLEeeZP8TFsrH34Q">

-      <element xmi:type="uml:Interface" href="UpdateMatrixAxisColumnTest.uml#_fCThEJoSEeeMicUUPua1Vw"/>

-    </sources>

-  </rowAxisProvidersHistory>

-  <ownedCellEditorConfigurations xmi:type="nattablecelleditor:GenericRelationshipMatrixCellEditorConfiguration" xmi:id="__dqcpKnKEeeZP8TFsrH34Q" cellEditorId="GenericRelationshipMatrixEditorConfiguration"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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:nattablecelleditor="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattablewrapper="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper" 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/table/nattablecelleditor http://www.eclipse.org/papyrus/nattable/model#//nattablecelleditor 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 http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper http://www.eclipse.org/papyrus/nattable/model#//nattablewrapper" xmi:id="__dqcoKnKEeeZP8TFsrH34Q" name="Relationship Generic Matrix" currentRowAxisProvider="__dqco6nKEeeZP8TFsrH34Q" currentColumnAxisProvider="__dqcoqnKEeeZP8TFsrH34Q" tableKindId="org.eclipse.papyrus.uml.table.matrix">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eRgoKnKEeeZP8TFsrH34Q" source="http://www.eclipse.org/papyrus/infra/nattable/version">
+    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eRgoanKEeeZP8TFsrH34Q" key="version" value="1.3.0"/>
+  </eAnnotations>
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="__dqcoanKEeeZP8TFsrH34Q" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="UpdateMatrixAxisColumnTest.uml#_Mipu4JoSEeeMicUUPua1Vw"/>
+  <owner xmi:type="uml:Model" href="UpdateMatrixAxisColumnTest.uml#_Mipu4JoSEeeMicUUPua1Vw"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="__dqcoqnKEeeZP8TFsrH34Q" description="This axis provider manages the columns, according to the wanted hierarchy" name="HierarchicalColumnsAxisManager" disconnectSlave="true">
+    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_FO8ewKnLEeeZP8TFsrH34Q">
+      <element xmi:type="uml:Package" href="UpdateMatrixAxisColumnTest.uml#_TzF2oJoSEeeMicUUPua1Vw"/>
+    </sources>
+    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_FO8ewanLEeeZP8TFsrH34Q">
+      <element xmi:type="uml:Package" href="UpdateMatrixAxisColumnTest.uml#_YHPMYJoSEeeMicUUPua1Vw"/>
+    </sources>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="__dqco6nKEeeZP8TFsrH34Q" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true">
+    <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_L010sKnLEeeZP8TFsrH34Q">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="uml:Interface" href="UpdateMatrixAxisColumnTest.uml#_d_8FIJoSEeeMicUUPua1Vw"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_L010sanLEeeZP8TFsrH34Q">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="uml:Interface" href="UpdateMatrixAxisColumnTest.uml#_fCThEJoSEeeMicUUPua1Vw"/>
+    </axis>
+    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_L010sqnLEeeZP8TFsrH34Q">
+      <element xmi:type="uml:Interface" href="UpdateMatrixAxisColumnTest.uml#_d_8FIJoSEeeMicUUPua1Vw"/>
+    </sources>
+    <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_L010s6nLEeeZP8TFsrH34Q">
+      <element xmi:type="uml:Interface" href="UpdateMatrixAxisColumnTest.uml#_fCThEJoSEeeMicUUPua1Vw"/>
+    </sources>
+  </rowAxisProvidersHistory>
+  <ownedCellEditorConfigurations xmi:type="nattablecelleditor:GenericRelationshipMatrixCellEditorConfiguration" xmi:id="__dqcpKnKEeeZP8TFsrH34Q" cellEditorId="GenericRelationshipMatrixEditorConfiguration"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.uml
index fd7d4e89feb..2731e656452 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateMatrixAxisColumnTests/UpdateMatrixAxisColumnTest.uml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Mipu4JoSEeeMicUUPua1Vw" name="UpdateMatrixAxisColumnTest">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_MpyRoJoSEeeMicUUPua1Vw">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Package" xmi:id="_TzF2oJoSEeeMicUUPua1Vw" name="Package1_ColumnSource">

-    <packagedElement xmi:type="uml:Class" xmi:id="_Ut8VUJoSEeeMicUUPua1Vw" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_VWXAMJoSEeeMicUUPua1Vw" name="Class2"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_YHPMYJoSEeeMicUUPua1Vw" name="Package2_ColumnSource">

-    <packagedElement xmi:type="uml:Component" xmi:id="_ZV_egJoSEeeMicUUPua1Vw" name="Component1"/>

-    <packagedElement xmi:type="uml:Component" xmi:id="_aByNgJoSEeeMicUUPua1Vw" name="Component2"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_cHTvkJoSEeeMicUUPua1Vw" name="Package3_RowSource">

-    <packagedElement xmi:type="uml:Interface" xmi:id="_d_8FIJoSEeeMicUUPua1Vw" name="Interface1"/>

-    <packagedElement xmi:type="uml:Interface" xmi:id="_fCThEJoSEeeMicUUPua1Vw" name="Interface2"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_kCgHsJoWEeeMicUUPua1Vw" name="Enumeration1"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Mipu4JoSEeeMicUUPua1Vw" name="UpdateMatrixAxisColumnTest">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_MpyRoJoSEeeMicUUPua1Vw">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Package" xmi:id="_TzF2oJoSEeeMicUUPua1Vw" name="Package1_ColumnSource">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Ut8VUJoSEeeMicUUPua1Vw" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_VWXAMJoSEeeMicUUPua1Vw" name="Class2"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_YHPMYJoSEeeMicUUPua1Vw" name="Package2_ColumnSource">
+    <packagedElement xmi:type="uml:Component" xmi:id="_ZV_egJoSEeeMicUUPua1Vw" name="Component1"/>
+    <packagedElement xmi:type="uml:Component" xmi:id="_aByNgJoSEeeMicUUPua1Vw" name="Component2"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_cHTvkJoSEeeMicUUPua1Vw" name="Package3_RowSource">
+    <packagedElement xmi:type="uml:Interface" xmi:id="_d_8FIJoSEeeMicUUPua1Vw" name="Interface1"/>
+    <packagedElement xmi:type="uml:Interface" xmi:id="_fCThEJoSEeeMicUUPua1Vw" name="Interface2"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_kCgHsJoWEeeMicUUPua1Vw" name="Enumeration1"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.di
index 08128862c28..8c549eecdc6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.notation
index ff177def4ec..256713899cc 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.notation
@@ -1,379 +1,379 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" 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:nattablecelleditor="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattablewrapper="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmlns:umlexpressions="http://www.eclipse.org/papyrus/umlexpressions" 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/table/nattablecelleditor http://www.eclipse.org/papyrus/nattable/model#//nattablecelleditor http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper http://www.eclipse.org/papyrus/nattable/model#//nattablewrapper">

-  <nattable:Table xmi:id="_HDEr0Kd7EeeJf5bvpcTfHA" name="Relationship Generic Matrix" currentRowAxisProvider="_HDEr06d7EeeJf5bvpcTfHA" currentColumnAxisProvider="_HDEr0qd7EeeJf5bvpcTfHA" tableKindId="org.eclipse.papyrus.uml.table.matrix">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HDGhAKd7EeeJf5bvpcTfHA" source="http://www.eclipse.org/papyrus/infra/nattable/version">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HDGhAad7EeeJf5bvpcTfHA" key="version" value="1.3.0"/>

-    </eAnnotations>

-    <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_HDEr0ad7EeeJf5bvpcTfHA" name="hiddenCategoriesByDepth">

-      <intListValue>1</intListValue>

-    </styles>

-    <context xmi:type="uml:Model" href="updateTableContentsAfterColumnSourcesChange.uml#_363gYJ-UEee0h-nVQzWobg"/>

-    <owner xmi:type="uml:Model" href="updateTableContentsAfterColumnSourcesChange.uml#_363gYJ-UEee0h-nVQzWobg"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_HDEr0qd7EeeJf5bvpcTfHA" description="This axis provider manages the columns, according to the wanted hierarchy" name="HierarchicalColumnsAxisManager" disconnectSlave="true"/>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_HDEr06d7EeeJf5bvpcTfHA" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true">

-      <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_3vlkkKeDEeeJf5bvpcTfHA">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_1nesAJ-VEeevr48NX92ywA"/>

-      </axis>

-      <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_3vlkkaeDEeeJf5bvpcTfHA">

-        <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_1nesAJ-VEeevr48NX92ywA"/>

-      </sources>

-    </rowAxisProvidersHistory>

-    <localColumnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_evH08Kd8EeeJf5bvpcTfHA">

-      <ownedLabelConfigurations xmi:type="nattablelabelprovider:ObjectLabelProviderConfiguration" xmi:id="_evH08ad8EeeJf5bvpcTfHA"/>

-      <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_evH08qd8EeeJf5bvpcTfHA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-        <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_evH086d8EeeJf5bvpcTfHA">

-          <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>

-        </axisUsedAsAxisProvider>

-        <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-        <filterRule xmi:type="umlexpressions:IsTypeOfExpression" xmi:id="_evH09ad8EeeJf5bvpcTfHA" name="">

-          <umlEClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </filterRule>

-      </ownedAxisConfigurations>

-      <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_evH09Kd8EeeJf5bvpcTfHA" localHeaderLabelConfiguration="_evH08ad8EeeJf5bvpcTfHA" localSpecificConfigurations="_evH08qd8EeeJf5bvpcTfHA">

-        <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axisManagerConfigurations>

-    </localColumnHeaderAxisConfiguration>

-    <ownedCellEditorConfigurations xmi:type="nattablecelleditor:GenericRelationshipMatrixCellEditorConfiguration" xmi:id="_HDEr1Kd7EeeJf5bvpcTfHA" cellEditorId="GenericRelationshipMatrixEditorConfiguration" direction="FROM_COLUMN_TO_ROW">

-      <editedElement xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>

-    </ownedCellEditorConfigurations>

-  </nattable:Table>

-  <notation:Diagram xmi:id="_MFBpIKeDEeeJf5bvpcTfHA" type="PapyrusUMLClassDiagram" name="NewClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_PuN9YKeDEeeJf5bvpcTfHA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_PuN9YqeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_PuOkcKeDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_PuOkcaeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PuOkcqeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PuOkc6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PuOkdKeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PuOkdaeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuOkdqeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PuOkd6eDEeeJf5bvpcTfHA" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PuOkeKeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PuOkeaeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PuOkeqeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuOke6eDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PuOkfKeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PuOkfaeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PuOkfqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PuOkf6eDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuOkgKeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_gFrXcJ-VEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuN9YaeDEeeJf5bvpcTfHA" x="220"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_PuoNEKeDEeeJf5bvpcTfHA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_PuoNEqeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_PuoNE6eDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_PuoNFKeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Puo0IKeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Puo0IaeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Puo0IqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Puo0I6eDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Puo0JKeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Puo0JaeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Puo0JqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Puo0J6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Puo0KKeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Puo0KaeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Puo0KqeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Puo0K6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Puo0LKeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Puo0LaeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Puo0LqeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_gobfMJ-VEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuoNEaeDEeeJf5bvpcTfHA" x="220" y="120"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_PvH8UKeDEeeJf5bvpcTfHA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_PvIjYKeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_PvIjYaeDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_PvIjYqeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PvIjY6eDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PvIjZKeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PvIjZaeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PvIjZqeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvIjZ6eDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PvIjaKeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PvIjaaeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PvIjaqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PvIja6eDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvIjbKeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PvIjbaeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PvIjbqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PvIjb6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PvIjcKeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvIjcaeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_gusfQJ-VEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvH8UaeDEeeJf5bvpcTfHA" x="220" y="240"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_PvrV8KeDEeeJf5bvpcTfHA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_PvrV8qeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Pvr9AKeDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Pvr9AaeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Pvr9AqeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Pvr9A6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Pvr9BKeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Pvr9BaeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pvr9BqeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Pvr9B6eDEeeJf5bvpcTfHA" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Pvr9CKeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Pvr9CaeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Pvr9CqeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pvr9C6eDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Pvr9DKeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Pvr9DaeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Pvr9DqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Pvr9D6eDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pvr9EKeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_Dv-mkKd_EeeJf5bvpcTfHA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvrV8aeDEeeJf5bvpcTfHA" x="220" y="360"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_QZYaQKeDEeeJf5bvpcTfHA" type="Signal_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_QZZBUaeDEeeJf5bvpcTfHA" type="Signal_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QZZBUqeDEeeJf5bvpcTfHA" type="Signal_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QZZBU6eDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_QZZBVKeDEeeJf5bvpcTfHA" type="Signal_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_QZZBVaeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_QZZBVqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_QZZBV6eDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZZBWKeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Signal" href="updateTableContentsAfterColumnSourcesChange.uml#_-7X5QJ-VEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZZBUKeDEeeJf5bvpcTfHA" x="580"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_QZ4wkKeDEeeJf5bvpcTfHA" type="Signal_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_QZ4wkqeDEeeJf5bvpcTfHA" type="Signal_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QZ4wk6eDEeeJf5bvpcTfHA" type="Signal_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QZ4wlKeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_QZ4wlaeDEeeJf5bvpcTfHA" type="Signal_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_QZ4wlqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_QZ4wl6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_QZ4wmKeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZ4wmaeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Signal" href="updateTableContentsAfterColumnSourcesChange.uml#__bI-cJ-VEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZ4wkaeDEeeJf5bvpcTfHA" x="580" y="120"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_QaQkAKeDEeeJf5bvpcTfHA" type="Signal_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_QaQkAqeDEeeJf5bvpcTfHA" type="Signal_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QaQkA6eDEeeJf5bvpcTfHA" type="Signal_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QaQkBKeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_QaQkBaeDEeeJf5bvpcTfHA" type="Signal_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_QaQkBqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_QaQkB6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_QaQkCKeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QaQkCaeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Signal" href="updateTableContentsAfterColumnSourcesChange.uml#__cCWUJ-VEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QaQkAaeDEeeJf5bvpcTfHA" x="580" y="240"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_QasB0KeDEeeJf5bvpcTfHA" type="Signal_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_QasB0qeDEeeJf5bvpcTfHA" type="Signal_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QasB06eDEeeJf5bvpcTfHA" type="Signal_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QasB1KeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_QasB1aeDEeeJf5bvpcTfHA" type="Signal_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_QasB1qeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_QasB16eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_QasB2KeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QasB2aeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Signal" href="updateTableContentsAfterColumnSourcesChange.uml#__lAFEJ-VEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QasB0aeDEeeJf5bvpcTfHA" x="580" y="360"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_b_WX0KeDEeeJf5bvpcTfHA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_b_Xl8KeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_b_Xl8aeDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_b_Xl8qeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b_Xl86eDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b_Xl9KeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b_Xl9aeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_Xl9qeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_Xl96eDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b_Xl-KeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b_Xl-aeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b_Xl-qeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_Xl-6eDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_Xl_KeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b_Xl_aeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b_Xl_qeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b_Xl_6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_XmAKeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_XmAaeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_YJPP4J-WEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_WX0aeDEeeJf5bvpcTfHA" x="840" y="80"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_cABGMKeDEeeJf5bvpcTfHA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_cABGMqeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_cABGM6eDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cABGNKeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cABGNaeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cABGNqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_cABGN6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_cABGOKeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cABGOaeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cABGOqeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cABGO6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_cABGPKeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_cABGPaeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cABGPqeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cABGP6eDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cABGQKeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_cABGQaeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_cABGQqeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cABGQ6eDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_YJPP4Z-WEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cABGMaeDEeeJf5bvpcTfHA" x="840" y="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_cA3awKeDEeeJf5bvpcTfHA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_cA3awqeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_cA3aw6eDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cA3axKeDEeeJf5bvpcTfHA" y="15"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cA3axaeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cA3axqeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_cA3ax6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_cA3ayKeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cA3ayaeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cA3ayqeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cA3ay6eDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_cA3azKeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_cA3azaeDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cA3azqeDEeeJf5bvpcTfHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cA4B0KeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cA4B0aeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_cA4B0qeDEeeJf5bvpcTfHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_cA4B06eDEeeJf5bvpcTfHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cA4B1KeDEeeJf5bvpcTfHA"/>

-      </children>

-      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_YJPP4p-WEeevr48NX92ywA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cA3awaeDEeeJf5bvpcTfHA" x="840" y="320"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_MFBpIaeDEeeJf5bvpcTfHA" name="diagram_compatibility_version" stringValue="1.3.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_MFBpIqeDEeeJf5bvpcTfHA"/>

-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_MFBpI6eDEeeJf5bvpcTfHA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

-      <owner xmi:type="uml:Model" href="updateTableContentsAfterColumnSourcesChange.uml#_363gYJ-UEee0h-nVQzWobg"/>

-    </styles>

-    <element xmi:type="uml:Model" href="updateTableContentsAfterColumnSourcesChange.uml#_363gYJ-UEee0h-nVQzWobg"/>

-    <edges xmi:type="notation:Connector" xmi:id="_XDJjkKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_PuN9YKeDEeeJf5bvpcTfHA" target="_QZYaQKeDEeeJf5bvpcTfHA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_XDKKoKeDEeeJf5bvpcTfHA" type="Dependency_NameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XDKKoaeDEeeJf5bvpcTfHA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_XDKKoqeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XDKKo6eDEeeJf5bvpcTfHA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_XDJjkaeDEeeJf5bvpcTfHA"/>

-      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_XComMKeDEeeJf5bvpcTfHA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XDJjkqeDEeeJf5bvpcTfHA" points="[320, 40, -643984, -643984]$[580, 60, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XEkf4KeDEeeJf5bvpcTfHA" id="(1.0,0.4)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XEkf4aeDEeeJf5bvpcTfHA" id="(0.0,0.6)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_YEsgIKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_PuoNEKeDEeeJf5bvpcTfHA" target="_QZ4wkKeDEeeJf5bvpcTfHA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_YEsgI6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YEsgJKeDEeeJf5bvpcTfHA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_YEsgJaeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YEsgJqeDEeeJf5bvpcTfHA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_YEsgIaeDEeeJf5bvpcTfHA"/>

-      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_YErSAKeDEeeJf5bvpcTfHA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YEsgIqeDEeeJf5bvpcTfHA" points="[320, 160, -643984, -643984]$[580, 180, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFRH4KeDEeeJf5bvpcTfHA" id="(1.0,0.4)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFRH4aeDEeeJf5bvpcTfHA" id="(0.0,0.6)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Yo6ngKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_PvH8UKeDEeeJf5bvpcTfHA" target="_QaQkAKeDEeeJf5bvpcTfHA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Yo6ng6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yo6nhKeDEeeJf5bvpcTfHA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Yo6nhaeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yo6nhqeDEeeJf5bvpcTfHA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Yo6ngaeDEeeJf5bvpcTfHA"/>

-      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_Yo6AcKeDEeeJf5bvpcTfHA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Yo6ngqeDEeeJf5bvpcTfHA" points="[320, 280, -643984, -643984]$[580, 300, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YpZvsKeDEeeJf5bvpcTfHA" id="(1.0,0.4)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YpZvsaeDEeeJf5bvpcTfHA" id="(0.0,0.6)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ZJsZUKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_PvrV8KeDEeeJf5bvpcTfHA" target="_QasB0KeDEeeJf5bvpcTfHA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ZJsZU6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZJsZVKeDEeeJf5bvpcTfHA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ZJsZVaeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZJsZVqeDEeeJf5bvpcTfHA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_ZJsZUaeDEeeJf5bvpcTfHA"/>

-      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_ZJrLMKeDEeeJf5bvpcTfHA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZJsZUqeDEeeJf5bvpcTfHA" points="[320, 420, -643984, -643984]$[580, 420, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZKJFQKeDEeeJf5bvpcTfHA" id="(1.0,0.6)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZKJFQaeDEeeJf5bvpcTfHA" id="(0.0,0.6)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_esi94KeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_b_WX0KeDEeeJf5bvpcTfHA" target="_QZ4wkKeDEeeJf5bvpcTfHA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_esi946eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_esjk8KeDEeeJf5bvpcTfHA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_esjk8aeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_esjk8qeDEeeJf5bvpcTfHA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_esi94aeDEeeJf5bvpcTfHA"/>

-      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_eshvwKeDEeeJf5bvpcTfHA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_esi94qeDEeeJf5bvpcTfHA" points="[840, 120, -643984, -643984]$[680, 180, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_etk4oKeDEeeJf5bvpcTfHA" id="(0.0,0.4)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_etk4oaeDEeeJf5bvpcTfHA" id="(1.0,0.6)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_fHRyEKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_cABGMKeDEeeJf5bvpcTfHA" target="_QaQkAKeDEeeJf5bvpcTfHA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_fHRyE6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fHRyFKeDEeeJf5bvpcTfHA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_fHRyFaeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fHRyFqeDEeeJf5bvpcTfHA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_fHRyEaeDEeeJf5bvpcTfHA"/>

-      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_fHRLAKeDEeeJf5bvpcTfHA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fHRyEqeDEeeJf5bvpcTfHA" points="[840, 240, -643984, -643984]$[680, 300, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fH1LsKeDEeeJf5bvpcTfHA" id="(0.0,0.4)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fH1ywKeDEeeJf5bvpcTfHA" id="(1.0,0.6)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_fme2kKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_cA3awKeDEeeJf5bvpcTfHA" target="_QasB0KeDEeeJf5bvpcTfHA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_fme2k6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fme2lKeDEeeJf5bvpcTfHA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_fme2laeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fme2lqeDEeeJf5bvpcTfHA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_fme2kaeDEeeJf5bvpcTfHA"/>

-      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_fmdocKeDEeeJf5bvpcTfHA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fme2kqeDEeeJf5bvpcTfHA" points="[840, 360, -643984, -643984]$[680, 420, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fnEFYKeDEeeJf5bvpcTfHA" id="(0.0,0.4)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fnEFYaeDEeeJf5bvpcTfHA" id="(1.0,0.6)"/>

-    </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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" 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:nattablecelleditor="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattablewrapper="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmlns:umlexpressions="http://www.eclipse.org/papyrus/umlexpressions" 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/table/nattablecelleditor http://www.eclipse.org/papyrus/nattable/model#//nattablecelleditor http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper http://www.eclipse.org/papyrus/nattable/model#//nattablewrapper">
+  <nattable:Table xmi:id="_HDEr0Kd7EeeJf5bvpcTfHA" name="Relationship Generic Matrix" currentRowAxisProvider="_HDEr06d7EeeJf5bvpcTfHA" currentColumnAxisProvider="_HDEr0qd7EeeJf5bvpcTfHA" tableKindId="org.eclipse.papyrus.uml.table.matrix">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HDGhAKd7EeeJf5bvpcTfHA" source="http://www.eclipse.org/papyrus/infra/nattable/version">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HDGhAad7EeeJf5bvpcTfHA" key="version" value="1.3.0"/>
+    </eAnnotations>
+    <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_HDEr0ad7EeeJf5bvpcTfHA" name="hiddenCategoriesByDepth">
+      <intListValue>1</intListValue>
+    </styles>
+    <context xmi:type="uml:Model" href="updateTableContentsAfterColumnSourcesChange.uml#_363gYJ-UEee0h-nVQzWobg"/>
+    <owner xmi:type="uml:Model" href="updateTableContentsAfterColumnSourcesChange.uml#_363gYJ-UEee0h-nVQzWobg"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_HDEr0qd7EeeJf5bvpcTfHA" description="This axis provider manages the columns, according to the wanted hierarchy" name="HierarchicalColumnsAxisManager" disconnectSlave="true"/>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_HDEr06d7EeeJf5bvpcTfHA" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true">
+      <axis xmi:type="nattableaxis:EObjectTreeItemAxis" xmi:id="_3vlkkKeDEeeJf5bvpcTfHA">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_1nesAJ-VEeevr48NX92ywA"/>
+      </axis>
+      <sources xmi:type="nattablewrapper:EObjectWrapper" xmi:id="_3vlkkaeDEeeJf5bvpcTfHA">
+        <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_1nesAJ-VEeevr48NX92ywA"/>
+      </sources>
+    </rowAxisProvidersHistory>
+    <localColumnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_evH08Kd8EeeJf5bvpcTfHA">
+      <ownedLabelConfigurations xmi:type="nattablelabelprovider:ObjectLabelProviderConfiguration" xmi:id="_evH08ad8EeeJf5bvpcTfHA"/>
+      <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_evH08qd8EeeJf5bvpcTfHA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+        <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_evH086d8EeeJf5bvpcTfHA">
+          <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+        </axisUsedAsAxisProvider>
+        <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+        <filterRule xmi:type="umlexpressions:IsTypeOfExpression" xmi:id="_evH09ad8EeeJf5bvpcTfHA" name="">
+          <umlEClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </filterRule>
+      </ownedAxisConfigurations>
+      <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_evH09Kd8EeeJf5bvpcTfHA" localHeaderLabelConfiguration="_evH08ad8EeeJf5bvpcTfHA" localSpecificConfigurations="_evH08qd8EeeJf5bvpcTfHA">
+        <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axisManagerConfigurations>
+    </localColumnHeaderAxisConfiguration>
+    <ownedCellEditorConfigurations xmi:type="nattablecelleditor:GenericRelationshipMatrixCellEditorConfiguration" xmi:id="_HDEr1Kd7EeeJf5bvpcTfHA" cellEditorId="GenericRelationshipMatrixEditorConfiguration" direction="FROM_COLUMN_TO_ROW">
+      <editedElement xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
+    </ownedCellEditorConfigurations>
+  </nattable:Table>
+  <notation:Diagram xmi:id="_MFBpIKeDEeeJf5bvpcTfHA" type="PapyrusUMLClassDiagram" name="NewClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_PuN9YKeDEeeJf5bvpcTfHA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PuN9YqeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PuOkcKeDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PuOkcaeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PuOkcqeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PuOkc6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PuOkdKeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PuOkdaeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuOkdqeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PuOkd6eDEeeJf5bvpcTfHA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PuOkeKeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PuOkeaeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PuOkeqeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuOke6eDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PuOkfKeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PuOkfaeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PuOkfqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PuOkf6eDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuOkgKeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_gFrXcJ-VEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuN9YaeDEeeJf5bvpcTfHA" x="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_PuoNEKeDEeeJf5bvpcTfHA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PuoNEqeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PuoNE6eDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PuoNFKeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Puo0IKeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Puo0IaeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Puo0IqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Puo0I6eDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Puo0JKeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Puo0JaeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Puo0JqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Puo0J6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Puo0KKeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Puo0KaeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Puo0KqeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Puo0K6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Puo0LKeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Puo0LaeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Puo0LqeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_gobfMJ-VEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PuoNEaeDEeeJf5bvpcTfHA" x="220" y="120"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_PvH8UKeDEeeJf5bvpcTfHA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PvIjYKeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PvIjYaeDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PvIjYqeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PvIjY6eDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PvIjZKeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PvIjZaeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PvIjZqeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvIjZ6eDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PvIjaKeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PvIjaaeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PvIjaqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PvIja6eDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvIjbKeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PvIjbaeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PvIjbqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PvIjb6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PvIjcKeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvIjcaeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_gusfQJ-VEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvH8UaeDEeeJf5bvpcTfHA" x="220" y="240"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_PvrV8KeDEeeJf5bvpcTfHA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PvrV8qeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Pvr9AKeDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Pvr9AaeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Pvr9AqeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Pvr9A6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Pvr9BKeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Pvr9BaeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pvr9BqeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Pvr9B6eDEeeJf5bvpcTfHA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Pvr9CKeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Pvr9CaeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Pvr9CqeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pvr9C6eDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Pvr9DKeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Pvr9DaeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Pvr9DqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Pvr9D6eDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pvr9EKeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_Dv-mkKd_EeeJf5bvpcTfHA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PvrV8aeDEeeJf5bvpcTfHA" x="220" y="360"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QZYaQKeDEeeJf5bvpcTfHA" type="Signal_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QZZBUaeDEeeJf5bvpcTfHA" type="Signal_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QZZBUqeDEeeJf5bvpcTfHA" type="Signal_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QZZBU6eDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QZZBVKeDEeeJf5bvpcTfHA" type="Signal_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QZZBVaeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QZZBVqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QZZBV6eDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZZBWKeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Signal" href="updateTableContentsAfterColumnSourcesChange.uml#_-7X5QJ-VEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZZBUKeDEeeJf5bvpcTfHA" x="580"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QZ4wkKeDEeeJf5bvpcTfHA" type="Signal_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QZ4wkqeDEeeJf5bvpcTfHA" type="Signal_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QZ4wk6eDEeeJf5bvpcTfHA" type="Signal_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QZ4wlKeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QZ4wlaeDEeeJf5bvpcTfHA" type="Signal_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QZ4wlqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QZ4wl6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QZ4wmKeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZ4wmaeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Signal" href="updateTableContentsAfterColumnSourcesChange.uml#__bI-cJ-VEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZ4wkaeDEeeJf5bvpcTfHA" x="580" y="120"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QaQkAKeDEeeJf5bvpcTfHA" type="Signal_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QaQkAqeDEeeJf5bvpcTfHA" type="Signal_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QaQkA6eDEeeJf5bvpcTfHA" type="Signal_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QaQkBKeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QaQkBaeDEeeJf5bvpcTfHA" type="Signal_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QaQkBqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QaQkB6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QaQkCKeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QaQkCaeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Signal" href="updateTableContentsAfterColumnSourcesChange.uml#__cCWUJ-VEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QaQkAaeDEeeJf5bvpcTfHA" x="580" y="240"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QasB0KeDEeeJf5bvpcTfHA" type="Signal_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QasB0qeDEeeJf5bvpcTfHA" type="Signal_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QasB06eDEeeJf5bvpcTfHA" type="Signal_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QasB1KeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QasB1aeDEeeJf5bvpcTfHA" type="Signal_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QasB1qeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QasB16eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QasB2KeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QasB2aeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Signal" href="updateTableContentsAfterColumnSourcesChange.uml#__lAFEJ-VEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QasB0aeDEeeJf5bvpcTfHA" x="580" y="360"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_b_WX0KeDEeeJf5bvpcTfHA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b_Xl8KeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_b_Xl8aeDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_b_Xl8qeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_b_Xl86eDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b_Xl9KeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b_Xl9aeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_Xl9qeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_Xl96eDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_b_Xl-KeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b_Xl-aeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b_Xl-qeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_Xl-6eDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_Xl_KeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_b_Xl_aeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b_Xl_qeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b_Xl_6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_XmAKeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_XmAaeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_YJPP4J-WEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_WX0aeDEeeJf5bvpcTfHA" x="840" y="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_cABGMKeDEeeJf5bvpcTfHA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_cABGMqeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cABGM6eDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cABGNKeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cABGNaeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cABGNqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_cABGN6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_cABGOKeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cABGOaeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cABGOqeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cABGO6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_cABGPKeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_cABGPaeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cABGPqeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cABGP6eDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cABGQKeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_cABGQaeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_cABGQqeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cABGQ6eDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_YJPP4Z-WEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cABGMaeDEeeJf5bvpcTfHA" x="840" y="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_cA3awKeDEeeJf5bvpcTfHA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_cA3awqeDEeeJf5bvpcTfHA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cA3aw6eDEeeJf5bvpcTfHA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cA3axKeDEeeJf5bvpcTfHA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cA3axaeDEeeJf5bvpcTfHA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cA3axqeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_cA3ax6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_cA3ayKeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cA3ayaeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cA3ayqeDEeeJf5bvpcTfHA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cA3ay6eDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_cA3azKeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_cA3azaeDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cA3azqeDEeeJf5bvpcTfHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cA4B0KeDEeeJf5bvpcTfHA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cA4B0aeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_cA4B0qeDEeeJf5bvpcTfHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_cA4B06eDEeeJf5bvpcTfHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cA4B1KeDEeeJf5bvpcTfHA"/>
+      </children>
+      <element xmi:type="uml:Class" href="updateTableContentsAfterColumnSourcesChange.uml#_YJPP4p-WEeevr48NX92ywA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cA3awaeDEeeJf5bvpcTfHA" x="840" y="320"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_MFBpIaeDEeeJf5bvpcTfHA" name="diagram_compatibility_version" stringValue="1.3.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_MFBpIqeDEeeJf5bvpcTfHA"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_MFBpI6eDEeeJf5bvpcTfHA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Model" href="updateTableContentsAfterColumnSourcesChange.uml#_363gYJ-UEee0h-nVQzWobg"/>
+    </styles>
+    <element xmi:type="uml:Model" href="updateTableContentsAfterColumnSourcesChange.uml#_363gYJ-UEee0h-nVQzWobg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XDJjkKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_PuN9YKeDEeeJf5bvpcTfHA" target="_QZYaQKeDEeeJf5bvpcTfHA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XDKKoKeDEeeJf5bvpcTfHA" type="Dependency_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XDKKoaeDEeeJf5bvpcTfHA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XDKKoqeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XDKKo6eDEeeJf5bvpcTfHA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_XDJjkaeDEeeJf5bvpcTfHA"/>
+      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_XComMKeDEeeJf5bvpcTfHA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XDJjkqeDEeeJf5bvpcTfHA" points="[320, 40, -643984, -643984]$[580, 60, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XEkf4KeDEeeJf5bvpcTfHA" id="(1.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XEkf4aeDEeeJf5bvpcTfHA" id="(0.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_YEsgIKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_PuoNEKeDEeeJf5bvpcTfHA" target="_QZ4wkKeDEeeJf5bvpcTfHA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YEsgI6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YEsgJKeDEeeJf5bvpcTfHA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YEsgJaeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YEsgJqeDEeeJf5bvpcTfHA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YEsgIaeDEeeJf5bvpcTfHA"/>
+      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_YErSAKeDEeeJf5bvpcTfHA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YEsgIqeDEeeJf5bvpcTfHA" points="[320, 160, -643984, -643984]$[580, 180, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFRH4KeDEeeJf5bvpcTfHA" id="(1.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFRH4aeDEeeJf5bvpcTfHA" id="(0.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Yo6ngKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_PvH8UKeDEeeJf5bvpcTfHA" target="_QaQkAKeDEeeJf5bvpcTfHA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yo6ng6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yo6nhKeDEeeJf5bvpcTfHA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yo6nhaeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yo6nhqeDEeeJf5bvpcTfHA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Yo6ngaeDEeeJf5bvpcTfHA"/>
+      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_Yo6AcKeDEeeJf5bvpcTfHA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Yo6ngqeDEeeJf5bvpcTfHA" points="[320, 280, -643984, -643984]$[580, 300, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YpZvsKeDEeeJf5bvpcTfHA" id="(1.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YpZvsaeDEeeJf5bvpcTfHA" id="(0.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ZJsZUKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_PvrV8KeDEeeJf5bvpcTfHA" target="_QasB0KeDEeeJf5bvpcTfHA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZJsZU6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZJsZVKeDEeeJf5bvpcTfHA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZJsZVaeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZJsZVqeDEeeJf5bvpcTfHA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ZJsZUaeDEeeJf5bvpcTfHA"/>
+      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_ZJrLMKeDEeeJf5bvpcTfHA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZJsZUqeDEeeJf5bvpcTfHA" points="[320, 420, -643984, -643984]$[580, 420, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZKJFQKeDEeeJf5bvpcTfHA" id="(1.0,0.6)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZKJFQaeDEeeJf5bvpcTfHA" id="(0.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_esi94KeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_b_WX0KeDEeeJf5bvpcTfHA" target="_QZ4wkKeDEeeJf5bvpcTfHA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_esi946eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_esjk8KeDEeeJf5bvpcTfHA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_esjk8aeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_esjk8qeDEeeJf5bvpcTfHA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_esi94aeDEeeJf5bvpcTfHA"/>
+      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_eshvwKeDEeeJf5bvpcTfHA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_esi94qeDEeeJf5bvpcTfHA" points="[840, 120, -643984, -643984]$[680, 180, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_etk4oKeDEeeJf5bvpcTfHA" id="(0.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_etk4oaeDEeeJf5bvpcTfHA" id="(1.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_fHRyEKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_cABGMKeDEeeJf5bvpcTfHA" target="_QaQkAKeDEeeJf5bvpcTfHA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fHRyE6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fHRyFKeDEeeJf5bvpcTfHA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fHRyFaeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fHRyFqeDEeeJf5bvpcTfHA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_fHRyEaeDEeeJf5bvpcTfHA"/>
+      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_fHRLAKeDEeeJf5bvpcTfHA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fHRyEqeDEeeJf5bvpcTfHA" points="[840, 240, -643984, -643984]$[680, 300, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fH1LsKeDEeeJf5bvpcTfHA" id="(0.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fH1ywKeDEeeJf5bvpcTfHA" id="(1.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_fme2kKeDEeeJf5bvpcTfHA" type="Dependency_Edge" source="_cA3awKeDEeeJf5bvpcTfHA" target="_QasB0KeDEeeJf5bvpcTfHA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fme2k6eDEeeJf5bvpcTfHA" type="Dependency_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fme2lKeDEeeJf5bvpcTfHA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fme2laeDEeeJf5bvpcTfHA" type="Dependency_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fme2lqeDEeeJf5bvpcTfHA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_fme2kaeDEeeJf5bvpcTfHA"/>
+      <element xmi:type="uml:Dependency" href="updateTableContentsAfterColumnSourcesChange.uml#_fmdocKeDEeeJf5bvpcTfHA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fme2kqeDEeeJf5bvpcTfHA" points="[840, 360, -643984, -643984]$[680, 420, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fnEFYKeDEeeJf5bvpcTfHA" id="(0.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fnEFYaeDEeeJf5bvpcTfHA" id="(1.0,0.6)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.uml
index 8546b5a6173..3e7e5c86b2b 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/resources/updateTableContentsAfterColumnSourcesChangeTests/updateTableContentsAfterColumnSourcesChange.uml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_363gYJ-UEee0h-nVQzWobg" name="updateTableContentsAfterRowsSourceChange">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_4FYHQJ-UEee0h-nVQzWobg">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Package" xmi:id="_dYmtMJ-VEeevr48NX92ywA" name="Package1_ColumnSources">

-    <packagedElement xmi:type="uml:Class" xmi:id="_gFrXcJ-VEeevr48NX92ywA" name="Class11"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_gobfMJ-VEeevr48NX92ywA" name="Class12"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_gusfQJ-VEeevr48NX92ywA" name="Class13"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_Dv-mkKd_EeeJf5bvpcTfHA" name="Class14"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_XComMKeDEeeJf5bvpcTfHA" client="_gFrXcJ-VEeevr48NX92ywA" supplier="_-7X5QJ-VEeevr48NX92ywA"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_YErSAKeDEeeJf5bvpcTfHA" client="_gobfMJ-VEeevr48NX92ywA" supplier="__bI-cJ-VEeevr48NX92ywA"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_Yo6AcKeDEeeJf5bvpcTfHA" client="_gusfQJ-VEeevr48NX92ywA" supplier="__cCWUJ-VEeevr48NX92ywA"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_ZJrLMKeDEeeJf5bvpcTfHA" client="_Dv-mkKd_EeeJf5bvpcTfHA" supplier="__lAFEJ-VEeevr48NX92ywA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_eCSjYJ-VEeevr48NX92ywA" name="Package2_ColumnSources">

-    <packagedElement xmi:type="uml:Class" xmi:id="_YJPP4J-WEeevr48NX92ywA" name="Class21"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_YJPP4Z-WEeevr48NX92ywA" name="Class22"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_YJPP4p-WEeevr48NX92ywA" name="Class23"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_eshvwKeDEeeJf5bvpcTfHA" client="_YJPP4J-WEeevr48NX92ywA" supplier="__bI-cJ-VEeevr48NX92ywA"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_fHRLAKeDEeeJf5bvpcTfHA" client="_YJPP4Z-WEeevr48NX92ywA" supplier="__cCWUJ-VEeevr48NX92ywA"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_fmdocKeDEeeJf5bvpcTfHA" client="_YJPP4p-WEeevr48NX92ywA" supplier="__lAFEJ-VEeevr48NX92ywA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_1nesAJ-VEeevr48NX92ywA" name="Package3_RowSources">

-    <nestedClassifier xmi:type="uml:Signal" xmi:id="_-7X5QJ-VEeevr48NX92ywA" name="Signal1"/>

-    <nestedClassifier xmi:type="uml:Signal" xmi:id="__bI-cJ-VEeevr48NX92ywA" name="Signal2"/>

-    <nestedClassifier xmi:type="uml:Signal" xmi:id="__cCWUJ-VEeevr48NX92ywA" name="Signal3"/>

-    <nestedClassifier xmi:type="uml:Signal" xmi:id="__lAFEJ-VEeevr48NX92ywA" name="Signal4"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_363gYJ-UEee0h-nVQzWobg" name="updateTableContentsAfterRowsSourceChange">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_4FYHQJ-UEee0h-nVQzWobg">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Package" xmi:id="_dYmtMJ-VEeevr48NX92ywA" name="Package1_ColumnSources">
+    <packagedElement xmi:type="uml:Class" xmi:id="_gFrXcJ-VEeevr48NX92ywA" name="Class11"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_gobfMJ-VEeevr48NX92ywA" name="Class12"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_gusfQJ-VEeevr48NX92ywA" name="Class13"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Dv-mkKd_EeeJf5bvpcTfHA" name="Class14"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_XComMKeDEeeJf5bvpcTfHA" client="_gFrXcJ-VEeevr48NX92ywA" supplier="_-7X5QJ-VEeevr48NX92ywA"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_YErSAKeDEeeJf5bvpcTfHA" client="_gobfMJ-VEeevr48NX92ywA" supplier="__bI-cJ-VEeevr48NX92ywA"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_Yo6AcKeDEeeJf5bvpcTfHA" client="_gusfQJ-VEeevr48NX92ywA" supplier="__cCWUJ-VEeevr48NX92ywA"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_ZJrLMKeDEeeJf5bvpcTfHA" client="_Dv-mkKd_EeeJf5bvpcTfHA" supplier="__lAFEJ-VEeevr48NX92ywA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_eCSjYJ-VEeevr48NX92ywA" name="Package2_ColumnSources">
+    <packagedElement xmi:type="uml:Class" xmi:id="_YJPP4J-WEeevr48NX92ywA" name="Class21"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_YJPP4Z-WEeevr48NX92ywA" name="Class22"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_YJPP4p-WEeevr48NX92ywA" name="Class23"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_eshvwKeDEeeJf5bvpcTfHA" client="_YJPP4J-WEeevr48NX92ywA" supplier="__bI-cJ-VEeevr48NX92ywA"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_fHRLAKeDEeeJf5bvpcTfHA" client="_YJPP4Z-WEeevr48NX92ywA" supplier="__cCWUJ-VEeevr48NX92ywA"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_fmdocKeDEeeJf5bvpcTfHA" client="_YJPP4p-WEeevr48NX92ywA" supplier="__lAFEJ-VEeevr48NX92ywA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_1nesAJ-VEeevr48NX92ywA" name="Package3_RowSources">
+    <nestedClassifier xmi:type="uml:Signal" xmi:id="_-7X5QJ-VEeevr48NX92ywA" name="Signal1"/>
+    <nestedClassifier xmi:type="uml:Signal" xmi:id="__bI-cJ-VEeevr48NX92ywA" name="Signal2"/>
+    <nestedClassifier xmi:type="uml:Signal" xmi:id="__cCWUJ-VEeevr48NX92ywA" name="Signal3"/>
+    <nestedClassifier xmi:type="uml:Signal" xmi:id="__lAFEJ-VEeevr48NX92ywA" name="Signal4"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.project b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.project
index 4ac6fd4a017..3ec85377f6a 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.project
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/OSGI-INF/l10n/bundle.properties
index 790a513615a..ad80a704904 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus UML NatTable Stereotyped Elements Tests
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/UMLNatTableStereotypedElementsTests.launch b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/UMLNatTableStereotypedElementsTests.launch
index 6467ab764a6..f49c6736242 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/UMLNatTableStereotypedElementsTests.launch
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/UMLNatTableStereotypedElementsTests.launch
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<listAttribute key="classFilters">

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.infra.emf.*)"/>

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.uml.tools.*)"/>

-<listEntry value="ClassFilter(include, *.tests.*)"/>

-</listAttribute>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -cp"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms120m -Xmx512m "/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<listAttribute key="classFilters">
+<listEntry value="ClassFilter(include, org.eclipse.papyrus.infra.emf.*)"/>
+<listEntry value="ClassFilter(include, org.eclipse.papyrus.uml.tools.*)"/>
+<listEntry value="ClassFilter(include, *.tests.*)"/>
+</listAttribute>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -cp"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms120m -Xmx512m "/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/about.html b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/about.html
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/build.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/build.properties
index 51f79d38de9..bfdb7edad46 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/build.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/build.properties
@@ -1,13 +1,13 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               OSGI-INF/,\

-               about.html,\

-               resources/,\

-               UMLNatTableStereotypedElementsTests.launch,\

-               plugin.properties,\

-               configs/,\

-               plugin.xml,\

-               icons/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about.html,\
+               resources/,\
+               UMLNatTableStereotypedElementsTests.launch,\
+               plugin.properties,\
+               configs/,\
+               plugin.xml,\
+               icons/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration
index 6330743f257..6f07ac78b07 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration
@@ -1,44 +1,44 @@
-<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" 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:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" description="This table is used to display SysML Allocation" name="AllocationTable" type="PapyrusDynamicAllocationTable" iconPath="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/icons/table_SysML_Allocation.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">

-    <stringListValue>ROW_HEADER</stringListValue>

-  </styles>

-  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">

-      <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.uml.Abstraction">

-      <postActions>applyStereotype:/SysMLCopy::Allocations::Allocate</postActions>

-      <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      <axisIdentifier xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_OgydQXmoEeWVZIGG1XbiFw">

-        <manager xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axisIdentifier>

-    </ownedAxisConfigurations>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.dyanmic.allocate.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/client"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/supplier"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-    </axis>

-  </columnAxisProviders>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" disconnectSlave="true"/>

-</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:ecore="http://www.eclipse.org/emf/2002/Ecore" 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:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" description="This table is used to display SysML Allocation" name="AllocationTable" type="PapyrusDynamicAllocationTable" iconPath="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/icons/table_SysML_Allocation.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
+  <styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">
+    <stringListValue>ROW_HEADER</stringListValue>
+  </styles>
+  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>
+    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">
+      <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.uml.Abstraction">
+      <postActions>applyStereotype:/SysMLCopy::Allocations::Allocate</postActions>
+      <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      <axisIdentifier xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_OgydQXmoEeWVZIGG1XbiFw">
+        <manager xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axisIdentifier>
+    </ownedAxisConfigurations>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.dyanmic.allocate.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>
+  </rowHeaderAxisConfiguration>
+  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration"/>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+  </columnHeaderAxisConfiguration>
+  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">
+    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
+      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
+      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/client"/>
+    </axis>
+    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
+      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/supplier"/>
+    </axis>
+    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
+      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+    </axis>
+  </columnAxisProviders>
+  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" disconnectSlave="true"/>
+</nattableconfiguration:TableConfiguration>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration
index eb60dddb85f..ca0ffaeb875 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration
@@ -1,37 +1,37 @@
-<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" 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:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" description="A synchronized table for SysML Requirements" name="RequirementTable" type="PapyrusDynamicRequirementTable" iconPath="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/icons/table_SysML_Requirement.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">

-    <stringListValue>ROW_HEADER</stringListValue>

-  </styles>

-  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">

-      <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.uml.Class">

-      <postActions>applyStereotype:/SysMLCopy::Requirements::Requirement</postActions>

-      <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      <axisIdentifier xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_OgydQXmoEeWVZIGG1XbiFw">

-        <manager xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axisIdentifier>

-    </ownedAxisConfigurations>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.dyanmic.requirement.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>

-  </columnAxisProviders>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</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:ecore="http://www.eclipse.org/emf/2002/Ecore" 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:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" description="A synchronized table for SysML Requirements" name="RequirementTable" type="PapyrusDynamicRequirementTable" iconPath="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/icons/table_SysML_Requirement.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
+  <styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">
+    <stringListValue>ROW_HEADER</stringListValue>
+  </styles>
+  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>
+    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">
+      <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <postActions>applyStereotype:/SysMLCopy::Requirements::Requirement</postActions>
+      <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      <axisIdentifier xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_OgydQXmoEeWVZIGG1XbiFw">
+        <manager xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axisIdentifier>
+    </ownedAxisConfigurations>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.dyanmic.requirement.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>
+  </rowHeaderAxisConfiguration>
+  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration"/>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+  </columnHeaderAxisConfiguration>
+  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>
+    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
+      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
+  </columnAxisProviders>
+  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+</nattableconfiguration:TableConfiguration>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/plugin.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/plugin.properties
index 83fd6a65d4c..1ce11041f9e 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/plugin.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/plugin.properties
@@ -1,15 +1,15 @@
-###############################################################################

-# 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

-###############################################################################

-pluginName=Papyrus UML NatTable Stereotyped Elements Tests

-providerName=Eclipse Modeling Project

-

+###############################################################################
+# 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
+###############################################################################
+pluginName=Papyrus UML NatTable Stereotyped Elements Tests
+providerName=Eclipse Modeling Project
+
 pluginDescription=This plugin provides tests for the stereotyped elements in tables
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.notation
index 3b0ea937162..e8aa9f9c6a7 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.notation
@@ -1,1658 +1,1658 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" 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/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider">

-  <notation:Diagram xmi:id="_pBS2xAKOEeSZ5cZUOQKWkw" type="RequirementDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" xmi:id="_q24fUQKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">

-      <eAnnotations xmi:id="_q3EskAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">

-        <details xmi:id="_q5K-UQKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:id="_q5K-UgKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysMLCopy::Requirements::Requirement"/>

-        <details xmi:id="_q5K-UwKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>

-        <details xmi:id="_q5K-VAKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysMLCopy::Requirements::Requirement.id,SysMLCopy::Requirements::Requirement.text"/>

-        <details xmi:id="_q5K-VQKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xsi:type="notation:DecorationNode" xmi:id="_q24fUwKOEeSZ5cZUOQKWkw" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_q24fVAKOEeSZ5cZUOQKWkw" type="7017">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_q24fVQKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_q24fVgKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_q24fVwKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fWAKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_q24fWQKOEeSZ5cZUOQKWkw" type="7018">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_q24fWgKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_q24fWwKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_q24fXAKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fXQKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_q24fXgKOEeSZ5cZUOQKWkw" type="7019">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_q24fXwKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_q24fYAKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_q24fYQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fYgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_q24fYwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">

-        <children xsi:type="notation:DecorationNode" xmi:id="_q24faAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>

-        <children xsi:type="notation:DecorationNode" xmi:id="_q24faQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>

-        <styles xsi:type="notation:TitleStyle" xmi:id="_q24fZAKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_q24fZQKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_q24fZgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fZwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_q2-l8AKOEeSZ5cZUOQKWkw" type="compartment_shape_display">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_q2-l8QKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q2-l8gKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_q5K-VgKOEeSZ5cZUOQKWkw" type="AppliedStereotypeCompartement">

-        <eAnnotations xmi:id="_q5RE8AKOEeSZ5cZUOQKWkw" source="PapyrusCSSForceValue">

-          <details xmi:id="_q5RE8QKOEeSZ5cZUOQKWkw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xsi:type="notation:TitleStyle" xmi:id="_q5K-VwKOEeSZ5cZUOQKWkw" showTitle="true"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q5K-WAKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element href="modelSysMLRequirement.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fUgKOEeSZ5cZUOQKWkw" x="565" y="11" width="123" height="137"/>

-    </children>

-    <children xsi:type="notation:Shape" xmi:id="_tKOa8QKOEeSZ5cZUOQKWkw" type="2007">

-      <children xsi:type="notation:DecorationNode" xmi:id="_tKOa8wKOEeSZ5cZUOQKWkw" type="5026"/>

-      <children xsi:type="notation:DecorationNode" xmi:id="_tKOa9AKOEeSZ5cZUOQKWkw" type="7016">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_tKOa9QKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tKOa9gKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_tKUhkAKOEeSZ5cZUOQKWkw" type="compartment_shape_display">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_tKUhkQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tKUhkgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element href="modelSysMLRequirement.uml#_tKOa8AKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tKOa8gKOEeSZ5cZUOQKWkw" x="12" y="18"/>

-    </children>

-    <children xsi:type="notation:Shape" xmi:id="_wDVWEAKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">

-      <eAnnotations xmi:id="_wDbcsAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">

-        <details xmi:id="_wDbcvAKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:id="_wDbcvQKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysMLCopy::Requirements::Requirement"/>

-        <details xmi:id="_wDbcvgKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>

-        <details xmi:id="_wDbcvwKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysMLCopy::Requirements::Requirement.id,SysMLCopy::Requirements::Requirement.text"/>

-        <details xmi:id="_wDbcwAKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xsi:type="notation:DecorationNode" xmi:id="_wDVWEgKOEeSZ5cZUOQKWkw" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWEwKOEeSZ5cZUOQKWkw" type="7017">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWFAKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_wDVWFQKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_wDVWFgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWFwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWGAKOEeSZ5cZUOQKWkw" type="7018">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWGQKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_wDVWGgKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_wDVWGwKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWHAKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWHQKOEeSZ5cZUOQKWkw" type="7019">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWHgKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_wDVWHwKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_wDVWIAKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWIQKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWIgKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">

-        <children xsi:type="notation:DecorationNode" xmi:id="_wDVWJwKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>

-        <children xsi:type="notation:DecorationNode" xmi:id="_wDVWKAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>

-        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWIwKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_wDVWJAKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_wDVWJQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWJgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWKQKOEeSZ5cZUOQKWkw" type="compartment_shape_display">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWKgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWKwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_wDbcwQKOEeSZ5cZUOQKWkw" type="AppliedStereotypeCompartement">

-        <eAnnotations xmi:id="_wDhjUAKOEeSZ5cZUOQKWkw" source="PapyrusCSSForceValue">

-          <details xmi:id="_wDhjUQKOEeSZ5cZUOQKWkw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xsi:type="notation:TitleStyle" xmi:id="_wDbcwgKOEeSZ5cZUOQKWkw" showTitle="true"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDbcwwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element href="modelSysMLRequirement.uml#_wDPPcAKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWEQKOEeSZ5cZUOQKWkw" x="297" y="19" width="143"/>

-    </children>

-    <children xsi:type="notation:Shape" xmi:id="_xF_s8QKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">

-      <eAnnotations xmi:id="_xGL6MAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">

-        <details xmi:id="_xGSA0QKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:id="_xGSA0gKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysMLCopy::Requirements::Requirement"/>

-        <details xmi:id="_xGSA0wKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>

-        <details xmi:id="_xGSA1AKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysMLCopy::Requirements::Requirement.id,SysMLCopy::Requirements::Requirement.text"/>

-        <details xmi:id="_xGSA1QKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xsi:type="notation:DecorationNode" xmi:id="_xF_s8wKOEeSZ5cZUOQKWkw" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_xF_s9AKOEeSZ5cZUOQKWkw" type="7017">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_xF_s9QKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_xF_s9gKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_xF_s9wKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_s-AKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_xF_s-QKOEeSZ5cZUOQKWkw" type="7018">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_xF_s-gKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_xF_s-wKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_xF_s_AKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_s_QKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_xF_s_gKOEeSZ5cZUOQKWkw" type="7019">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_xF_s_wKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_xF_tAAKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_xF_tAQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_tAgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_xF_tAwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">

-        <children xsi:type="notation:DecorationNode" xmi:id="_xF_tCAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>

-        <children xsi:type="notation:DecorationNode" xmi:id="_xF_tCQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>

-        <styles xsi:type="notation:TitleStyle" xmi:id="_xF_tBAKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_xF_tBQKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_xF_tBgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_tBwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element href="modelSysMLRequirement.uml#_xF_s8AKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_s8gKOEeSZ5cZUOQKWkw" x="658" y="217" width="119"/>

-    </children>

-    <children xsi:type="notation:Shape" xmi:id="_yZofEQKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">

-      <eAnnotations xmi:id="_yZ0sUAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">

-        <details xmi:id="_yZ6y8QKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:id="_yZ6y8gKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysMLCopy::Requirements::Requirement"/>

-        <details xmi:id="_yZ6y8wKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>

-        <details xmi:id="_yZ6y9AKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysMLCopy::Requirements::Requirement.id,SysMLCopy::Requirements::Requirement.text"/>

-        <details xmi:id="_yZ6y9QKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xsi:type="notation:DecorationNode" xmi:id="_yZofEwKOEeSZ5cZUOQKWkw" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_yZofFAKOEeSZ5cZUOQKWkw" type="7017">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_yZofFQKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_yZofFgKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_yZofFwKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofGAKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_yZofGQKOEeSZ5cZUOQKWkw" type="7018">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_yZofGgKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_yZofGwKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_yZofHAKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofHQKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_yZofHgKOEeSZ5cZUOQKWkw" type="7019">

-        <styles xsi:type="notation:TitleStyle" xmi:id="_yZofHwKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_yZofIAKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_yZofIQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofIgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" xmi:id="_yZofIwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">

-        <children xsi:type="notation:DecorationNode" xmi:id="_yZofKAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>

-        <children xsi:type="notation:DecorationNode" xmi:id="_yZofKQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>

-        <styles xsi:type="notation:TitleStyle" xmi:id="_yZofJAKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:SortingStyle" xmi:id="_yZofJQKOEeSZ5cZUOQKWkw"/>

-        <styles xsi:type="notation:FilteringStyle" xmi:id="_yZofJgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofJwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element href="modelSysMLRequirement.uml#_yZofEAKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofEgKOEeSZ5cZUOQKWkw" x="478" y="218" width="147"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle" xmi:id="_pBS2xQKOEeSZ5cZUOQKWkw"/>

-    <element href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-  </notation:Diagram>

-  <nattable:Table xmi:id="_B7qCgAKPEeSZ5cZUOQKWkw" name="GenericTable0" currentRowAxisProvider="_B7qCggKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_B7qCgQKPEeSZ5cZUOQKWkw">

-    <context href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_B7qCgQKPEeSZ5cZUOQKWkw" 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 xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXyQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyNQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpwQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeYQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQXAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derivedFrom">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyPAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derivedFrom">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpyAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derivedFrom">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeaAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derivedFrom">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyNwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpwwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeYwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXywKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXyAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::master">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyOgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::master">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpxgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::master">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeZgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::master">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/nestedPackage"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/nestedPackage"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/nestingPackage"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/nestingPackage"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXygKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/ownedStereotype"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/ownedStereotype"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/ownedType"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/ownedType"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packageMerge"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packageMerge"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/profileApplication"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/profileApplication"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::refinedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyNAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::refinedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpwAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::refinedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeYAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::refinedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::satisfiedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyOAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::satisfiedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpxAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::satisfiedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeZAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::satisfiedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNwKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1wKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyOQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpxQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeZQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::tracedTo">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyOwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::tracedTo">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpxwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::tracedTo">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeZwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::tracedTo">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWgKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/URI"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-gKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/URI"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::verifiedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyNgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::verifiedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpwgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::verifiedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeYgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::verifiedBy">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Model/viewpoint"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWQKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8AKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-QKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18QNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18gNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeature/isReadOnly"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18wNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/redefinedProperty"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19ANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/subsettedProperty"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19QNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19gNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/lowerValue"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19wNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/isComposite.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-ANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/aggregation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-QNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-gNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/qualifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-wNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/required"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_ANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/protocol"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_QNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/isUnique"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_gNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/isService"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_wNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/interface"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/associationEnd"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AQNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/redefinedPort"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AgNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement/type"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AwNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/provided"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BQNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/defaultValue"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BgNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BwNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CQNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/isStatic"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CgNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/featuringClassifier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CwNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentTarget/deployment"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/isBehavior"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DQNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/upperValue"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DgNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/class"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DwNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/isOrdered"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElement/end"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EQNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/isDerived"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EgNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EwNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/default"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FQNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/opposite"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FgNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FwNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentTarget/deployedElement"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/datatype"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GQNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/owningAssociation"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GgNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GwNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/association"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HQNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HgNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/isID"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HwNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/upper"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/isConjugated"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IQNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IgNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/isDerivedUnion"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IwNfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/lower"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_B7qCggKPEeSZ5cZUOQKWkw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

-      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_KeV1QAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_JvzUQAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element href="modelSysMLRequirement.uml#_tKOa8AKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_KMaXwAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element href="modelSysMLRequirement.uml#_xF_s8AKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_JFXQIAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element href="modelSysMLRequirement.uml#_wDPPcAKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_JWbyAAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element href="modelSysMLRequirement.uml#_yZofEAKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_JjHjIAKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element href="modelSysMLRequirement.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_pEr18ANfEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element href="modelSysMLRequirement.uml#_mCmlAANfEeSV3fVidaLvSQ"/>

-      </axis>

-    </rowAxisProvidersHistory>

-  </nattable:Table>

-  <nattable:Table xmi:id="_C2IGsAKPEeSZ5cZUOQKWkw" name="RequirementTable0" currentRowAxisProvider="_C2IGtQKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_C2IGsQKPEeSZ5cZUOQKWkw">

-    <context href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_C2IGsQKPEeSZ5cZUOQKWkw" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_C2IGsgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_C2IGswKPEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_C2IGtAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_C2IGtQKPEeSZ5cZUOQKWkw" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-  </nattable:Table>

-  <nattable:Table xmi:id="_EGhXkAKPEeSZ5cZUOQKWkw" name="TableOfViews0" currentRowAxisProvider="_EGhXlgKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_EGhXkQKPEeSZ5cZUOQKWkw">

-    <context href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_EGhXkQKPEeSZ5cZUOQKWkw" description="Provides the features of the views" name="Papyrus Views feature provider">

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXkgKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/name">

-        <manager href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXkwKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/context">

-        <manager href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXlAKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/isOpen">

-        <manager href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXlQKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/type">

-        <manager href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_EGhXlgKPEeSZ5cZUOQKWkw"/>

-  </nattable:Table>

-  <nattable:Table xmi:id="_ffxOYAKUEeSZ5cZUOQKWkw" name="RequirementTable1" currentRowAxisProvider="_ffxOZQKUEeSZ5cZUOQKWkw" currentColumnAxisProvider="_ffxOYQKUEeSZ5cZUOQKWkw">

-    <context href="modelSysMLRequirement.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>

-    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_ffxOYQKUEeSZ5cZUOQKWkw" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_ffxOYgKUEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ffxOYwKUEeSZ5cZUOQKWkw">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_ffxOZAKUEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_yaOl0ANbEeSV3fVidaLvSQ">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_ffxOZQKUEeSZ5cZUOQKWkw" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-  </nattable:Table>

-  <nattable:Table xmi:id="_ZfPQ8Av4EeSOiKqWiKPo8w" name="AllocationTable0" currentRowAxisProvider="_ZfP4AQv4EeSOiKqWiKPo8w" currentColumnAxisProvider="_ZfPQ8Qv4EeSOiKqWiKPo8w">

-    <context href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_ZfPQ8Qv4EeSOiKqWiKPo8w" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ8gv4EeSOiKqWiKPo8w">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ8wv4EeSOiKqWiKPo8w">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/client"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ9Av4EeSOiKqWiKPo8w">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/supplier"/>

-      </axis>

-      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfP4AAv4EeSOiKqWiKPo8w">

-        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_ZfP4AQv4EeSOiKqWiKPo8w" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" 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: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:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" 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/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider">
+  <notation:Diagram xmi:id="_pBS2xAKOEeSZ5cZUOQKWkw" type="RequirementDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xsi:type="notation:Shape" xmi:id="_q24fUQKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">
+      <eAnnotations xmi:id="_q3EskAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">
+        <details xmi:id="_q5K-UQKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:id="_q5K-UgKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysMLCopy::Requirements::Requirement"/>
+        <details xmi:id="_q5K-UwKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>
+        <details xmi:id="_q5K-VAKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysMLCopy::Requirements::Requirement.id,SysMLCopy::Requirements::Requirement.text"/>
+        <details xmi:id="_q5K-VQKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xsi:type="notation:DecorationNode" xmi:id="_q24fUwKOEeSZ5cZUOQKWkw" type="5029"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_q24fVAKOEeSZ5cZUOQKWkw" type="7017">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_q24fVQKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_q24fVgKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_q24fVwKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fWAKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_q24fWQKOEeSZ5cZUOQKWkw" type="7018">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_q24fWgKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_q24fWwKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_q24fXAKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fXQKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_q24fXgKOEeSZ5cZUOQKWkw" type="7019">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_q24fXwKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_q24fYAKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_q24fYQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fYgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_q24fYwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">
+        <children xsi:type="notation:DecorationNode" xmi:id="_q24faAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>
+        <children xsi:type="notation:DecorationNode" xmi:id="_q24faQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_q24fZAKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_q24fZQKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_q24fZgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fZwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_q2-l8AKOEeSZ5cZUOQKWkw" type="compartment_shape_display">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_q2-l8QKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q2-l8gKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_q5K-VgKOEeSZ5cZUOQKWkw" type="AppliedStereotypeCompartement">
+        <eAnnotations xmi:id="_q5RE8AKOEeSZ5cZUOQKWkw" source="PapyrusCSSForceValue">
+          <details xmi:id="_q5RE8QKOEeSZ5cZUOQKWkw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_q5K-VwKOEeSZ5cZUOQKWkw" showTitle="true"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q5K-WAKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element href="modelSysMLRequirement.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_q24fUgKOEeSZ5cZUOQKWkw" x="565" y="11" width="123" height="137"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_tKOa8QKOEeSZ5cZUOQKWkw" type="2007">
+      <children xsi:type="notation:DecorationNode" xmi:id="_tKOa8wKOEeSZ5cZUOQKWkw" type="5026"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_tKOa9AKOEeSZ5cZUOQKWkw" type="7016">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_tKOa9QKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tKOa9gKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_tKUhkAKOEeSZ5cZUOQKWkw" type="compartment_shape_display">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_tKUhkQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tKUhkgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element href="modelSysMLRequirement.uml#_tKOa8AKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_tKOa8gKOEeSZ5cZUOQKWkw" x="12" y="18"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_wDVWEAKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">
+      <eAnnotations xmi:id="_wDbcsAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">
+        <details xmi:id="_wDbcvAKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:id="_wDbcvQKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysMLCopy::Requirements::Requirement"/>
+        <details xmi:id="_wDbcvgKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>
+        <details xmi:id="_wDbcvwKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysMLCopy::Requirements::Requirement.id,SysMLCopy::Requirements::Requirement.text"/>
+        <details xmi:id="_wDbcwAKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xsi:type="notation:DecorationNode" xmi:id="_wDVWEgKOEeSZ5cZUOQKWkw" type="5029"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWEwKOEeSZ5cZUOQKWkw" type="7017">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWFAKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_wDVWFQKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_wDVWFgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWFwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWGAKOEeSZ5cZUOQKWkw" type="7018">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWGQKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_wDVWGgKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_wDVWGwKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWHAKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWHQKOEeSZ5cZUOQKWkw" type="7019">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWHgKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_wDVWHwKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_wDVWIAKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWIQKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWIgKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">
+        <children xsi:type="notation:DecorationNode" xmi:id="_wDVWJwKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>
+        <children xsi:type="notation:DecorationNode" xmi:id="_wDVWKAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWIwKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_wDVWJAKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_wDVWJQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWJgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_wDVWKQKOEeSZ5cZUOQKWkw" type="compartment_shape_display">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_wDVWKgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWKwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_wDbcwQKOEeSZ5cZUOQKWkw" type="AppliedStereotypeCompartement">
+        <eAnnotations xmi:id="_wDhjUAKOEeSZ5cZUOQKWkw" source="PapyrusCSSForceValue">
+          <details xmi:id="_wDhjUQKOEeSZ5cZUOQKWkw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_wDbcwgKOEeSZ5cZUOQKWkw" showTitle="true"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDbcwwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element href="modelSysMLRequirement.uml#_wDPPcAKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_wDVWEQKOEeSZ5cZUOQKWkw" x="297" y="19" width="143"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_xF_s8QKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">
+      <eAnnotations xmi:id="_xGL6MAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">
+        <details xmi:id="_xGSA0QKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:id="_xGSA0gKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysMLCopy::Requirements::Requirement"/>
+        <details xmi:id="_xGSA0wKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>
+        <details xmi:id="_xGSA1AKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysMLCopy::Requirements::Requirement.id,SysMLCopy::Requirements::Requirement.text"/>
+        <details xmi:id="_xGSA1QKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xsi:type="notation:DecorationNode" xmi:id="_xF_s8wKOEeSZ5cZUOQKWkw" type="5029"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_xF_s9AKOEeSZ5cZUOQKWkw" type="7017">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_xF_s9QKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_xF_s9gKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_xF_s9wKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_s-AKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_xF_s-QKOEeSZ5cZUOQKWkw" type="7018">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_xF_s-gKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_xF_s-wKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_xF_s_AKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_s_QKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_xF_s_gKOEeSZ5cZUOQKWkw" type="7019">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_xF_s_wKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_xF_tAAKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_xF_tAQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_tAgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_xF_tAwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">
+        <children xsi:type="notation:DecorationNode" xmi:id="_xF_tCAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>
+        <children xsi:type="notation:DecorationNode" xmi:id="_xF_tCQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_xF_tBAKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_xF_tBQKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_xF_tBgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_tBwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element href="modelSysMLRequirement.uml#_xF_s8AKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_xF_s8gKOEeSZ5cZUOQKWkw" x="658" y="217" width="119"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_yZofEQKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">
+      <eAnnotations xmi:id="_yZ0sUAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">
+        <details xmi:id="_yZ6y8QKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:id="_yZ6y8gKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysMLCopy::Requirements::Requirement"/>
+        <details xmi:id="_yZ6y8wKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>
+        <details xmi:id="_yZ6y9AKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysMLCopy::Requirements::Requirement.id,SysMLCopy::Requirements::Requirement.text"/>
+        <details xmi:id="_yZ6y9QKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xsi:type="notation:DecorationNode" xmi:id="_yZofEwKOEeSZ5cZUOQKWkw" type="5029"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_yZofFAKOEeSZ5cZUOQKWkw" type="7017">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_yZofFQKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_yZofFgKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_yZofFwKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofGAKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_yZofGQKOEeSZ5cZUOQKWkw" type="7018">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_yZofGgKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_yZofGwKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_yZofHAKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofHQKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_yZofHgKOEeSZ5cZUOQKWkw" type="7019">
+        <styles xsi:type="notation:TitleStyle" xmi:id="_yZofHwKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_yZofIAKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_yZofIQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofIgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_yZofIwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">
+        <children xsi:type="notation:DecorationNode" xmi:id="_yZofKAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>
+        <children xsi:type="notation:DecorationNode" xmi:id="_yZofKQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>
+        <styles xsi:type="notation:TitleStyle" xmi:id="_yZofJAKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:SortingStyle" xmi:id="_yZofJQKOEeSZ5cZUOQKWkw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_yZofJgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofJwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element href="modelSysMLRequirement.uml#_yZofEAKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_yZofEgKOEeSZ5cZUOQKWkw" x="478" y="218" width="147"/>
+    </children>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_pBS2xQKOEeSZ5cZUOQKWkw"/>
+    <element href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+  </notation:Diagram>
+  <nattable:Table xmi:id="_B7qCgAKPEeSZ5cZUOQKWkw" name="GenericTable0" currentRowAxisProvider="_B7qCggKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_B7qCgQKPEeSZ5cZUOQKWkw">
+    <context href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_B7qCgQKPEeSZ5cZUOQKWkw" 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 xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXyQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyNQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpwQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeYQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQXAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derivedFrom">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyPAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derivedFrom">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpyAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derivedFrom">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeaAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derivedFrom">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyNwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpwwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeYwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXywKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXyAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::master">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyOgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::master">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpxgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::master">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeZgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::master">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/nestedPackage"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/nestedPackage"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/nestingPackage"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/nestingPackage"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXygKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/ownedStereotype"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/ownedStereotype"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/ownedType"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/ownedType"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packageMerge"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packageMerge"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/profileApplication"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/profileApplication"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::refinedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyNAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::refinedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpwAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::refinedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeYAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::refinedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::satisfiedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyOAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::satisfiedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpxAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::satisfiedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeZAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::satisfiedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNwKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1wKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyOQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpxQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeZQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::tracedTo">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyOwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::tracedTo">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpxwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::tracedTo">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeZwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::tracedTo">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWgKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/URI"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-gKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/URI"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::verifiedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JWbyNgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::verifiedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_JjNpwgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::verifiedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_KMgeYgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::verifiedBy">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Model/viewpoint"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWQKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8AKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-QKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18QNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18gNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeature/isReadOnly"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18wNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/redefinedProperty"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19ANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/subsettedProperty"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19QNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19gNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/lowerValue"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19wNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/isComposite.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-ANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/aggregation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-QNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-gNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/qualifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-wNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/required"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_ANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/protocol"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_QNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/isUnique"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_gNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/isService"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_wNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/interface"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/associationEnd"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AQNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/redefinedPort"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AgNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement/type"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AwNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/provided"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BQNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/defaultValue"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BgNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BwNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CQNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/isStatic"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CgNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature/featuringClassifier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CwNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentTarget/deployment"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/isBehavior"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DQNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/upperValue"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DgNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/class"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DwNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/isOrdered"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElement/end"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EQNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/isDerived"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EgNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EwNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/default"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FQNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/opposite"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FgNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FwNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentTarget/deployedElement"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/datatype"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GQNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/owningAssociation"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GgNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GwNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/association"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HQNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HgNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/isID"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HwNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/upper"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port/isConjugated"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IQNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IgNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property/isDerivedUnion"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IwNfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement/lower"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_B7qCggKPEeSZ5cZUOQKWkw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_KeV1QAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_JvzUQAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element href="modelSysMLRequirement.uml#_tKOa8AKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_KMaXwAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element href="modelSysMLRequirement.uml#_xF_s8AKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_JFXQIAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element href="modelSysMLRequirement.uml#_wDPPcAKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_JWbyAAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element href="modelSysMLRequirement.uml#_yZofEAKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_JjHjIAKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element href="modelSysMLRequirement.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EObjectAxis" xmi:id="_pEr18ANfEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element href="modelSysMLRequirement.uml#_mCmlAANfEeSV3fVidaLvSQ"/>
+      </axis>
+    </rowAxisProvidersHistory>
+  </nattable:Table>
+  <nattable:Table xmi:id="_C2IGsAKPEeSZ5cZUOQKWkw" name="RequirementTable0" currentRowAxisProvider="_C2IGtQKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_C2IGsQKPEeSZ5cZUOQKWkw">
+    <context href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_C2IGsQKPEeSZ5cZUOQKWkw" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_C2IGsgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_C2IGswKPEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_C2IGtAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_C2IGtQKPEeSZ5cZUOQKWkw" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+  </nattable:Table>
+  <nattable:Table xmi:id="_EGhXkAKPEeSZ5cZUOQKWkw" name="TableOfViews0" currentRowAxisProvider="_EGhXlgKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_EGhXkQKPEeSZ5cZUOQKWkw">
+    <context href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_EGhXkQKPEeSZ5cZUOQKWkw" description="Provides the features of the views" name="Papyrus Views feature provider">
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXkgKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/name">
+        <manager href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXkwKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/context">
+        <manager href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXlAKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/isOpen">
+        <manager href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXlQKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/type">
+        <manager href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_EGhXlgKPEeSZ5cZUOQKWkw"/>
+  </nattable:Table>
+  <nattable:Table xmi:id="_ffxOYAKUEeSZ5cZUOQKWkw" name="RequirementTable1" currentRowAxisProvider="_ffxOZQKUEeSZ5cZUOQKWkw" currentColumnAxisProvider="_ffxOYQKUEeSZ5cZUOQKWkw">
+    <context href="modelSysMLRequirement.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>
+    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_ffxOYQKUEeSZ5cZUOQKWkw" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_ffxOYgKUEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ffxOYwKUEeSZ5cZUOQKWkw">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:FeatureIdAxis" xmi:id="_ffxOZAKUEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_yaOl0ANbEeSV3fVidaLvSQ">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_ffxOZQKUEeSZ5cZUOQKWkw" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+  </nattable:Table>
+  <nattable:Table xmi:id="_ZfPQ8Av4EeSOiKqWiKPo8w" name="AllocationTable0" currentRowAxisProvider="_ZfP4AQv4EeSOiKqWiKPo8w" currentColumnAxisProvider="_ZfPQ8Qv4EeSOiKqWiKPo8w">
+    <context href="modelSysMLRequirement.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_ZfPQ8Qv4EeSOiKqWiKPo8w" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ8gv4EeSOiKqWiKPo8w">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ8wv4EeSOiKqWiKPo8w">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/client"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ9Av4EeSOiKqWiKPo8w">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/supplier"/>
+      </axis>
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfP4AAv4EeSOiKqWiKPo8w">
+        <manager href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_ZfP4AQv4EeSOiKqWiKPo8w" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" disconnectSlave="true"/>
+  </nattable:Table>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.uml
index b346f5f2b7b..a3e75d510e2 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/allocation/modelSysMLRequirement.uml
@@ -1,171 +1,171 @@
-<?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:Allocations="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Allocations" xmlns:PortAndFlows="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/PortAndFlows" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Allocations platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3iJ8PgMEeWiHvr2EcCZeg http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/PortAndFlows platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3efkPgMEeWiHvr2EcCZeg http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_o-VpUAKOEeSZ5cZUOQKWkw" name="SysMLmodel">

-    <packagedElement xmi:type="uml:Package" xmi:id="_tKOa8AKOEeSZ5cZUOQKWkw" name="Star Fighter">

-      <packagedElement xmi:type="uml:Class" xmi:id="_YNurgAKREeSZ5cZUOQKWkw" name="Requirement"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_q24fUAKOEeSZ5cZUOQKWkw" name="Durability" isActive="true">

-        <ownedAttribute xmi:type="uml:Port" xmi:id="_mCmlAANfEeSV3fVidaLvSQ" name="port" visibility="public" isReadOnly="true" aggregation="composite"/>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_wDPPcAKOEeSZ5cZUOQKWkw" name="Engine">

-          <nestedClassifier xmi:type="uml:Class" xmi:id="_yZofEAKOEeSZ5cZUOQKWkw" name="Maneuverability"/>

-        </nestedClassifier>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_xF_s8AKOEeSZ5cZUOQKWkw" name="Shield"/>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Abstraction" xmi:id="_bVbWgAv4EeSOiKqWiKPo8w" name="Allocate"/>

-    <packagedElement xmi:type="uml:Abstraction" xmi:id="_cGN6QAv4EeSOiKqWiKPo8w" name="Allocate1"/>

-    <packagedElement xmi:type="uml:Abstraction" xmi:id="_cg0yoAv4EeSOiKqWiKPo8w" name="Allocate2"/>

-    <packagedElement xmi:type="uml:Abstraction" xmi:id="_c8TNsAv4EeSOiKqWiKPo8w" name="Allocate3"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a42yQNcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a42yQtcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yQ9csEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yRNcsEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yRdcsEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yRtcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yR9csEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a42yQdcsEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3REMPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a42ySNcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjQNcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjQdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjQtcsEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjQ9csEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjRNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjRdcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a42ySdcsEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3YY8PgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjRtcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjSNcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjSdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjStcsEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjS9csEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjTNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjTdcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjR9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3a1MPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjTtcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjUNcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjUdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjUtcsEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjU9csEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjVNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjVdcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjT9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3efkPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjVtcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjWNcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjWdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjWtcsEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjW9csEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjXNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjXdcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjV9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3fGoPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjXtcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjYNcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjYdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjYtcsEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjY9csEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjZNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjZdcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjX9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3gUwPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjZtcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjaNcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjadcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjatcsEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5Aja9csEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjbNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjbdcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjZ9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3iJ8PgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjbtcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjcNcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjcdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjctcsEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5Ajc9csEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjdNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjddcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5Ajb9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjdtcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjeNcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjedcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjetcsEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5Aje9csEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjfNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjfdcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5Ajd9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3nCcPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjftcsEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5JtMdcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtMtcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtM9csEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtNNcsEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtNdcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtNtcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5JtMNcsEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3npgPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5JtN9csEea8aYjHqyiaGA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5JtOdcsEea8aYjHqyiaGA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtOtcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtO9csEea8aYjHqyiaGA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtPNcsEea8aYjHqyiaGA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtPdcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtPtcsEea8aYjHqyiaGA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5JtONcsEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3oQkPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Allocations:Allocate xmi:id="_b9eQ8NcsEea8aYjHqyiaGA" base_Abstraction="_bVbWgAv4EeSOiKqWiKPo8w"/>

-  <Allocations:Allocate xmi:id="_ceJVENcsEea8aYjHqyiaGA" base_Abstraction="_cGN6QAv4EeSOiKqWiKPo8w"/>

-  <Allocations:Allocate xmi:id="_c-b-sNcsEea8aYjHqyiaGA" base_Abstraction="_cg0yoAv4EeSOiKqWiKPo8w"/>

-  <Allocations:Allocate xmi:id="_dfMiYNcsEea8aYjHqyiaGA" base_Abstraction="_c8TNsAv4EeSOiKqWiKPo8w"/>

-  <Requirements:Requirement xmi:id="_mf6U8NcsEea8aYjHqyiaGA" base_Class="_q24fUAKOEeSZ5cZUOQKWkw"/>

-  <Requirements:Requirement xmi:id="_oQ80wNcsEea8aYjHqyiaGA" base_Class="_wDPPcAKOEeSZ5cZUOQKWkw"/>

-  <Requirements:Requirement xmi:id="_pwoe0NcsEea8aYjHqyiaGA" base_Class="_xF_s8AKOEeSZ5cZUOQKWkw"/>

-  <Requirements:Requirement xmi:id="_rtiQYNcsEea8aYjHqyiaGA" base_Class="_yZofEAKOEeSZ5cZUOQKWkw"/>

-  <Requirements:Requirement xmi:id="_sS9RoNcsEea8aYjHqyiaGA" base_Class="_YNurgAKREeSZ5cZUOQKWkw"/>

-</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:Allocations="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Allocations" xmlns:PortAndFlows="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/PortAndFlows" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Allocations platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3iJ8PgMEeWiHvr2EcCZeg http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/PortAndFlows platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3efkPgMEeWiHvr2EcCZeg http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_o-VpUAKOEeSZ5cZUOQKWkw" name="SysMLmodel">
+    <packagedElement xmi:type="uml:Package" xmi:id="_tKOa8AKOEeSZ5cZUOQKWkw" name="Star Fighter">
+      <packagedElement xmi:type="uml:Class" xmi:id="_YNurgAKREeSZ5cZUOQKWkw" name="Requirement"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_q24fUAKOEeSZ5cZUOQKWkw" name="Durability" isActive="true">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_mCmlAANfEeSV3fVidaLvSQ" name="port" visibility="public" isReadOnly="true" aggregation="composite"/>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_wDPPcAKOEeSZ5cZUOQKWkw" name="Engine">
+          <nestedClassifier xmi:type="uml:Class" xmi:id="_yZofEAKOEeSZ5cZUOQKWkw" name="Maneuverability"/>
+        </nestedClassifier>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_xF_s8AKOEeSZ5cZUOQKWkw" name="Shield"/>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Abstraction" xmi:id="_bVbWgAv4EeSOiKqWiKPo8w" name="Allocate"/>
+    <packagedElement xmi:type="uml:Abstraction" xmi:id="_cGN6QAv4EeSOiKqWiKPo8w" name="Allocate1"/>
+    <packagedElement xmi:type="uml:Abstraction" xmi:id="_cg0yoAv4EeSOiKqWiKPo8w" name="Allocate2"/>
+    <packagedElement xmi:type="uml:Abstraction" xmi:id="_c8TNsAv4EeSOiKqWiKPo8w" name="Allocate3"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a42yQNcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a42yQtcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yQ9csEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yRNcsEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yRdcsEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yRtcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a42yR9csEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a42yQdcsEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3REMPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a42ySNcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjQNcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjQdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjQtcsEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjQ9csEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjRNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjRdcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a42ySdcsEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3YY8PgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjRtcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjSNcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjSdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjStcsEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjS9csEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjTNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjTdcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjR9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3a1MPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjTtcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjUNcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjUdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjUtcsEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjU9csEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjVNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjVdcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjT9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3efkPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjVtcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjWNcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjWdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjWtcsEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjW9csEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjXNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjXdcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjV9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3fGoPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjXtcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjYNcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjYdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjYtcsEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjY9csEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjZNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjZdcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjX9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3gUwPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjZtcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjaNcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjadcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjatcsEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5Aja9csEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjbNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjbdcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjZ9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3iJ8PgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjbtcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjcNcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjcdcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjctcsEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5Ajc9csEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjdNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjddcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5Ajb9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjdtcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5AjeNcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjedcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjetcsEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5Aje9csEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjfNcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5AjfdcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5Ajd9csEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3nCcPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5AjftcsEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5JtMdcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtMtcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtM9csEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtNNcsEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtNdcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtNtcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5JtMNcsEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3npgPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a5JtN9csEea8aYjHqyiaGA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5JtOdcsEea8aYjHqyiaGA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtOtcsEea8aYjHqyiaGA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtO9csEea8aYjHqyiaGA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtPNcsEea8aYjHqyiaGA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtPdcsEea8aYjHqyiaGA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a5JtPtcsEea8aYjHqyiaGA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a5JtONcsEea8aYjHqyiaGA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3oQkPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Allocations:Allocate xmi:id="_b9eQ8NcsEea8aYjHqyiaGA" base_Abstraction="_bVbWgAv4EeSOiKqWiKPo8w"/>
+  <Allocations:Allocate xmi:id="_ceJVENcsEea8aYjHqyiaGA" base_Abstraction="_cGN6QAv4EeSOiKqWiKPo8w"/>
+  <Allocations:Allocate xmi:id="_c-b-sNcsEea8aYjHqyiaGA" base_Abstraction="_cg0yoAv4EeSOiKqWiKPo8w"/>
+  <Allocations:Allocate xmi:id="_dfMiYNcsEea8aYjHqyiaGA" base_Abstraction="_c8TNsAv4EeSOiKqWiKPo8w"/>
+  <Requirements:Requirement xmi:id="_mf6U8NcsEea8aYjHqyiaGA" base_Class="_q24fUAKOEeSZ5cZUOQKWkw"/>
+  <Requirements:Requirement xmi:id="_oQ80wNcsEea8aYjHqyiaGA" base_Class="_wDPPcAKOEeSZ5cZUOQKWkw"/>
+  <Requirements:Requirement xmi:id="_pwoe0NcsEea8aYjHqyiaGA" base_Class="_xF_s8AKOEeSZ5cZUOQKWkw"/>
+  <Requirements:Requirement xmi:id="_rtiQYNcsEea8aYjHqyiaGA" base_Class="_yZofEAKOEeSZ5cZUOQKWkw"/>
+  <Requirements:Requirement xmi:id="_sS9RoNcsEea8aYjHqyiaGA" base_Class="_YNurgAKREeSZ5cZUOQKWkw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug439501/RequirementsReordering.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug439501/RequirementsReordering.uml
index ef75af5c5cb..62575dc5ed5 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug439501/RequirementsReordering.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug439501/RequirementsReordering.uml
@@ -1,26 +1,26 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_U8kqgBHuEeabc_zdDAmbEg" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_6o5QcBHvEeabc_zdDAmbEg" name="Requirement1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_8Jij0BHvEeabc_zdDAmbEg" name="Requirement2"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_8mV0kBHvEeabc_zdDAmbEg" name="Requirement3"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_9JvckBHvEeabc_zdDAmbEg" name="Requirement4"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_t5B4gNflEeaf76nZ2otNYw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t5DGoNflEeaf76nZ2otNYw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGodflEeaf76nZ2otNYw" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGotflEeaf76nZ2otNYw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGo9flEeaf76nZ2otNYw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGpNflEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGpdflEeaf76nZ2otNYw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t5CfkNflEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_uuzp8NflEeaf76nZ2otNYw" base_Class="_6o5QcBHvEeabc_zdDAmbEg"/>

-  <Requirements:Requirement xmi:id="_vLZfUNflEeaf76nZ2otNYw" base_Class="_8Jij0BHvEeabc_zdDAmbEg"/>

-  <Requirements:Requirement xmi:id="_vo8W8NflEeaf76nZ2otNYw" base_Class="_8mV0kBHvEeabc_zdDAmbEg"/>

-  <Requirements:Requirement xmi:id="_wMTisNflEeaf76nZ2otNYw" base_Class="_9JvckBHvEeabc_zdDAmbEg"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_U8kqgBHuEeabc_zdDAmbEg" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_6o5QcBHvEeabc_zdDAmbEg" name="Requirement1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_8Jij0BHvEeabc_zdDAmbEg" name="Requirement2"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_8mV0kBHvEeabc_zdDAmbEg" name="Requirement3"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_9JvckBHvEeabc_zdDAmbEg" name="Requirement4"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_t5B4gNflEeaf76nZ2otNYw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t5DGoNflEeaf76nZ2otNYw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGodflEeaf76nZ2otNYw" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGotflEeaf76nZ2otNYw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGo9flEeaf76nZ2otNYw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGpNflEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t5DGpdflEeaf76nZ2otNYw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t5CfkNflEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_uuzp8NflEeaf76nZ2otNYw" base_Class="_6o5QcBHvEeabc_zdDAmbEg"/>
+  <Requirements:Requirement xmi:id="_vLZfUNflEeaf76nZ2otNYw" base_Class="_8Jij0BHvEeabc_zdDAmbEg"/>
+  <Requirements:Requirement xmi:id="_vo8W8NflEeaf76nZ2otNYw" base_Class="_8mV0kBHvEeabc_zdDAmbEg"/>
+  <Requirements:Requirement xmi:id="_wMTisNflEeaf76nZ2otNYw" base_Class="_9JvckBHvEeabc_zdDAmbEg"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/AxisChangeIndexWithConfiguration.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/AxisChangeIndexWithConfiguration.uml
index bec9cd1ff4e..b491eae40ae 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/AxisChangeIndexWithConfiguration.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/AxisChangeIndexWithConfiguration.uml
@@ -1,22 +1,22 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_uY1xkDn6EeWPxqj3h6BDbw" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_OdbvcDn7EeWPxqj3h6BDbw" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_Vn_RoDn7EeWPxqj3h6BDbw" name="Class2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_EH0kANfoEeaf76nZ2otNYw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EH1LEdfoEeaf76nZ2otNYw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LEtfoEeaf76nZ2otNYw" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LE9foEeaf76nZ2otNYw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LFNfoEeaf76nZ2otNYw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LFdfoEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LFtfoEeaf76nZ2otNYw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EH1LENfoEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_EpnCcNfoEeaf76nZ2otNYw" base_Class="_OdbvcDn7EeWPxqj3h6BDbw"/>

-  <Requirements:Requirement xmi:id="_FJqbgNfoEeaf76nZ2otNYw" base_Class="_Vn_RoDn7EeWPxqj3h6BDbw"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_uY1xkDn6EeWPxqj3h6BDbw" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_OdbvcDn7EeWPxqj3h6BDbw" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Vn_RoDn7EeWPxqj3h6BDbw" name="Class2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_EH0kANfoEeaf76nZ2otNYw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EH1LEdfoEeaf76nZ2otNYw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LEtfoEeaf76nZ2otNYw" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LE9foEeaf76nZ2otNYw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LFNfoEeaf76nZ2otNYw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LFdfoEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EH1LFtfoEeaf76nZ2otNYw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EH1LENfoEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_EpnCcNfoEeaf76nZ2otNYw" base_Class="_OdbvcDn7EeWPxqj3h6BDbw"/>
+  <Requirements:Requirement xmi:id="_FJqbgNfoEeaf76nZ2otNYw" base_Class="_Vn_RoDn7EeWPxqj3h6BDbw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/AxisChangeIndexWithoutConfiguration.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/AxisChangeIndexWithoutConfiguration.uml
index 83e3ec42d4e..b36c9a46c4a 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/AxisChangeIndexWithoutConfiguration.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/AxisChangeIndexWithoutConfiguration.uml
@@ -1,22 +1,22 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_uY1xkDn6EeWPxqj3h6BDbw" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_OdbvcDn7EeWPxqj3h6BDbw" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_Vn_RoDn7EeWPxqj3h6BDbw" name="Class2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_j2YAcNfoEeaf76nZ2otNYw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_j2acsNfoEeaf76nZ2otNYw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2acsdfoEeaf76nZ2otNYw" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2acstfoEeaf76nZ2otNYw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2acs9foEeaf76nZ2otNYw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2actNfoEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2actdfoEeaf76nZ2otNYw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_j2ZOkNfoEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_kVnhMNfoEeaf76nZ2otNYw" base_Class="_OdbvcDn7EeWPxqj3h6BDbw"/>

-  <Requirements:Requirement xmi:id="_k589UNfoEeaf76nZ2otNYw" base_Class="_Vn_RoDn7EeWPxqj3h6BDbw"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_uY1xkDn6EeWPxqj3h6BDbw" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_OdbvcDn7EeWPxqj3h6BDbw" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Vn_RoDn7EeWPxqj3h6BDbw" name="Class2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_j2YAcNfoEeaf76nZ2otNYw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_j2acsNfoEeaf76nZ2otNYw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2acsdfoEeaf76nZ2otNYw" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2acstfoEeaf76nZ2otNYw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2acs9foEeaf76nZ2otNYw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2actNfoEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2actdfoEeaf76nZ2otNYw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_j2ZOkNfoEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_kVnhMNfoEeaf76nZ2otNYw" base_Class="_OdbvcDn7EeWPxqj3h6BDbw"/>
+  <Requirements:Requirement xmi:id="_k589UNfoEeaf76nZ2otNYw" base_Class="_Vn_RoDn7EeWPxqj3h6BDbw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/InvertedAxisChangeIndexWithConfiguration.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/InvertedAxisChangeIndexWithConfiguration.uml
index 4f15194b98e..dd754148a30 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/InvertedAxisChangeIndexWithConfiguration.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/InvertedAxisChangeIndexWithConfiguration.uml
@@ -1,22 +1,22 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_uY1xkDn6EeWPxqj3h6BDbw" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_OdbvcDn7EeWPxqj3h6BDbw" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_Vn_RoDn7EeWPxqj3h6BDbw" name="Class2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_nqyGMNfoEeaf76nZ2otNYw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nqytQdfoEeaf76nZ2otNYw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytQtfoEeaf76nZ2otNYw" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytQ9foEeaf76nZ2otNYw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytRNfoEeaf76nZ2otNYw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytRdfoEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytRtfoEeaf76nZ2otNYw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nqytQNfoEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_oNJzcNfoEeaf76nZ2otNYw" base_Class="_Vn_RoDn7EeWPxqj3h6BDbw"/>

-  <Requirements:Requirement xmi:id="_otYysNfoEeaf76nZ2otNYw" base_Class="_OdbvcDn7EeWPxqj3h6BDbw"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_uY1xkDn6EeWPxqj3h6BDbw" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_OdbvcDn7EeWPxqj3h6BDbw" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Vn_RoDn7EeWPxqj3h6BDbw" name="Class2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_nqyGMNfoEeaf76nZ2otNYw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nqytQdfoEeaf76nZ2otNYw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytQtfoEeaf76nZ2otNYw" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytQ9foEeaf76nZ2otNYw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytRNfoEeaf76nZ2otNYw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytRdfoEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nqytRtfoEeaf76nZ2otNYw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nqytQNfoEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_oNJzcNfoEeaf76nZ2otNYw" base_Class="_Vn_RoDn7EeWPxqj3h6BDbw"/>
+  <Requirements:Requirement xmi:id="_otYysNfoEeaf76nZ2otNYw" base_Class="_OdbvcDn7EeWPxqj3h6BDbw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/InvertedAxisChangeIndexWithoutConfiguration.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/InvertedAxisChangeIndexWithoutConfiguration.uml
index 25e186b22ce..6d23c316fbc 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/InvertedAxisChangeIndexWithoutConfiguration.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/bugs/bug473155/InvertedAxisChangeIndexWithoutConfiguration.uml
@@ -1,22 +1,22 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_uY1xkDn6EeWPxqj3h6BDbw" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_OdbvcDn7EeWPxqj3h6BDbw" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_Vn_RoDn7EeWPxqj3h6BDbw" name="Class2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_rmhjANfoEeaf76nZ2otNYw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rmiKEdfoEeaf76nZ2otNYw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKEtfoEeaf76nZ2otNYw" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKE9foEeaf76nZ2otNYw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKFNfoEeaf76nZ2otNYw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKFdfoEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKFtfoEeaf76nZ2otNYw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rmiKENfoEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_sLAJENfoEeaf76nZ2otNYw" base_Class="_OdbvcDn7EeWPxqj3h6BDbw"/>

-  <Requirements:Requirement xmi:id="_sqGf4NfoEeaf76nZ2otNYw" base_Class="_Vn_RoDn7EeWPxqj3h6BDbw"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_uY1xkDn6EeWPxqj3h6BDbw" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_OdbvcDn7EeWPxqj3h6BDbw" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Vn_RoDn7EeWPxqj3h6BDbw" name="Class2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_rmhjANfoEeaf76nZ2otNYw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rmiKEdfoEeaf76nZ2otNYw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKEtfoEeaf76nZ2otNYw" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKE9foEeaf76nZ2otNYw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKFNfoEeaf76nZ2otNYw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKFdfoEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmiKFtfoEeaf76nZ2otNYw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rmiKENfoEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_sLAJENfoEeaf76nZ2otNYw" base_Class="_OdbvcDn7EeWPxqj3h6BDbw"/>
+  <Requirements:Requirement xmi:id="_sqGf4NfoEeaf76nZ2otNYw" base_Class="_Vn_RoDn7EeWPxqj3h6BDbw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/contents_tests_resources/contents_sort_invert_edit_model.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/contents_tests_resources/contents_sort_invert_edit_model.uml
index 0fa2d418392..0d4b92ffaec 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/contents_tests_resources/contents_sort_invert_edit_model.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/contents_tests_resources/contents_sort_invert_edit_model.uml
@@ -1,38 +1,38 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_ChwcMOpdEeSLn7DaLatDYg" name="model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_2zQYQOpdEeSLn7DaLatDYg" name="Class1">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_A9HkMOpeEeSLn7DaLatDYg" name="Attribute11" visibility="public" type="_2zQYQOpdEeSLn7DaLatDYg">

-        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_keGwcOpeEeSLn7DaLatDYg" name="testB"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ic69oOpeEeSLn7DaLatDYg" name="Attribute12" visibility="public" type="_4ZeIIOpdEeSLn7DaLatDYg">

-        <defaultValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lEmIsOpeEeSLn7DaLatDYg" value="123"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_4ZeIIOpdEeSLn7DaLatDYg" name="Class2">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_D3RoMOpeEeSLn7DaLatDYg" name="Attribute21" visibility="public" type="_2zQYQOpdEeSLn7DaLatDYg">

-        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_lx_aMOpeEeSLn7DaLatDYg" name="testA"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_I04JcOy1EeSlh_vGEa7fQw" name="Class3"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_O_buINflEeaf76nZ2otNYw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O_excNflEeaf76nZ2otNYw" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_excdflEeaf76nZ2otNYw" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_exctflEeaf76nZ2otNYw" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_exc9flEeaf76nZ2otNYw" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_exdNflEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_exddflEeaf76nZ2otNYw" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O_c8QNflEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_PtiKQNflEeaf76nZ2otNYw" base_Class="_2zQYQOpdEeSLn7DaLatDYg"/>

-  <Requirements:Requirement xmi:id="_QMk2sNflEeaf76nZ2otNYw" base_Class="_4ZeIIOpdEeSLn7DaLatDYg"/>

-  <Requirements:Requirement xmi:id="_Q1ge8NflEeaf76nZ2otNYw" base_Class="_I04JcOy1EeSlh_vGEa7fQw"/>

-  <Requirements:RequirementRelated xmi:id="_RXIlUNflEeaf76nZ2otNYw" base_NamedElement="_D3RoMOpeEeSLn7DaLatDYg"/>

-  <Requirements:RequirementRelated xmi:id="_R61IQNflEeaf76nZ2otNYw" base_NamedElement="_Ic69oOpeEeSLn7DaLatDYg"/>

-  <Requirements:RequirementRelated xmi:id="_Sn97ENflEeaf76nZ2otNYw" base_NamedElement="_A9HkMOpeEeSLn7DaLatDYg"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_ChwcMOpdEeSLn7DaLatDYg" name="model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_2zQYQOpdEeSLn7DaLatDYg" name="Class1">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_A9HkMOpeEeSLn7DaLatDYg" name="Attribute11" visibility="public" type="_2zQYQOpdEeSLn7DaLatDYg">
+        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_keGwcOpeEeSLn7DaLatDYg" name="testB"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ic69oOpeEeSLn7DaLatDYg" name="Attribute12" visibility="public" type="_4ZeIIOpdEeSLn7DaLatDYg">
+        <defaultValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lEmIsOpeEeSLn7DaLatDYg" value="123"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_4ZeIIOpdEeSLn7DaLatDYg" name="Class2">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_D3RoMOpeEeSLn7DaLatDYg" name="Attribute21" visibility="public" type="_2zQYQOpdEeSLn7DaLatDYg">
+        <defaultValue xmi:type="uml:OpaqueExpression" xmi:id="_lx_aMOpeEeSLn7DaLatDYg" name="testA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_I04JcOy1EeSlh_vGEa7fQw" name="Class3"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_O_buINflEeaf76nZ2otNYw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O_excNflEeaf76nZ2otNYw" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_excdflEeaf76nZ2otNYw" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_exctflEeaf76nZ2otNYw" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_exc9flEeaf76nZ2otNYw" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_exdNflEeaf76nZ2otNYw" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O_exddflEeaf76nZ2otNYw" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O_c8QNflEeaf76nZ2otNYw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_PtiKQNflEeaf76nZ2otNYw" base_Class="_2zQYQOpdEeSLn7DaLatDYg"/>
+  <Requirements:Requirement xmi:id="_QMk2sNflEeaf76nZ2otNYw" base_Class="_4ZeIIOpdEeSLn7DaLatDYg"/>
+  <Requirements:Requirement xmi:id="_Q1ge8NflEeaf76nZ2otNYw" base_Class="_I04JcOy1EeSlh_vGEa7fQw"/>
+  <Requirements:RequirementRelated xmi:id="_RXIlUNflEeaf76nZ2otNYw" base_NamedElement="_D3RoMOpeEeSLn7DaLatDYg"/>
+  <Requirements:RequirementRelated xmi:id="_R61IQNflEeaf76nZ2otNYw" base_NamedElement="_Ic69oOpeEeSLn7DaLatDYg"/>
+  <Requirements:RequirementRelated xmi:id="_Sn97ENflEeaf76nZ2otNYw" base_NamedElement="_A9HkMOpeEeSLn7DaLatDYg"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportCellsAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportCellsAll_Test.uml
index d409c58d6a2..b5abf0d0e10 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportCellsAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportCellsAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptyAddAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptyAddAll_Test.uml
index d409c58d6a2..b5abf0d0e10 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptyAddAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptyAddAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptyReplaceAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptyReplaceAll_Test.uml
index d409c58d6a2..b5abf0d0e10 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptyReplaceAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptyReplaceAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptySkipAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptySkipAll_Test.uml
index d409c58d6a2..b5abf0d0e10 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptySkipAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportEmptySkipAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsAddAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsAddAll_Test.uml
index d409c58d6a2..b5abf0d0e10 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsAddAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsAddAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsReplaceAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsReplaceAll_Test.uml
index d409c58d6a2..b5abf0d0e10 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsReplaceAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsReplaceAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsSkipAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsSkipAll_Test.uml
index d409c58d6a2..b5abf0d0e10 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsSkipAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/import/ImportRowsSkipAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Bf1v8Nf6EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2-ENf6EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Edf6EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Etf6EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-E9f6EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-FNf6EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bf2-Fdf6EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bf2XANf6EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_CRcMANf6EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_CteAsNf6EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_DLyUYNf6EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAddAll_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAddAll_Test.notation
index e16f12aa198..9a9c062cd50 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAddAll_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAddAll_Test.notation
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">

-  <context xmi:type="uml:Model" href="InsertEmptyAddAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <owner xmi:type="uml:Model" href="InsertEmptyAddAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" 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="_tRKDkNgOEeaHX4udY_5gJg" indexStyle="NUMERIC">

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_tRWQ0NgOEeaHX4udY_5gJg" pastedElementId="org.eclipse.papyrus.uml.Class">

-      <postActions>applyStereotype:/SysMLCopy::Requirements::Requirement</postActions>

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_tRWQ0dgOEeaHX4udY_5gJg">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axisIdentifier>

-    </ownedAxisConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">
+  <context xmi:type="uml:Model" href="InsertEmptyAddAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <owner xmi:type="uml:Model" href="InsertEmptyAddAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" 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="_tRKDkNgOEeaHX4udY_5gJg" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_tRWQ0NgOEeaHX4udY_5gJg" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <postActions>applyStereotype:/SysMLCopy::Requirements::Requirement</postActions>
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_tRWQ0dgOEeaHX4udY_5gJg">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axisIdentifier>
+    </ownedAxisConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAddAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAddAll_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAddAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAddAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAxisIdentifierNotExisting_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAxisIdentifierNotExisting_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAxisIdentifierNotExisting_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyAxisIdentifierNotExisting_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyClipboard_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyClipboard_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyClipboard_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyClipboard_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyFailColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyFailColumns_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyFailColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyFailColumns_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyReplaceAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyReplaceAll_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyReplaceAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyReplaceAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptySkipAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptySkipAll_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptySkipAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptySkipAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyWarningNotExisting_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyWarningNotExisting_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyWarningNotExisting_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertEmptyWarningNotExisting_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsAddAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsAddAll_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsAddAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsAddAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsAxisIdentifierNotExisting_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsAxisIdentifierNotExisting_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsAxisIdentifierNotExisting_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsAxisIdentifierNotExisting_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsFailColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsFailColumns_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsFailColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsFailColumns_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsFailRows_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsFailRows_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsFailRows_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsFailRows_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsReplaceAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsReplaceAll_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsReplaceAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsReplaceAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsSkipAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsSkipAll_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsSkipAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsSkipAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsWarningNotExisting_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsWarningNotExisting_Test.uml
index d10a34740df..ac807202753 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsWarningNotExisting_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/insert/InsertRowsWarningNotExisting_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_3K3G4Nf-EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8df-EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t8tf-EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t89f-EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9Nf-EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9df-EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3K3t9tf-EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3K3t8Nf-EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_31-gcNf-EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_4fsL0Nf-EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_5J7boNf-EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.di
index 755e4141d8f..6d6b4b33518 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="openTest.notation#_WQOhgNm-EeKL79b9rs5dSQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="openTest.notation#_WQOhgNm-EeKL79b9rs5dSQ"/>

-        </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="openTest.notation#_WQOhgNm-EeKL79b9rs5dSQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="openTest.notation#_WQOhgNm-EeKL79b9rs5dSQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.notation
index 9fd89ddfa9f..a09144b4740 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.notation
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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:uml="http://www.eclipse.org/uml2/4.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" xmi:id="_WQOhgNm-EeKL79b9rs5dSQ" name="RequirementTable0" currentRowAxisProvider="_WQOhhdm-EeKL79b9rs5dSQ" currentColumnAxisProvider="_WQOhgdm-EeKL79b9rs5dSQ">

-  <context xmi:type="uml:Model" href="openTest.uml#_SsmpwNm-EeKL79b9rs5dSQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_WQOhgdm-EeKL79b9rs5dSQ" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_WQOhgtm-EeKL79b9rs5dSQ" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_WQOhg9m-EeKL79b9rs5dSQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_WQOhhNm-EeKL79b9rs5dSQ" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_WQOhhdm-EeKL79b9rs5dSQ" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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:uml="http://www.eclipse.org/uml2/4.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" xmi:id="_WQOhgNm-EeKL79b9rs5dSQ" name="RequirementTable0" currentRowAxisProvider="_WQOhhdm-EeKL79b9rs5dSQ" currentColumnAxisProvider="_WQOhgdm-EeKL79b9rs5dSQ">
+  <context xmi:type="uml:Model" href="openTest.uml#_SsmpwNm-EeKL79b9rs5dSQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_WQOhgdm-EeKL79b9rs5dSQ" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_WQOhgtm-EeKL79b9rs5dSQ" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_WQOhg9m-EeKL79b9rs5dSQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_WQOhhNm-EeKL79b9rs5dSQ" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_WQOhhdm-EeKL79b9rs5dSQ" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.uml
index 74cb6bf3b65..e61386cb282 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/openTest.uml
@@ -1,154 +1,154 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_SsmpwNm-EeKL79b9rs5dSQ" name="SysMLmodel">

-    <packagedElement xmi:type="uml:Class" xmi:id="_UZqBcNm-EeKL79b9rs5dSQ" name="Requirement1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_U-P8QNm-EeKL79b9rs5dSQ" name="Requirement2"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_VlrIoNm-EeKL79b9rs5dSQ" name="Requirement3"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZLyjwNc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8UwNc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uwdc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uwtc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uw9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8UxNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uxdc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZLyjwdc9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3REMPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8Uxtc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8UyNc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uydc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uytc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uy9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8UzNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uzdc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8Ux9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3YY8PgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8Uztc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U0Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U0dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U0tc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U09c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U1Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U1dc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8Uz9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3a1MPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U1tc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U2Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U2dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U2tc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U29c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U3Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U3dc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U19c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3efkPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U3tc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U4Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U4dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U4tc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U49c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U5Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U5dc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U39c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3fGoPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U5tc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U6Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U6dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U6tc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U69c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U7Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U7dc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U59c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3gUwPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U7tc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U8Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U8dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U8tc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U89c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U9Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U9dc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U79c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3iJ8PgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U9tc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U-Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U-dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U-tc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U-9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U_Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U_dc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U99c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U_tc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VANc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VAdc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VAtc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VA9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VBNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VBdc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U_9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3nCcPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8VBtc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VCNc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VCdc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VCtc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VC9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VDNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VDdc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VB9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3npgPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8VDtc9EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VENc9EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VEdc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VEtc9EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VE9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VFNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VFdc9EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VD9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3oQkPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_boAukNc9EeaIfIDhMwu8rA" base_Class="_UZqBcNm-EeKL79b9rs5dSQ"/>

-  <Requirements:Requirement xmi:id="_eCKc0Nc9EeaIfIDhMwu8rA" base_Class="_U-P8QNm-EeKL79b9rs5dSQ"/>

-  <Requirements:Requirement xmi:id="_ei5LUNc9EeaIfIDhMwu8rA" base_Class="_VlrIoNm-EeKL79b9rs5dSQ"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_SsmpwNm-EeKL79b9rs5dSQ" name="SysMLmodel">
+    <packagedElement xmi:type="uml:Class" xmi:id="_UZqBcNm-EeKL79b9rs5dSQ" name="Requirement1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_U-P8QNm-EeKL79b9rs5dSQ" name="Requirement2"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_VlrIoNm-EeKL79b9rs5dSQ" name="Requirement3"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZLyjwNc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8UwNc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uwdc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uwtc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uw9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8UxNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uxdc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZLyjwdc9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3REMPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8Uxtc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8UyNc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uydc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uytc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uy9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8UzNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8Uzdc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8Ux9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3YY8PgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8Uztc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U0Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U0dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U0tc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U09c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U1Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U1dc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8Uz9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3a1MPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U1tc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U2Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U2dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U2tc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U29c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U3Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U3dc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U19c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3efkPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U3tc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U4Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U4dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U4tc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U49c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U5Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U5dc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U39c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3fGoPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U5tc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U6Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U6dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U6tc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U69c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U7Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U7dc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U59c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3gUwPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U7tc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U8Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U8dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U8tc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U89c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U9Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U9dc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U79c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3iJ8PgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U9tc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U-Nc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U-dc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U-tc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U-9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U_Nc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8U_dc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U99c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8U_tc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VANc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VAdc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VAtc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VA9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VBNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VBdc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8U_9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3nCcPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8VBtc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VCNc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VCdc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VCtc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VC9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VDNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VDdc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VB9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3npgPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ZL8VDtc9EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VENc9EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VEdc9EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VEtc9EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VE9c9EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VFNc9EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZL8VFdc9EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZL8VD9c9EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3oQkPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_boAukNc9EeaIfIDhMwu8rA" base_Class="_UZqBcNm-EeKL79b9rs5dSQ"/>
+  <Requirements:Requirement xmi:id="_eCKc0Nc9EeaIfIDhMwu8rA" base_Class="_U-P8QNm-EeKL79b9rs5dSQ"/>
+  <Requirements:Requirement xmi:id="_ei5LUNc9EeaIfIDhMwu8rA" base_Class="_VlrIoNm-EeKL79b9rs5dSQ"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteAll_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteAll_Test.notation
index 4b1d48a345d..cd1cd234f6c 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteAll_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteAll_Test.notation
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">

-  <context xmi:type="uml:Model" href="PasteCellsOverwriteAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <owner xmi:type="uml:Model" href="PasteCellsOverwriteAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">
+  <context xmi:type="uml:Model" href="PasteCellsOverwriteAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <owner xmi:type="uml:Model" href="PasteCellsOverwriteAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteAll_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteByOneLine_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteByOneLine_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteByOneLine_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteByOneLine_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteFailColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteFailColumns_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteFailColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteFailColumns_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteFailRows_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteFailRows_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteFailRows_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteCellsOverwriteFailRows_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteAll_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteByOneLine_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteByOneLine_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteByOneLine_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteByOneLine_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteFailColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteFailColumns_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteFailColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteFailColumns_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteFailRows_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteFailRows_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteFailRows_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteColumnsOverwriteFailRows_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyClipboard_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyClipboard_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyClipboard_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyClipboard_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteAddAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteAddAll_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteAddAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteAddAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteAxisIdentifierNotExisting_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteAxisIdentifierNotExisting_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteAxisIdentifierNotExisting_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteAxisIdentifierNotExisting_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteFailColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteFailColumns_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteFailColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteFailColumns_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteReplaceAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteReplaceAll_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteReplaceAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteReplaceAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteSkipAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteSkipAll_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteSkipAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteSkipAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteWarningNotExisting_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteWarningNotExisting_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteWarningNotExisting_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteEmptyOverwriteWarningNotExisting_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.notation
index 67bb83c1a20..bc1d2a8ea19 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.notation
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">

-  <context xmi:type="uml:Model" href="PasteRowsOverwriteAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <owner xmi:type="uml:Model" href="PasteRowsOverwriteAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">
+  <context xmi:type="uml:Model" href="PasteRowsOverwriteAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <owner xmi:type="uml:Model" href="PasteRowsOverwriteAll_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAll_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.notation
index 4407d70d8ac..956cf930bf3 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.notation
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">

-  <context xmi:type="uml:Model" href="PasteRowsOverwriteAxisIdentifierNotExisting_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <owner xmi:type="uml:Model" href="PasteRowsOverwriteAxisIdentifierNotExisting_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_1etgAG5bEeWpLowMLPbtlg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">
+  <context xmi:type="uml:Model" href="PasteRowsOverwriteAxisIdentifierNotExisting_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <owner xmi:type="uml:Model" href="PasteRowsOverwriteAxisIdentifierNotExisting_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_1etgAG5bEeWpLowMLPbtlg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::derived">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.notation
index da6ed3c7e45..e9999cc831f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.notation
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">

-  <context xmi:type="uml:Model" href="PasteRowsOverwriteFailColumns_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <owner xmi:type="uml:Model" href="PasteRowsOverwriteFailColumns_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">
+  <context xmi:type="uml:Model" href="PasteRowsOverwriteFailColumns_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <owner xmi:type="uml:Model" href="PasteRowsOverwriteFailColumns_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailColumns_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.notation
index 20a3a3d067d..7f5b50f42c8 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.notation
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">

-  <context xmi:type="uml:Model" href="PasteRowsOverwriteFailRows_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <owner xmi:type="uml:Model" href="PasteRowsOverwriteFailRows_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">
+  <context xmi:type="uml:Model" href="PasteRowsOverwriteFailRows_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <owner xmi:type="uml:Model" href="PasteRowsOverwriteFailRows_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteFailRows_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.notation
index 177436140f1..708dd86296f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.notation
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">

-  <context xmi:type="uml:Model" href="PasteRowsOverwriteWarningNotExisting_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <owner xmi:type="uml:Model" href="PasteRowsOverwriteWarningNotExisting_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>

-  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_FERfIGhHEeWchZKsEGp2Eg" name="RequirementTable0" currentRowAxisProvider="_FESGMWhHEeWchZKsEGp2Eg" currentColumnAxisProvider="_FERfIWhHEeWchZKsEGp2Eg">
+  <context xmi:type="uml:Model" href="PasteRowsOverwriteWarningNotExisting_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <owner xmi:type="uml:Model" href="PasteRowsOverwriteWarningNotExisting_Test.uml#_nAjG8GIeEeWkqekCWoLl5g"/>
+  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_FERfIWhHEeWchZKsEGp2Eg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_FERfImhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_FERfI2hHEeWchZKsEGp2Eg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_FESGMGhHEeWchZKsEGp2Eg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_FESGMWhHEeWchZKsEGp2Eg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.uml
index 1c581acf45c..10ff00fe199 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_overwrite/PasteRowsOverwriteWarningNotExisting_Test.uml
@@ -1,24 +1,24 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>

-  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_nAjG8GIeEeWkqekCWoLl5g" name="RootElement">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pYCiwGIeEeWkqekCWoLl5g" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p2QIwGIeEeWkqekCWoLl5g" name="CopyOf_Class1_1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p5RnkGIeEeWkqekCWoLl5g" name="CopyOf_Class1_2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_yRlVsNf8EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRmj0Nf8EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0df8EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj0tf8EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj09f8EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1Nf8EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yRmj1df8EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yRl8wNf8EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_y9bIANf8EeaTlOz31nwl0w" base_Class="_pYCiwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_zbinYNf8EeaTlOz31nwl0w" base_Class="_p2QIwGIeEeWkqekCWoLl5g"/>
+  <Requirements:Requirement xmi:id="_z57zkNf8EeaTlOz31nwl0w" base_Class="_p5RnkGIeEeWkqekCWoLl5g"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.notation
index 4a713880937..f21a5af5e8a 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.notation
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table 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: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: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" xmi:id="_R7nlIIFBEeSi2cK0RxwHRg" name="RequirementTable0" currentRowAxisProvider="_R7nlJYFBEeSi2cK0RxwHRg" currentColumnAxisProvider="_R7nlIYFBEeSi2cK0RxwHRg">

-  <context xmi:type="uml:Model" href="Bug443814_Enumeration.uml#_OHyHIIFBEeSi2cK0RxwHRg"/>

-  <owner xmi:type="uml:Model" href="Bug443814_Enumeration.uml#_OHyHIIFBEeSi2cK0RxwHRg"/>

-  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_R7nlIYFBEeSi2cK0RxwHRg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_R7nlIoFBEeSi2cK0RxwHRg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_R7nlI4FBEeSi2cK0RxwHRg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_R7nlJIFBEeSi2cK0RxwHRg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_Xd7XIIFBEeSi2cK0RxwHRg" element="property_of_stereotype:/profile::Task::p">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_Y9QukIHTEeSQAc7KMA100g" element="property_of_stereotype:/profile::Task::color">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_XHpJYIHWEeSQAc7KMA100g">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_R7nlJYFBEeSi2cK0RxwHRg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table 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: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: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" xmi:id="_R7nlIIFBEeSi2cK0RxwHRg" name="RequirementTable0" currentRowAxisProvider="_R7nlJYFBEeSi2cK0RxwHRg" currentColumnAxisProvider="_R7nlIYFBEeSi2cK0RxwHRg">
+  <context xmi:type="uml:Model" href="Bug443814_Enumeration.uml#_OHyHIIFBEeSi2cK0RxwHRg"/>
+  <owner xmi:type="uml:Model" href="Bug443814_Enumeration.uml#_OHyHIIFBEeSi2cK0RxwHRg"/>
+  <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.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_R7nlIYFBEeSi2cK0RxwHRg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_R7nlIoFBEeSi2cK0RxwHRg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::id">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_R7nlI4FBEeSi2cK0RxwHRg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/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="_R7nlJIFBEeSi2cK0RxwHRg" element="property_of_stereotype:/SysMLCopy::Requirements::Requirement::text">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_Xd7XIIFBEeSi2cK0RxwHRg" element="property_of_stereotype:/profile::Task::p">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_Y9QukIHTEeSQAc7KMA100g" element="property_of_stereotype:/profile::Task::color">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_XHpJYIHWEeSQAc7KMA100g">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_R7nlJYFBEeSi2cK0RxwHRg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.txt
index cff5933e9f5..80690c55ab0 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.txt
@@ -1,3 +1,3 @@
-id1	Requirement1	text1	hight	black	public

-id2	Requirement2	text2	medium	red	protected

-id3	Requirement3	text3	low	blue	private

+id1	Requirement1	text1	hight	black	public
+id2	Requirement2	text2	medium	red	protected
+id3	Requirement3	text3	low	blue	private
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.uml
index b2489bcd655..1f0520ae5d1 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/Bug443814_Enumeration.uml
@@ -1,41 +1,41 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:profile="http:///schemas/profile/_dymLAIQyEeSqaqLwsIy0SA/0" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg http:///schemas/profile/_dymLAIQyEeSqaqLwsIy0SA/0 model.profile.uml#_dymLAoQyEeSqaqLwsIy0SA">

-  <uml:Model xmi:id="_OHyHIIFBEeSi2cK0RxwHRg" name="SysMLmodel">

-    <packagedElement xmi:type="uml:Class" xmi:id="_ZofKMIFBEeSi2cK0RxwHRg" name="RequirementTest" visibility="protected"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Uhs2kIFBEeSi2cK0RxwHRg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WiO2kIHTEeSQAc7KMA100g" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2kYHTEeSQAc7KMA100g" key="Version" value="0.0.3"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2koHTEeSQAc7KMA100g" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2k4HTEeSQAc7KMA100g" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2lIHTEeSQAc7KMA100g" key="Date" value="2014-12-12"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2lYHTEeSQAc7KMA100g" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UiMl0IFBEeSi2cK0RxwHRg" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl0YFBEeSi2cK0RxwHRg" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl0oFBEeSi2cK0RxwHRg" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl04FBEeSi2cK0RxwHRg" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl1IFBEeSi2cK0RxwHRg" key="Date" value="2014-12-11"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl1YFBEeSi2cK0RxwHRg" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UiLXsIFBEeSi2cK0RxwHRg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="model.profile.uml#_dymLAoQyEeSqaqLwsIy0SA"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_x_EI8IFAEeSi2cK0RxwHRg"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_MguVYNf4EeaTlOz31nwl0w">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Mgym0Nf4EeaTlOz31nwl0w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym0df4EeaTlOz31nwl0w" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym0tf4EeaTlOz31nwl0w" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym09f4EeaTlOz31nwl0w" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym1Nf4EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym1df4EeaTlOz31nwl0w" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MgxYsNf4EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_NDlx4Nf4EeaTlOz31nwl0w" base_Class="_ZofKMIFBEeSi2cK0RxwHRg"/>

-  <profile:Task xmi:id="_jGGE8IQyEeSqaqLwsIy0SA" base_Class="_ZofKMIFBEeSi2cK0RxwHRg" p="medium" color="red"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:profile="http:///schemas/profile/_dymLAIQyEeSqaqLwsIy0SA/0" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg http:///schemas/profile/_dymLAIQyEeSqaqLwsIy0SA/0 model.profile.uml#_dymLAoQyEeSqaqLwsIy0SA">
+  <uml:Model xmi:id="_OHyHIIFBEeSi2cK0RxwHRg" name="SysMLmodel">
+    <packagedElement xmi:type="uml:Class" xmi:id="_ZofKMIFBEeSi2cK0RxwHRg" name="RequirementTest" visibility="protected"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Uhs2kIFBEeSi2cK0RxwHRg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WiO2kIHTEeSQAc7KMA100g" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2kYHTEeSQAc7KMA100g" key="Version" value="0.0.3"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2koHTEeSQAc7KMA100g" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2k4HTEeSQAc7KMA100g" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2lIHTEeSQAc7KMA100g" key="Date" value="2014-12-12"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WiO2lYHTEeSQAc7KMA100g" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UiMl0IFBEeSi2cK0RxwHRg" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl0YFBEeSi2cK0RxwHRg" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl0oFBEeSi2cK0RxwHRg" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl04FBEeSi2cK0RxwHRg" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl1IFBEeSi2cK0RxwHRg" key="Date" value="2014-12-11"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UiMl1YFBEeSi2cK0RxwHRg" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UiLXsIFBEeSi2cK0RxwHRg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_dymLAoQyEeSqaqLwsIy0SA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_x_EI8IFAEeSi2cK0RxwHRg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_MguVYNf4EeaTlOz31nwl0w">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Mgym0Nf4EeaTlOz31nwl0w" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym0df4EeaTlOz31nwl0w" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym0tf4EeaTlOz31nwl0w" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym09f4EeaTlOz31nwl0w" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym1Nf4EeaTlOz31nwl0w" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Mgym1df4EeaTlOz31nwl0w" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MgxYsNf4EeaTlOz31nwl0w" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_NDlx4Nf4EeaTlOz31nwl0w" base_Class="_ZofKMIFBEeSi2cK0RxwHRg"/>
+  <profile:Task xmi:id="_jGGE8IQyEeSqaqLwsIy0SA" base_Class="_ZofKMIFBEeSi2cK0RxwHRg" p="medium" color="red"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.notation
index a6d46f4361f..c00ad3d8642 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.notation
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_AjOooIHTEeSQAc7KMA100g" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_B7h4UIHTEeSQAc7KMA100g" type="2006">

-    <children xmi:type="notation:DecorationNode" xmi:id="_B7p0IIHTEeSQAc7KMA100g" type="5023"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_B7p0IYHTEeSQAc7KMA100g" type="7015">

-      <children xmi:type="notation:Shape" xmi:id="_F7_dEIHTEeSQAc7KMA100g" type="3017">

-        <element xmi:type="uml:EnumerationLiteral" href="library.uml#_F73hQIHTEeSQAc7KMA100g"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_F7_dEYHTEeSQAc7KMA100g"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Gu_AQIHTEeSQAc7KMA100g" type="3017">

-        <element xmi:type="uml:EnumerationLiteral" href="library.uml#_Gu9yIIHTEeSQAc7KMA100g"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Gu_AQYHTEeSQAc7KMA100g"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_HVC6sIHTEeSQAc7KMA100g" type="3017">

-        <element xmi:type="uml:EnumerationLiteral" href="library.uml#_HVBskIHTEeSQAc7KMA100g"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HVC6sYHTEeSQAc7KMA100g"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_B7p0IoHTEeSQAc7KMA100g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_B7p0I4HTEeSQAc7KMA100g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_B7p0JIHTEeSQAc7KMA100g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B7p0JYHTEeSQAc7KMA100g"/>

-    </children>

-    <element xmi:type="uml:Enumeration" href="library.uml#_B49sgIHTEeSQAc7KMA100g"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B7h4UYHTEeSQAc7KMA100g" x="194" y="38" width="480" height="299"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_AjOooYHTEeSQAc7KMA100g" name="diagram_compatibility_version" stringValue="1.0.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_AjOoooHTEeSQAc7KMA100g"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_AjOoo4HTEeSQAc7KMA100g">

-    <owner xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>

-  </styles>

-  <element xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_AjOooIHTEeSQAc7KMA100g" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_B7h4UIHTEeSQAc7KMA100g" type="2006">
+    <children xmi:type="notation:DecorationNode" xmi:id="_B7p0IIHTEeSQAc7KMA100g" type="5023"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_B7p0IYHTEeSQAc7KMA100g" type="7015">
+      <children xmi:type="notation:Shape" xmi:id="_F7_dEIHTEeSQAc7KMA100g" type="3017">
+        <element xmi:type="uml:EnumerationLiteral" href="library.uml#_F73hQIHTEeSQAc7KMA100g"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_F7_dEYHTEeSQAc7KMA100g"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Gu_AQIHTEeSQAc7KMA100g" type="3017">
+        <element xmi:type="uml:EnumerationLiteral" href="library.uml#_Gu9yIIHTEeSQAc7KMA100g"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Gu_AQYHTEeSQAc7KMA100g"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_HVC6sIHTEeSQAc7KMA100g" type="3017">
+        <element xmi:type="uml:EnumerationLiteral" href="library.uml#_HVBskIHTEeSQAc7KMA100g"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HVC6sYHTEeSQAc7KMA100g"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_B7p0IoHTEeSQAc7KMA100g"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_B7p0I4HTEeSQAc7KMA100g"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_B7p0JIHTEeSQAc7KMA100g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B7p0JYHTEeSQAc7KMA100g"/>
+    </children>
+    <element xmi:type="uml:Enumeration" href="library.uml#_B49sgIHTEeSQAc7KMA100g"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B7h4UYHTEeSQAc7KMA100g" x="194" y="38" width="480" height="299"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_AjOooYHTEeSQAc7KMA100g" name="diagram_compatibility_version" stringValue="1.0.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_AjOoooHTEeSQAc7KMA100g"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_AjOoo4HTEeSQAc7KMA100g">
+    <owner xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>
+  </styles>
+  <element xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.uml
index 0612b3995c4..e2de8b7165d 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/library.uml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AipZ0IHTEeSQAc7KMA100g" name="model">

-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_B49sgIHTEeSQAc7KMA100g" name="Color">

-    <ownedLiteral xmi:id="_F73hQIHTEeSQAc7KMA100g" name="black"/>

-    <ownedLiteral xmi:id="_Gu9yIIHTEeSQAc7KMA100g" name="red"/>

-    <ownedLiteral xmi:id="_HVBskIHTEeSQAc7KMA100g" name="blue"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AipZ0IHTEeSQAc7KMA100g" name="model">
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_B49sgIHTEeSQAc7KMA100g" name="Color">
+    <ownedLiteral xmi:id="_F73hQIHTEeSQAc7KMA100g" name="black"/>
+    <ownedLiteral xmi:id="_Gu9yIIHTEeSQAc7KMA100g" name="red"/>
+    <ownedLiteral xmi:id="_HVBskIHTEeSQAc7KMA100g" name="blue"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.notation
index 2c4150a7c20..b461db8188b 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.notation
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yC-YkIFAEeSi2cK0RxwHRg" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_2buhgIFAEeSi2cK0RxwHRg" type="1031">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2cMbkIFAEeSi2cK0RxwHRg" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNCoIFAEeSi2cK0RxwHRg" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNCoYFAEeSi2cK0RxwHRg" key="StereotypeList" value="StandardProfile::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNCooFAEeSi2cK0RxwHRg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNpsIFAEeSi2cK0RxwHRg" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNpsYFAEeSi2cK0RxwHRg" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_2cCqkIFAEeSi2cK0RxwHRg" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2cDRoIFAEeSi2cK0RxwHRg" x="595" y="333"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_3AxIQIFAEeSi2cK0RxwHRg" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_3AxvUIFAEeSi2cK0RxwHRg" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_3A1ZsIFAEeSi2cK0RxwHRg" type="1071">

-      <children xmi:type="notation:Node" xmi:id="_GsO7kIFBEeSi2cK0RxwHRg" type="3002">

-        <element xmi:type="uml:Property" href="model.profile.uml#_GrzdwIFBEeSi2cK0RxwHRg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GsO7kYFBEeSi2cK0RxwHRg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_SNfq8IHTEeSQAc7KMA100g" type="3002">

-        <element xmi:type="uml:Property" href="model.profile.uml#_SNKTwIHTEeSQAc7KMA100g"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SNfq8YHTEeSQAc7KMA100g"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_3A1ZsYFAEeSi2cK0RxwHRg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3A1ZsoFAEeSi2cK0RxwHRg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3A1Zs4FAEeSi2cK0RxwHRg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3A1ZtIFAEeSi2cK0RxwHRg"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_3A2n0IFAEeSi2cK0RxwHRg" type="1019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_3A2n0YFAEeSi2cK0RxwHRg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3A2n0oFAEeSi2cK0RxwHRg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3A2n04FAEeSi2cK0RxwHRg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3A2n1IFAEeSi2cK0RxwHRg"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="model.profile.uml#_2_8B0IFAEeSi2cK0RxwHRg"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3AxIQYFAEeSi2cK0RxwHRg" x="341" y="568"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_6uYCcIFAEeSi2cK0RxwHRg" type="2006">

-    <children xmi:type="notation:DecorationNode" xmi:id="_6uYpgIFAEeSi2cK0RxwHRg" type="5023"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_6uYpgYFAEeSi2cK0RxwHRg" type="1063">

-      <children xmi:type="notation:Node" xmi:id="_CuTtcIFBEeSi2cK0RxwHRg" type="1037">

-        <element xmi:type="uml:EnumerationLiteral" href="model.profile.uml#_CuQqIIFBEeSi2cK0RxwHRg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CuTtcYFBEeSi2cK0RxwHRg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_DsDIEIFBEeSi2cK0RxwHRg" type="1037">

-        <element xmi:type="uml:EnumerationLiteral" href="model.profile.uml#_DsBS4IFBEeSi2cK0RxwHRg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DsDIEYFBEeSi2cK0RxwHRg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_EZVr4IFBEeSi2cK0RxwHRg" type="1037">

-        <element xmi:type="uml:EnumerationLiteral" href="model.profile.uml#_EZT2sIFBEeSi2cK0RxwHRg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EZVr4YFBEeSi2cK0RxwHRg"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_6uYpgoFAEeSi2cK0RxwHRg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_6uYpg4FAEeSi2cK0RxwHRg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6uYphIFAEeSi2cK0RxwHRg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6uYphYFAEeSi2cK0RxwHRg"/>

-    </children>

-    <element xmi:type="uml:Enumeration" href="model.profile.uml#_6rwMQIFAEeSi2cK0RxwHRg"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6uYCcYFAEeSi2cK0RxwHRg" x="903" y="428" width="346" height="240"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_yC-YkYFAEeSi2cK0RxwHRg" name="diagram_compatibility_version" stringValue="1.0.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_yC-YkoFAEeSi2cK0RxwHRg"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_yC-Yk4FAEeSi2cK0RxwHRg">

-    <owner xmi:type="uml:Profile" href="model.profile.uml#_x_EI8IFAEeSi2cK0RxwHRg"/>

-  </styles>

-  <element xmi:type="uml:Profile" href="model.profile.uml#_x_EI8IFAEeSi2cK0RxwHRg"/>

-  <edges xmi:type="notation:Connector" xmi:id="_3qurQIFAEeSi2cK0RxwHRg" type="1013" source="_3AxIQIFAEeSi2cK0RxwHRg" target="_2buhgIFAEeSi2cK0RxwHRg">

-    <styles xmi:type="notation:FontStyle" xmi:id="_3qurQYFAEeSi2cK0RxwHRg"/>

-    <element xmi:type="uml:Extension" href="model.profile.uml#_3qgBwIFAEeSi2cK0RxwHRg"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3qurQoFAEeSi2cK0RxwHRg" points="[17, -14, -253, 213]$[277, -202, 7, 25]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ranwIFAEeSi2cK0RxwHRg" id="(0.4016393442622951,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RHVZUIQyEeSqaqLwsIy0SA" id="(0.16,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:ecore="http://www.eclipse.org/emf/2002/Ecore" 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" xmi:id="_yC-YkIFAEeSi2cK0RxwHRg" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_2buhgIFAEeSi2cK0RxwHRg" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2cMbkIFAEeSi2cK0RxwHRg" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNCoIFAEeSi2cK0RxwHRg" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNCoYFAEeSi2cK0RxwHRg" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNCooFAEeSi2cK0RxwHRg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNpsIFAEeSi2cK0RxwHRg" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2cNpsYFAEeSi2cK0RxwHRg" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_2cCqkIFAEeSi2cK0RxwHRg" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2cDRoIFAEeSi2cK0RxwHRg" x="595" y="333"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_3AxIQIFAEeSi2cK0RxwHRg" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_3AxvUIFAEeSi2cK0RxwHRg" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_3A1ZsIFAEeSi2cK0RxwHRg" type="1071">
+      <children xmi:type="notation:Node" xmi:id="_GsO7kIFBEeSi2cK0RxwHRg" type="3002">
+        <element xmi:type="uml:Property" href="model.profile.uml#_GrzdwIFBEeSi2cK0RxwHRg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GsO7kYFBEeSi2cK0RxwHRg"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_SNfq8IHTEeSQAc7KMA100g" type="3002">
+        <element xmi:type="uml:Property" href="model.profile.uml#_SNKTwIHTEeSQAc7KMA100g"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SNfq8YHTEeSQAc7KMA100g"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_3A1ZsYFAEeSi2cK0RxwHRg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3A1ZsoFAEeSi2cK0RxwHRg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3A1Zs4FAEeSi2cK0RxwHRg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3A1ZtIFAEeSi2cK0RxwHRg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_3A2n0IFAEeSi2cK0RxwHRg" type="1019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_3A2n0YFAEeSi2cK0RxwHRg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3A2n0oFAEeSi2cK0RxwHRg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3A2n04FAEeSi2cK0RxwHRg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3A2n1IFAEeSi2cK0RxwHRg"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="model.profile.uml#_2_8B0IFAEeSi2cK0RxwHRg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3AxIQYFAEeSi2cK0RxwHRg" x="341" y="568"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_6uYCcIFAEeSi2cK0RxwHRg" type="2006">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6uYpgIFAEeSi2cK0RxwHRg" type="5023"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6uYpgYFAEeSi2cK0RxwHRg" type="1063">
+      <children xmi:type="notation:Node" xmi:id="_CuTtcIFBEeSi2cK0RxwHRg" type="1037">
+        <element xmi:type="uml:EnumerationLiteral" href="model.profile.uml#_CuQqIIFBEeSi2cK0RxwHRg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CuTtcYFBEeSi2cK0RxwHRg"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_DsDIEIFBEeSi2cK0RxwHRg" type="1037">
+        <element xmi:type="uml:EnumerationLiteral" href="model.profile.uml#_DsBS4IFBEeSi2cK0RxwHRg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DsDIEYFBEeSi2cK0RxwHRg"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_EZVr4IFBEeSi2cK0RxwHRg" type="1037">
+        <element xmi:type="uml:EnumerationLiteral" href="model.profile.uml#_EZT2sIFBEeSi2cK0RxwHRg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EZVr4YFBEeSi2cK0RxwHRg"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_6uYpgoFAEeSi2cK0RxwHRg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6uYpg4FAEeSi2cK0RxwHRg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6uYphIFAEeSi2cK0RxwHRg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6uYphYFAEeSi2cK0RxwHRg"/>
+    </children>
+    <element xmi:type="uml:Enumeration" href="model.profile.uml#_6rwMQIFAEeSi2cK0RxwHRg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6uYCcYFAEeSi2cK0RxwHRg" x="903" y="428" width="346" height="240"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_yC-YkYFAEeSi2cK0RxwHRg" name="diagram_compatibility_version" stringValue="1.0.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_yC-YkoFAEeSi2cK0RxwHRg"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_yC-Yk4FAEeSi2cK0RxwHRg">
+    <owner xmi:type="uml:Profile" href="model.profile.uml#_x_EI8IFAEeSi2cK0RxwHRg"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="model.profile.uml#_x_EI8IFAEeSi2cK0RxwHRg"/>
+  <edges xmi:type="notation:Connector" xmi:id="_3qurQIFAEeSi2cK0RxwHRg" type="1013" source="_3AxIQIFAEeSi2cK0RxwHRg" target="_2buhgIFAEeSi2cK0RxwHRg">
+    <styles xmi:type="notation:FontStyle" xmi:id="_3qurQYFAEeSi2cK0RxwHRg"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_3qgBwIFAEeSi2cK0RxwHRg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3qurQoFAEeSi2cK0RxwHRg" points="[17, -14, -253, 213]$[277, -202, 7, 25]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ranwIFAEeSi2cK0RxwHRg" id="(0.4016393442622951,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RHVZUIQyEeSqaqLwsIy0SA" id="(0.16,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.uml
index 7a807e81ed5..17ef675ac27 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/paste_tests/without_service_edit/bug443814/model.profile.uml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_x_EI8IFAEeSi2cK0RxwHRg" name="profile" metaclassReference="_2ba_gIFAEeSi2cK0RxwHRg">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLAYQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_dymLAoQyEeSqaqLwsIy0SA" name="profile" nsURI="http:///schemas/profile/_dymLAIQyEeSqaqLwsIy0SA/0" nsPrefix="profile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLA4QyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/4.0.0/UML">

-        <references xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLF4QyEeSqaqLwsIy0SA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLGIQyEeSqaqLwsIy0SA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLGYQyEeSqaqLwsIy0SA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLGoQyEeSqaqLwsIy0SA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLG4QyEeSqaqLwsIy0SA" key="Date" value="2014-12-15"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLHIQyEeSqaqLwsIy0SA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dymLBIQyEeSqaqLwsIy0SA" name="Task">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLBYQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_2_8B0IFAEeSi2cK0RxwHRg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dymLBoQyEeSqaqLwsIy0SA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dymLCIQyEeSqaqLwsIy0SA" name="p" ordered="false" lowerBound="1" eType="_dymLDIQyEeSqaqLwsIy0SA"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dymLCoQyEeSqaqLwsIy0SA" name="color" ordered="false" lowerBound="1" eType="_dymLEYQyEeSqaqLwsIy0SA"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_dymLDIQyEeSqaqLwsIy0SA" name="Priority">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLDYQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_6rwMQIFAEeSi2cK0RxwHRg"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLDoQyEeSqaqLwsIy0SA" name="hight"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLD4QyEeSqaqLwsIy0SA" name="medium" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLEIQyEeSqaqLwsIy0SA" name="low" value="2"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_dymLEYQyEeSqaqLwsIy0SA" name="model_Color">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLEoQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-          <references xmi:type="uml:Enumeration" href="library.uml#_B49sgIHTEeSQAc7KMA100g"/>

-        </eAnnotations>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLE4QyEeSqaqLwsIy0SA" name="black"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLFIQyEeSqaqLwsIy0SA" name="red" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLFYQyEeSqaqLwsIy0SA" name="blue" value="2"/>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_2ba_gIFAEeSi2cK0RxwHRg" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_PfWpsIHTEeSQAc7KMA100g">

-    <importedPackage xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_2_8B0IFAEeSi2cK0RxwHRg" name="Task">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_3qfasIFAEeSi2cK0RxwHRg" name="base_Class" association="_3qgBwIFAEeSi2cK0RxwHRg">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_GrzdwIFBEeSi2cK0RxwHRg" name="p" type="_6rwMQIFAEeSi2cK0RxwHRg"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_SNKTwIHTEeSQAc7KMA100g" name="color">

-      <type xmi:type="uml:Enumeration" href="library.uml#_B49sgIHTEeSQAc7KMA100g"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_3qgBwIFAEeSi2cK0RxwHRg" name="E_Task_Class1" memberEnd="_3qgBwYFAEeSi2cK0RxwHRg _3qfasIFAEeSi2cK0RxwHRg">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3qgBwYFAEeSi2cK0RxwHRg" name="extension_Task" type="_2_8B0IFAEeSi2cK0RxwHRg" aggregation="composite" association="_3qgBwIFAEeSi2cK0RxwHRg"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_6rwMQIFAEeSi2cK0RxwHRg" name="Priority">

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CuQqIIFBEeSi2cK0RxwHRg" name="hight"/>

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DsBS4IFBEeSi2cK0RxwHRg" name="medium"/>

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EZT2sIFBEeSi2cK0RxwHRg" name="low"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_x_EI8IFAEeSi2cK0RxwHRg" name="profile" metaclassReference="_2ba_gIFAEeSi2cK0RxwHRg">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLAYQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_dymLAoQyEeSqaqLwsIy0SA" name="profile" nsURI="http:///schemas/profile/_dymLAIQyEeSqaqLwsIy0SA/0" nsPrefix="profile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLA4QyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/4.0.0/UML">
+        <references xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLF4QyEeSqaqLwsIy0SA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLGIQyEeSqaqLwsIy0SA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLGYQyEeSqaqLwsIy0SA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLGoQyEeSqaqLwsIy0SA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLG4QyEeSqaqLwsIy0SA" key="Date" value="2014-12-15"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dymLHIQyEeSqaqLwsIy0SA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dymLBIQyEeSqaqLwsIy0SA" name="Task">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLBYQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_2_8B0IFAEeSi2cK0RxwHRg"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dymLBoQyEeSqaqLwsIy0SA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dymLCIQyEeSqaqLwsIy0SA" name="p" ordered="false" lowerBound="1" eType="_dymLDIQyEeSqaqLwsIy0SA"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dymLCoQyEeSqaqLwsIy0SA" name="color" ordered="false" lowerBound="1" eType="_dymLEYQyEeSqaqLwsIy0SA"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_dymLDIQyEeSqaqLwsIy0SA" name="Priority">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLDYQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_6rwMQIFAEeSi2cK0RxwHRg"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLDoQyEeSqaqLwsIy0SA" name="hight"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLD4QyEeSqaqLwsIy0SA" name="medium" value="1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLEIQyEeSqaqLwsIy0SA" name="low" value="2"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_dymLEYQyEeSqaqLwsIy0SA" name="model_Color">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dymLEoQyEeSqaqLwsIy0SA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+          <references xmi:type="uml:Enumeration" href="library.uml#_B49sgIHTEeSQAc7KMA100g"/>
+        </eAnnotations>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLE4QyEeSqaqLwsIy0SA" name="black"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLFIQyEeSqaqLwsIy0SA" name="red" value="1"/>
+        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dymLFYQyEeSqaqLwsIy0SA" name="blue" value="2"/>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_2ba_gIFAEeSi2cK0RxwHRg" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_PfWpsIHTEeSQAc7KMA100g">
+    <importedPackage xmi:type="uml:Model" href="library.uml#_AipZ0IHTEeSQAc7KMA100g"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_2_8B0IFAEeSi2cK0RxwHRg" name="Task">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_3qfasIFAEeSi2cK0RxwHRg" name="base_Class" association="_3qgBwIFAEeSi2cK0RxwHRg">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_GrzdwIFBEeSi2cK0RxwHRg" name="p" type="_6rwMQIFAEeSi2cK0RxwHRg"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_SNKTwIHTEeSQAc7KMA100g" name="color">
+      <type xmi:type="uml:Enumeration" href="library.uml#_B49sgIHTEeSQAc7KMA100g"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_3qgBwIFAEeSi2cK0RxwHRg" name="E_Task_Class1" memberEnd="_3qgBwYFAEeSi2cK0RxwHRg _3qfasIFAEeSi2cK0RxwHRg">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3qgBwYFAEeSi2cK0RxwHRg" name="extension_Task" type="_2_8B0IFAEeSi2cK0RxwHRg" aggregation="composite" association="_3qgBwIFAEeSi2cK0RxwHRg"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_6rwMQIFAEeSi2cK0RxwHRg" name="Priority">
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CuQqIIFBEeSi2cK0RxwHRg" name="hight"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DsBS4IFBEeSi2cK0RxwHRg" name="medium"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EZT2sIFBEeSi2cK0RxwHRg" name="low"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.di
index dfbca5a26cd..149750afa65 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.di
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

-

-xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" >

-

-  <di:SashWindowsMngr>

-    <pageList>

-      <availablePage>

-        <emfPageIdentifier href="revealSemanticModel.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="revealSemanticModel.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="revealSemanticModel.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="revealSemanticModel.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="revealSemanticModel.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="revealSemanticModel.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>

-      </availablePage>

-    </pageList>

-    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">

-      <windows>

-        <children xsi:type="di:TabFolder">

-          <children>

-            <emfPageIdentifier href="revealSemanticModel.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="revealSemanticModel.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="revealSemanticModel.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="revealSemanticModel.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="revealSemanticModel.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="revealSemanticModel.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  

-</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:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" >
+
+  <di:SashWindowsMngr>
+    <pageList>
+      <availablePage>
+        <emfPageIdentifier href="revealSemanticModel.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="revealSemanticModel.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="revealSemanticModel.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="revealSemanticModel.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="revealSemanticModel.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="revealSemanticModel.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>
+      </availablePage>
+    </pageList>
+    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
+      <windows>
+        <children xsi:type="di:TabFolder">
+          <children>
+            <emfPageIdentifier href="revealSemanticModel.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="revealSemanticModel.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="revealSemanticModel.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="revealSemanticModel.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="revealSemanticModel.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="revealSemanticModel.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.notation
index 5568625a6d1..4371ce1c052 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.notation
@@ -1,1698 +1,1698 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">

-  <notation:Diagram xmi:id="_pBS2xAKOEeSZ5cZUOQKWkw" type="RequirementDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_q24fUQKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q3EskAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-UQKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-UgKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysML::Requirements::Requirement"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-UwKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-VAKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-VQKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_q24fUwKOEeSZ5cZUOQKWkw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_q24fVAKOEeSZ5cZUOQKWkw" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_q24fVQKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_q24fVgKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_q24fVwKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fWAKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_q24fWQKOEeSZ5cZUOQKWkw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_q24fWgKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_q24fWwKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_q24fXAKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fXQKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_q24fXgKOEeSZ5cZUOQKWkw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_q24fXwKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_q24fYAKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_q24fYQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fYgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_q24fYwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">

-        <children xmi:type="notation:DecorationNode" xmi:id="_q24faAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_q24faQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_q24fZAKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_q24fZQKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_q24fZgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fZwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_q2-l8AKOEeSZ5cZUOQKWkw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_q2-l8QKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q2-l8gKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_q5K-VgKOEeSZ5cZUOQKWkw" type="AppliedStereotypeCompartement">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q5RE8AKOEeSZ5cZUOQKWkw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5RE8QKOEeSZ5cZUOQKWkw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_q5K-VwKOEeSZ5cZUOQKWkw" showTitle="true"/>

-        <element xmi:type="Requirements:Requirement" href="revealSemanticModel.uml#_q5K-UAKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q5K-WAKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fUgKOEeSZ5cZUOQKWkw" x="565" y="11" width="132" height="137"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_tKOa8QKOEeSZ5cZUOQKWkw" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_tKOa8wKOEeSZ5cZUOQKWkw" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tKOa9AKOEeSZ5cZUOQKWkw" type="7016">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_tKOa9QKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKOa9gKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_tKUhkAKOEeSZ5cZUOQKWkw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_tKUhkQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKUhkgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element xmi:type="uml:Package" href="revealSemanticModel.uml#_tKOa8AKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKOa8gKOEeSZ5cZUOQKWkw" x="12" y="18"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_wDVWEAKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wDbcsAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcvAKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcvQKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysML::Requirements::Requirement"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcvgKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcvwKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcwAKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_wDVWEgKOEeSZ5cZUOQKWkw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWEwKOEeSZ5cZUOQKWkw" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWFAKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_wDVWFQKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_wDVWFgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWFwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWGAKOEeSZ5cZUOQKWkw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWGQKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_wDVWGgKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_wDVWGwKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWHAKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWHQKOEeSZ5cZUOQKWkw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWHgKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_wDVWHwKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_wDVWIAKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWIQKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWIgKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">

-        <children xmi:type="notation:DecorationNode" xmi:id="_wDVWJwKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_wDVWKAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWIwKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_wDVWJAKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_wDVWJQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWJgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWKQKOEeSZ5cZUOQKWkw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWKgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWKwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_wDbcwQKOEeSZ5cZUOQKWkw" type="AppliedStereotypeCompartement">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wDhjUAKOEeSZ5cZUOQKWkw" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDhjUQKOEeSZ5cZUOQKWkw" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_wDbcwgKOEeSZ5cZUOQKWkw" showTitle="true"/>

-        <element xmi:type="Requirements:Requirement" href="revealSemanticModel.uml#_wDbcuwKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDbcwwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_wDPPcAKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWEQKOEeSZ5cZUOQKWkw" x="297" y="19" width="143"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_xF_s8QKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xGL6MAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA0QKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA0gKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysML::Requirements::Requirement"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA0wKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA1AKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA1QKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xF_s8wKOEeSZ5cZUOQKWkw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xF_s9AKOEeSZ5cZUOQKWkw" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xF_s9QKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xF_s9gKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xF_s9wKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_s-AKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xF_s-QKOEeSZ5cZUOQKWkw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xF_s-gKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xF_s-wKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xF_s_AKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_s_QKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xF_s_gKOEeSZ5cZUOQKWkw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xF_s_wKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xF_tAAKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xF_tAQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_tAgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xF_tAwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">

-        <children xmi:type="notation:DecorationNode" xmi:id="_xF_tCAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_xF_tCQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xF_tBAKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xF_tBQKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xF_tBgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_tBwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_xF_s8AKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_s8gKOEeSZ5cZUOQKWkw" x="658" y="217" width="119"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_yZofEQKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yZ0sUAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y8QKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y8gKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysML::Requirements::Requirement"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y8wKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y9AKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y9QKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_yZofEwKOEeSZ5cZUOQKWkw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_yZofFAKOEeSZ5cZUOQKWkw" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_yZofFQKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_yZofFgKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_yZofFwKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofGAKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_yZofGQKOEeSZ5cZUOQKWkw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_yZofGgKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_yZofGwKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_yZofHAKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofHQKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_yZofHgKOEeSZ5cZUOQKWkw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_yZofHwKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_yZofIAKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_yZofIQKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofIgKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_yZofIwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">

-        <children xmi:type="notation:DecorationNode" xmi:id="_yZofKAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_yZofKQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_yZofJAKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_yZofJQKOEeSZ5cZUOQKWkw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_yZofJgKOEeSZ5cZUOQKWkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofJwKOEeSZ5cZUOQKWkw"/>

-      </children>

-      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_yZofEAKOEeSZ5cZUOQKWkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofEgKOEeSZ5cZUOQKWkw" x="478" y="218" width="147"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_mDXlcAwwEeSc2dWiwYQWHA" type="shape_sysml_requirement_as_classifier">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mDjysAwwEeSc2dWiwYQWHA" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_8AwwEeSc2dWiwYQWHA" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_8QwwEeSc2dWiwYQWHA" key="StereotypeList" value="SysML::Requirements::Requirement"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_8gwwEeSc2dWiwYQWHA" key="Stereotype_Presentation_Kind" value="Compartment"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_8wwwEeSc2dWiwYQWHA" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_9AwwEeSc2dWiwYQWHA" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mDXlcgwwEeSc2dWiwYQWHA" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mDXlcwwwEeSc2dWiwYQWHA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mDXldAwwEeSc2dWiwYQWHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mDXldQwwEeSc2dWiwYQWHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mDXldgwwEeSc2dWiwYQWHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXldwwwEeSc2dWiwYQWHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mDXleAwwEeSc2dWiwYQWHA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mDXleQwwEeSc2dWiwYQWHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mDXlegwwEeSc2dWiwYQWHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mDXlewwwEeSc2dWiwYQWHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXlfAwwEeSc2dWiwYQWHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mDXlfQwwEeSc2dWiwYQWHA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mDXlfgwwEeSc2dWiwYQWHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mDXlfwwwEeSc2dWiwYQWHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mDXlgAwwEeSc2dWiwYQWHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXlgQwwEeSc2dWiwYQWHA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mDXlggwwEeSc2dWiwYQWHA" type="compartment_sysml_requirement_idinfo_as_list">

-        <children xmi:type="notation:DecorationNode" xmi:id="_mDdsEAwwEeSc2dWiwYQWHA" type="label_sysml_requirement_id"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_mDdsEQwwEeSc2dWiwYQWHA" type="label_sysml_requirement_text"/>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mDXlgwwwEeSc2dWiwYQWHA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mDXlhAwwEeSc2dWiwYQWHA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mDXlhQwwEeSc2dWiwYQWHA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXlhgwwEeSc2dWiwYQWHA"/>

-      </children>

-      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_mDRe0AwwEeSc2dWiwYQWHA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXlcQwwEeSc2dWiwYQWHA" x="304" y="217"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_pBS2xQKOEeSZ5cZUOQKWkw"/>

-    <element xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-  </notation:Diagram>

-  <nattable:Table xmi:id="_B7qCgAKPEeSZ5cZUOQKWkw" name="GenericTable0" currentRowAxisProvider="_B7qCggKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_B7qCgQKPEeSZ5cZUOQKWkw">

-    <context xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-    <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="_B7qCgQKPEeSZ5cZUOQKWkw" 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="_JFXQIgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXyQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derived">

-        <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:FeatureIdAxis" xmi:id="_JWbyNQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derived">

-        <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:FeatureIdAxis" xmi:id="_JjNpwQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derived">

-        <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:FeatureIdAxis" xmi:id="_KMgeYQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derived">

-        <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:FeatureIdAxis" xmi:id="_JFXQXAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derivedFrom">

-        <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:FeatureIdAxis" xmi:id="_JWbyPAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derivedFrom">

-        <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:FeatureIdAxis" xmi:id="_JjNpyAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derivedFrom">

-        <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:FeatureIdAxis" xmi:id="_KMgeaAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derivedFrom">

-        <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="_JFXQSgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">

-        <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:FeatureIdAxis" xmi:id="_JWbyNwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">

-        <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:FeatureIdAxis" xmi:id="_JjNpwwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">

-        <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:FeatureIdAxis" xmi:id="_KMgeYwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">

-        <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="_JFXQRAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKwKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCwKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKwKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXywKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4AKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXyAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMgKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEgKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMgKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0gKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::master">

-        <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:FeatureIdAxis" xmi:id="_JWbyOgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::master">

-        <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:FeatureIdAxis" xmi:id="_JjNpxgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::master">

-        <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:FeatureIdAxis" xmi:id="_KMgeZgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::master">

-        <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="_JFXQSQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUgKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMgKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUgKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWwKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8gKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-wKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestedPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestedPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestingPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/nestingPackage"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXygKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedStereotype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedStereotype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedType"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/ownedType"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packagedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packagedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packageMerge"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/packageMerge"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/profileApplication"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Package/profileApplication"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOQKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGQKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOQKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVwKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2QKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79wKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::refinedBy">

-        <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:FeatureIdAxis" xmi:id="_JWbyNAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::refinedBy">

-        <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:FeatureIdAxis" xmi:id="_JjNpwAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::refinedBy">

-        <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:FeatureIdAxis" xmi:id="_KMgeYAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::refinedBy">

-        <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="_JFXQUwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1AKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::satisfiedBy">

-        <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:FeatureIdAxis" xmi:id="_JWbyOAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::satisfiedBy">

-        <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:FeatureIdAxis" xmi:id="_JjNpxAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::satisfiedBy">

-        <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:FeatureIdAxis" xmi:id="_KMgeZAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::satisfiedBy">

-        <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="_JFXQQwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQQKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4QKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNwKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVgKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1wKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79gKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::text">

-        <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:FeatureIdAxis" xmi:id="_JWbyOQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::text">

-        <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:FeatureIdAxis" xmi:id="_JjNpxQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::text">

-        <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:FeatureIdAxis" xmi:id="_KMgeZQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::text">

-        <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:FeatureIdAxis" xmi:id="_JFXQWwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::tracedTo">

-        <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:FeatureIdAxis" xmi:id="_JWbyOwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::tracedTo">

-        <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:FeatureIdAxis" xmi:id="_JjNpxwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::tracedTo">

-        <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:FeatureIdAxis" xmi:id="_KMgeZwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::tracedTo">

-        <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="_JvzUWgKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-gKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzAKPEeSZ5cZUOQKWkw">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::verifiedBy">

-        <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:FeatureIdAxis" xmi:id="_JWbyNgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::verifiedBy">

-        <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:FeatureIdAxis" xmi:id="_JjNpwgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::verifiedBy">

-        <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:FeatureIdAxis" xmi:id="_KMgeYgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::verifiedBy">

-        <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="_Keb75AKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUAKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWQKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8AKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-QKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18QNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18gNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18wNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/redefinedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19ANfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/subsettedProperty"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19QNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19gNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19wNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-ANfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-QNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-gNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/qualifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-wNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Port/required"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_ANfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Port/protocol"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_QNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_gNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port/isService"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_wNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/interface"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AANfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/associationEnd"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AQNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Port/redefinedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AgNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//TypedElement/type"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AwNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Port/provided"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BANfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BQNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/defaultValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BgNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BwNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CANfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CQNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CgNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Feature/featuringClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CwNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//DeploymentTarget/deployment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DANfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port/isBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DQNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DgNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/class"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DwNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EANfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//ConnectableElement/end"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EQNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EgNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EwNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FANfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FQNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/opposite"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FgNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FwNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GANfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/datatype"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GQNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/owningAssociation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GgNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GwNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//Property/association"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HANfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HQNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HgNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HwNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IANfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port/isConjugated"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IQNfEeSV3fVidaLvSQ">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IgNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IwNfEeSV3fVidaLvSQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_B7qCggKPEeSZ5cZUOQKWkw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_KeV1QAKPEeSZ5cZUOQKWkw">

-        <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:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_JvzUQAKPEeSZ5cZUOQKWkw">

-        <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:Package" href="revealSemanticModel.uml#_tKOa8AKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_KMaXwAKPEeSZ5cZUOQKWkw">

-        <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:Class" href="revealSemanticModel.uml#_xF_s8AKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_JFXQIAKPEeSZ5cZUOQKWkw">

-        <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:Class" href="revealSemanticModel.uml#_wDPPcAKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_JWbyAAKPEeSZ5cZUOQKWkw">

-        <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:Class" href="revealSemanticModel.uml#_yZofEAKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_JjHjIAKPEeSZ5cZUOQKWkw">

-        <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:Class" href="revealSemanticModel.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_pEr18ANfEeSV3fVidaLvSQ">

-        <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:Port" href="revealSemanticModel.uml#_mCmlAANfEeSV3fVidaLvSQ"/>

-      </axis>

-    </rowAxisProvidersHistory>

-  </nattable:Table>

-  <nattable:Table xmi:id="_C2IGsAKPEeSZ5cZUOQKWkw" name="RequirementTable0" currentRowAxisProvider="_C2IGtQKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_C2IGsQKPEeSZ5cZUOQKWkw">

-    <context xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-    <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="_C2IGsQKPEeSZ5cZUOQKWkw" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_C2IGsgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_C2IGswKPEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_C2IGtAKPEeSZ5cZUOQKWkw" 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="_C2IGtQKPEeSZ5cZUOQKWkw" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-  </nattable:Table>

-  <nattable:Table xmi:id="_EGhXkAKPEeSZ5cZUOQKWkw" name="TableOfViews0" currentRowAxisProvider="_EGhXlgKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_EGhXkQKPEeSZ5cZUOQKWkw">

-    <context xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_EGhXkQKPEeSZ5cZUOQKWkw" description="Provides the features of the views" name="Papyrus Views feature provider">

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXkgKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/name">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXkwKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/context">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXlAKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/isOpen">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXlQKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/type">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_EGhXlgKPEeSZ5cZUOQKWkw"/>

-  </nattable:Table>

-  <nattable:Table xmi:id="_ffxOYAKUEeSZ5cZUOQKWkw" name="RequirementTable1" currentRowAxisProvider="_ffxOZQKUEeSZ5cZUOQKWkw" currentColumnAxisProvider="_ffxOYQKUEeSZ5cZUOQKWkw">

-    <context xmi:type="uml:Class" href="revealSemanticModel.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>

-    <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="_ffxOYQKUEeSZ5cZUOQKWkw" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_ffxOYgKUEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ffxOYwKUEeSZ5cZUOQKWkw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_yaOl0ANbEeSV3fVidaLvSQ">

-        <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:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_ffxOZAKUEeSZ5cZUOQKWkw" 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="_ffxOZQKUEeSZ5cZUOQKWkw" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider"/>

-  </nattable:Table>

-  <nattable:Table xmi:id="_ZfPQ8Av4EeSOiKqWiKPo8w" name="AllocationTable0" currentRowAxisProvider="_ZfP4AQv4EeSOiKqWiKPo8w" currentColumnAxisProvider="_ZfPQ8Qv4EeSOiKqWiKPo8w">

-    <context xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_ZfPQ8Qv4EeSOiKqWiKPo8w" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ8gv4EeSOiKqWiKPo8w">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ8wv4EeSOiKqWiKPo8w">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Dependency/client"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ9Av4EeSOiKqWiKPo8w">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Dependency/supplier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfP4AAv4EeSOiKqWiKPo8w">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_ZfP4AQv4EeSOiKqWiKPo8w" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" 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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">
+  <notation:Diagram xmi:id="_pBS2xAKOEeSZ5cZUOQKWkw" type="RequirementDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_q24fUQKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q3EskAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-UQKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-UgKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysML::Requirements::Requirement"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-UwKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-VAKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5K-VQKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q24fUwKOEeSZ5cZUOQKWkw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_q24fVAKOEeSZ5cZUOQKWkw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_q24fVQKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_q24fVgKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_q24fVwKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fWAKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_q24fWQKOEeSZ5cZUOQKWkw" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_q24fWgKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_q24fWwKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_q24fXAKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fXQKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_q24fXgKOEeSZ5cZUOQKWkw" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_q24fXwKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_q24fYAKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_q24fYQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fYgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_q24fYwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">
+        <children xmi:type="notation:DecorationNode" xmi:id="_q24faAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_q24faQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_q24fZAKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_q24fZQKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_q24fZgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fZwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_q2-l8AKOEeSZ5cZUOQKWkw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_q2-l8QKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q2-l8gKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_q5K-VgKOEeSZ5cZUOQKWkw" type="AppliedStereotypeCompartement">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q5RE8AKOEeSZ5cZUOQKWkw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q5RE8QKOEeSZ5cZUOQKWkw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_q5K-VwKOEeSZ5cZUOQKWkw" showTitle="true"/>
+        <element xmi:type="Requirements:Requirement" href="revealSemanticModel.uml#_q5K-UAKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q5K-WAKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q24fUgKOEeSZ5cZUOQKWkw" x="565" y="11" width="132" height="137"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_tKOa8QKOEeSZ5cZUOQKWkw" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_tKOa8wKOEeSZ5cZUOQKWkw" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tKOa9AKOEeSZ5cZUOQKWkw" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tKOa9QKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKOa9gKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tKUhkAKOEeSZ5cZUOQKWkw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tKUhkQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKUhkgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element xmi:type="uml:Package" href="revealSemanticModel.uml#_tKOa8AKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tKOa8gKOEeSZ5cZUOQKWkw" x="12" y="18"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wDVWEAKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wDbcsAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcvAKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcvQKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysML::Requirements::Requirement"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcvgKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcvwKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDbcwAKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wDVWEgKOEeSZ5cZUOQKWkw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWEwKOEeSZ5cZUOQKWkw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWFAKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wDVWFQKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wDVWFgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWFwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWGAKOEeSZ5cZUOQKWkw" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWGQKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wDVWGgKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wDVWGwKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWHAKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWHQKOEeSZ5cZUOQKWkw" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWHgKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wDVWHwKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wDVWIAKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWIQKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWIgKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">
+        <children xmi:type="notation:DecorationNode" xmi:id="_wDVWJwKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_wDVWKAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWIwKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wDVWJAKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wDVWJQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWJgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wDVWKQKOEeSZ5cZUOQKWkw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wDVWKgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWKwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wDbcwQKOEeSZ5cZUOQKWkw" type="AppliedStereotypeCompartement">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wDhjUAKOEeSZ5cZUOQKWkw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wDhjUQKOEeSZ5cZUOQKWkw" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wDbcwgKOEeSZ5cZUOQKWkw" showTitle="true"/>
+        <element xmi:type="Requirements:Requirement" href="revealSemanticModel.uml#_wDbcuwKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDbcwwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_wDPPcAKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDVWEQKOEeSZ5cZUOQKWkw" x="297" y="19" width="143"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_xF_s8QKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xGL6MAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA0QKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA0gKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysML::Requirements::Requirement"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA0wKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA1AKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xGSA1QKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xF_s8wKOEeSZ5cZUOQKWkw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xF_s9AKOEeSZ5cZUOQKWkw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xF_s9QKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xF_s9gKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xF_s9wKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_s-AKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xF_s-QKOEeSZ5cZUOQKWkw" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xF_s-gKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xF_s-wKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xF_s_AKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_s_QKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xF_s_gKOEeSZ5cZUOQKWkw" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xF_s_wKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xF_tAAKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xF_tAQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_tAgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xF_tAwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">
+        <children xmi:type="notation:DecorationNode" xmi:id="_xF_tCAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_xF_tCQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xF_tBAKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xF_tBQKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xF_tBgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_tBwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_xF_s8AKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xF_s8gKOEeSZ5cZUOQKWkw" x="658" y="217" width="119"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yZofEQKOEeSZ5cZUOQKWkw" type="shape_sysml_requirement_as_classifier">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yZ0sUAKOEeSZ5cZUOQKWkw" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y8QKOEeSZ5cZUOQKWkw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y8gKOEeSZ5cZUOQKWkw" key="StereotypeList" value="SysML::Requirements::Requirement"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y8wKOEeSZ5cZUOQKWkw" key="Stereotype_Presentation_Kind" value="Compartment"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y9AKOEeSZ5cZUOQKWkw" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yZ6y9QKOEeSZ5cZUOQKWkw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_yZofEwKOEeSZ5cZUOQKWkw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_yZofFAKOEeSZ5cZUOQKWkw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_yZofFQKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_yZofFgKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_yZofFwKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofGAKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_yZofGQKOEeSZ5cZUOQKWkw" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_yZofGgKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_yZofGwKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_yZofHAKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofHQKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_yZofHgKOEeSZ5cZUOQKWkw" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_yZofHwKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_yZofIAKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_yZofIQKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofIgKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_yZofIwKOEeSZ5cZUOQKWkw" type="compartment_sysml_requirement_idinfo_as_list">
+        <children xmi:type="notation:DecorationNode" xmi:id="_yZofKAKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_id"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_yZofKQKOEeSZ5cZUOQKWkw" type="label_sysml_requirement_text"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_yZofJAKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_yZofJQKOEeSZ5cZUOQKWkw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_yZofJgKOEeSZ5cZUOQKWkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofJwKOEeSZ5cZUOQKWkw"/>
+      </children>
+      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_yZofEAKOEeSZ5cZUOQKWkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yZofEgKOEeSZ5cZUOQKWkw" x="478" y="218" width="147"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mDXlcAwwEeSc2dWiwYQWHA" type="shape_sysml_requirement_as_classifier">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mDjysAwwEeSc2dWiwYQWHA" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_8AwwEeSc2dWiwYQWHA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_8QwwEeSc2dWiwYQWHA" key="StereotypeList" value="SysML::Requirements::Requirement"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_8gwwEeSc2dWiwYQWHA" key="Stereotype_Presentation_Kind" value="Compartment"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_8wwwEeSc2dWiwYQWHA" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mDv_9AwwEeSc2dWiwYQWHA" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mDXlcgwwEeSc2dWiwYQWHA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mDXlcwwwEeSc2dWiwYQWHA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mDXldAwwEeSc2dWiwYQWHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mDXldQwwEeSc2dWiwYQWHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mDXldgwwEeSc2dWiwYQWHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXldwwwEeSc2dWiwYQWHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mDXleAwwEeSc2dWiwYQWHA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mDXleQwwEeSc2dWiwYQWHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mDXlegwwEeSc2dWiwYQWHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mDXlewwwEeSc2dWiwYQWHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXlfAwwEeSc2dWiwYQWHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mDXlfQwwEeSc2dWiwYQWHA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mDXlfgwwEeSc2dWiwYQWHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mDXlfwwwEeSc2dWiwYQWHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mDXlgAwwEeSc2dWiwYQWHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXlgQwwEeSc2dWiwYQWHA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mDXlggwwEeSc2dWiwYQWHA" type="compartment_sysml_requirement_idinfo_as_list">
+        <children xmi:type="notation:DecorationNode" xmi:id="_mDdsEAwwEeSc2dWiwYQWHA" type="label_sysml_requirement_id"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_mDdsEQwwEeSc2dWiwYQWHA" type="label_sysml_requirement_text"/>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mDXlgwwwEeSc2dWiwYQWHA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mDXlhAwwEeSc2dWiwYQWHA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mDXlhQwwEeSc2dWiwYQWHA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXlhgwwEeSc2dWiwYQWHA"/>
+      </children>
+      <element xmi:type="uml:Class" href="revealSemanticModel.uml#_mDRe0AwwEeSc2dWiwYQWHA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mDXlcQwwEeSc2dWiwYQWHA" x="304" y="217"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_pBS2xQKOEeSZ5cZUOQKWkw"/>
+    <element xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+  </notation:Diagram>
+  <nattable:Table xmi:id="_B7qCgAKPEeSZ5cZUOQKWkw" name="GenericTable0" currentRowAxisProvider="_B7qCggKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_B7qCgQKPEeSZ5cZUOQKWkw">
+    <context xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+    <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="_B7qCgQKPEeSZ5cZUOQKWkw" 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="_JFXQIgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXyQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derived">
+        <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:FeatureIdAxis" xmi:id="_JWbyNQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derived">
+        <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:FeatureIdAxis" xmi:id="_JjNpwQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derived">
+        <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:FeatureIdAxis" xmi:id="_KMgeYQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derived">
+        <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:FeatureIdAxis" xmi:id="_JFXQXAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derivedFrom">
+        <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:FeatureIdAxis" xmi:id="_JWbyPAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derivedFrom">
+        <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:FeatureIdAxis" xmi:id="_JjNpyAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derivedFrom">
+        <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:FeatureIdAxis" xmi:id="_KMgeaAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::derivedFrom">
+        <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="_JFXQSgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
+        <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:FeatureIdAxis" xmi:id="_JWbyNwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
+        <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:FeatureIdAxis" xmi:id="_JjNpwwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
+        <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:FeatureIdAxis" xmi:id="_KMgeYwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
+        <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="_JFXQRAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKwKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCwKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKwKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXywKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4AKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXyAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMgKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEgKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMgKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0gKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::master">
+        <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:FeatureIdAxis" xmi:id="_JWbyOgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::master">
+        <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:FeatureIdAxis" xmi:id="_JjNpxgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::master">
+        <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:FeatureIdAxis" xmi:id="_KMgeZgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::master">
+        <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="_JFXQSQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUgKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMgKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUgKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWwKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8gKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-wKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestedPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestedPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestingPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/nestingPackage"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXygKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQKgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyCgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjKgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQJQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyBQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjJQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXxQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQIQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyAQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjIQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXwQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedStereotype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedStereotype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUSQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedType"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb76QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/ownedType"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQSAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyKAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjSAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX6AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQRwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyJwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjRwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX5wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUQgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packagedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb74QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packagedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQMwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyEwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjMwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUUgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX0wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb78gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packageMerge"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/packageMerge"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUTAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/profileApplication"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb77AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Package/profileApplication"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOQKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGQKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOQKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVwKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2QKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79wKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQPwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyHwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjPwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX3wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQOAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyGAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjOAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX2AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::refinedBy">
+        <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:FeatureIdAxis" xmi:id="_JWbyNAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::refinedBy">
+        <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:FeatureIdAxis" xmi:id="_JjNpwAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::refinedBy">
+        <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:FeatureIdAxis" xmi:id="_KMgeYAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::refinedBy">
+        <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="_JFXQUwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1AKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::satisfiedBy">
+        <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:FeatureIdAxis" xmi:id="_JWbyOAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::satisfiedBy">
+        <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:FeatureIdAxis" xmi:id="_JjNpxAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::satisfiedBy">
+        <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:FeatureIdAxis" xmi:id="_KMgeZAKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::satisfiedBy">
+        <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="_JFXQQwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQTgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyLgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjTgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX7gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQQQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyIQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjQQKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzURwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX4QKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb75wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQNwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyFwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjNwKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUVgKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX1wKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb79gKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQWQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::text">
+        <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:FeatureIdAxis" xmi:id="_JWbyOQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::text">
+        <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:FeatureIdAxis" xmi:id="_JjNpxQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::text">
+        <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:FeatureIdAxis" xmi:id="_KMgeZQKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::text">
+        <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:FeatureIdAxis" xmi:id="_JFXQWwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::tracedTo">
+        <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:FeatureIdAxis" xmi:id="_JWbyOwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::tracedTo">
+        <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:FeatureIdAxis" xmi:id="_JjNpxwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::tracedTo">
+        <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:FeatureIdAxis" xmi:id="_KMgeZwKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::tracedTo">
+        <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="_JvzUWgKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-gKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQLAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyDAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjLAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaXzAKPEeSZ5cZUOQKWkw">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_JFXQVgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::verifiedBy">
+        <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:FeatureIdAxis" xmi:id="_JWbyNgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::verifiedBy">
+        <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:FeatureIdAxis" xmi:id="_JjNpwgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::verifiedBy">
+        <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:FeatureIdAxis" xmi:id="_KMgeYgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::verifiedBy">
+        <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="_Keb75AKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JFXQUAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JWbyMAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JjHjUAKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_JvzUWQKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_KMaX8AKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Keb7-QKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18QNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18gNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuralFeature/isReadOnly"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr18wNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/redefinedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19ANfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/subsettedProperty"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19QNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19gNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//MultiplicityElement/lowerValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr19wNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isComposite.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-ANfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/aggregation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-QNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-gNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/qualifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1-wNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Port/required"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_ANfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Port/protocol"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_QNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isUnique"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_gNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port/isService"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr1_wNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/interface"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AANfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/associationEnd"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AQNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Port/redefinedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AgNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//TypedElement/type"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2AwNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Port/provided"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BANfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BQNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/defaultValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BgNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2BwNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CANfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CQNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CgNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Feature/featuringClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2CwNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//DeploymentTarget/deployment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DANfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port/isBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DQNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//MultiplicityElement/upperValue"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DgNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/class"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2DwNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/isOrdered"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EANfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//ConnectableElement/end"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EQNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EgNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2EwNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/default"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FANfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FQNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/opposite"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FgNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2FwNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//DeploymentTarget/deployedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GANfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/datatype"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GQNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/owningAssociation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GgNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2GwNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//Property/association"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HANfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HQNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HgNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isID"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2HwNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/upper"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IANfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port/isConjugated"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IQNfEeSV3fVidaLvSQ">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IgNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerivedUnion"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_pEr2IwNfEeSV3fVidaLvSQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement/lower"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_B7qCggKPEeSZ5cZUOQKWkw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_KeV1QAKPEeSZ5cZUOQKWkw">
+        <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:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_JvzUQAKPEeSZ5cZUOQKWkw">
+        <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:Package" href="revealSemanticModel.uml#_tKOa8AKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_KMaXwAKPEeSZ5cZUOQKWkw">
+        <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:Class" href="revealSemanticModel.uml#_xF_s8AKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_JFXQIAKPEeSZ5cZUOQKWkw">
+        <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:Class" href="revealSemanticModel.uml#_wDPPcAKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_JWbyAAKPEeSZ5cZUOQKWkw">
+        <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:Class" href="revealSemanticModel.uml#_yZofEAKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_JjHjIAKPEeSZ5cZUOQKWkw">
+        <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:Class" href="revealSemanticModel.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_pEr18ANfEeSV3fVidaLvSQ">
+        <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:Port" href="revealSemanticModel.uml#_mCmlAANfEeSV3fVidaLvSQ"/>
+      </axis>
+    </rowAxisProvidersHistory>
+  </nattable:Table>
+  <nattable:Table xmi:id="_C2IGsAKPEeSZ5cZUOQKWkw" name="RequirementTable0" currentRowAxisProvider="_C2IGtQKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_C2IGsQKPEeSZ5cZUOQKWkw">
+    <context xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+    <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="_C2IGsQKPEeSZ5cZUOQKWkw" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_C2IGsgKPEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_C2IGswKPEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_C2IGtAKPEeSZ5cZUOQKWkw" 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="_C2IGtQKPEeSZ5cZUOQKWkw" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+  </nattable:Table>
+  <nattable:Table xmi:id="_EGhXkAKPEeSZ5cZUOQKWkw" name="TableOfViews0" currentRowAxisProvider="_EGhXlgKPEeSZ5cZUOQKWkw" currentColumnAxisProvider="_EGhXkQKPEeSZ5cZUOQKWkw">
+    <context xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_EGhXkQKPEeSZ5cZUOQKWkw" description="Provides the features of the views" name="Papyrus Views feature provider">
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXkgKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/name">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXkwKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/context">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXlAKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/isOpen">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_EGhXlQKPEeSZ5cZUOQKWkw" element="nattable_editor_pages:/type">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_EGhXlgKPEeSZ5cZUOQKWkw"/>
+  </nattable:Table>
+  <nattable:Table xmi:id="_ffxOYAKUEeSZ5cZUOQKWkw" name="RequirementTable1" currentRowAxisProvider="_ffxOZQKUEeSZ5cZUOQKWkw" currentColumnAxisProvider="_ffxOYQKUEeSZ5cZUOQKWkw">
+    <context xmi:type="uml:Class" href="revealSemanticModel.uml#_q24fUAKOEeSZ5cZUOQKWkw"/>
+    <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="_ffxOYQKUEeSZ5cZUOQKWkw" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_ffxOYgKUEeSZ5cZUOQKWkw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ffxOYwKUEeSZ5cZUOQKWkw">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_yaOl0ANbEeSV3fVidaLvSQ">
+        <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:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_ffxOZAKUEeSZ5cZUOQKWkw" 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="_ffxOZQKUEeSZ5cZUOQKWkw" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider"/>
+  </nattable:Table>
+  <nattable:Table xmi:id="_ZfPQ8Av4EeSOiKqWiKPo8w" name="AllocationTable0" currentRowAxisProvider="_ZfP4AQv4EeSOiKqWiKPo8w" currentColumnAxisProvider="_ZfPQ8Qv4EeSOiKqWiKPo8w">
+    <context xmi:type="uml:Model" href="revealSemanticModel.uml#_o-VpUAKOEeSZ5cZUOQKWkw"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_ZfPQ8Qv4EeSOiKqWiKPo8w" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ8gv4EeSOiKqWiKPo8w">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ8wv4EeSOiKqWiKPo8w">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Dependency/client"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfPQ9Av4EeSOiKqWiKPo8w">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Dependency/supplier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_ZfP4AAv4EeSOiKqWiKPo8w">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_ZfP4AQv4EeSOiKqWiKPo8w" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" disconnectSlave="true"/>
+  </nattable:Table>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.uml
index f7887b3d69d..34ad49f5808 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/revealSemanticModel.uml
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Allocations="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements">

-  <uml:Model xmi:id="_o-VpUAKOEeSZ5cZUOQKWkw" name="SysMLmodel">

-    <packagedElement xmi:type="uml:Package" xmi:id="_tKOa8AKOEeSZ5cZUOQKWkw" name="Star Fighter">

-      <packagedElement xmi:type="uml:Class" xmi:id="_YNurgAKREeSZ5cZUOQKWkw" name="Requirement"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_q24fUAKOEeSZ5cZUOQKWkw" name="Durability" isActive="true">

-        <ownedAttribute xmi:type="uml:Port" xmi:id="_mCmlAANfEeSV3fVidaLvSQ" name="port" visibility="public" isReadOnly="true" aggregation="composite"/>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_wDPPcAKOEeSZ5cZUOQKWkw" name="Engine">

-          <nestedClassifier xmi:type="uml:Class" xmi:id="_yZofEAKOEeSZ5cZUOQKWkw" name="Maneuverability"/>

-        </nestedClassifier>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_xF_s8AKOEeSZ5cZUOQKWkw" name="Shield"/>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_mDRe0AwwEeSc2dWiwYQWHA" name="Firepower"/>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Abstraction" xmi:id="_bVbWgAv4EeSOiKqWiKPo8w" name="Allocate"/>

-    <packagedElement xmi:type="uml:Abstraction" xmi:id="_cGN6QAv4EeSOiKqWiKPo8w" name="Allocate1"/>

-    <packagedElement xmi:type="uml:Abstraction" xmi:id="_cg0yoAv4EeSOiKqWiKPo8w" name="Allocate2"/>

-    <packagedElement xmi:type="uml:Abstraction" xmi:id="_c8TNsAv4EeSOiKqWiKPo8w" name="Allocate3"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_o-0KcAKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o-0KcQKOEeSZ5cZUOQKWkw" 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>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2sAKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2sQKOEeSZ5cZUOQKWkw" 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#//modelelements"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2sgKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2swKOEeSZ5cZUOQKWkw" 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#//blocks"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2tAKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2tQKOEeSZ5cZUOQKWkw" 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#//portandflows"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2tgKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2twKOEeSZ5cZUOQKWkw" 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#//constraints"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2uAKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2uQKOEeSZ5cZUOQKWkw" 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#//activities"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2ugKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2uwKOEeSZ5cZUOQKWkw" 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#//allocations"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2vAKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2vQKOEeSZ5cZUOQKWkw" 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="_pBS2vgKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2vwKOEeSZ5cZUOQKWkw" 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#//interactions"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2wAKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2wQKOEeSZ5cZUOQKWkw" 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#//statemachines"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2wgKOEeSZ5cZUOQKWkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2wwKOEeSZ5cZUOQKWkw" 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#//usecases"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_q5K-UAKOEeSZ5cZUOQKWkw" id="1" base_Class="_q24fUAKOEeSZ5cZUOQKWkw"/>

-  <Requirements:Requirement xmi:id="_wDbcuwKOEeSZ5cZUOQKWkw" id="1.2" base_Class="_wDPPcAKOEeSZ5cZUOQKWkw"/>

-  <Requirements:Requirement xmi:id="_xGSA0AKOEeSZ5cZUOQKWkw" text="none" id="1.1" base_Class="_xF_s8AKOEeSZ5cZUOQKWkw"/>

-  <Requirements:Requirement xmi:id="_yZ6y8AKOEeSZ5cZUOQKWkw" text="Huge" id="1.2.1" base_Class="_yZofEAKOEeSZ5cZUOQKWkw"/>

-  <Requirements:Requirement xmi:id="_YN0yIAKREeSZ5cZUOQKWkw" base_Class="_YNurgAKREeSZ5cZUOQKWkw"/>

-  <Allocations:Allocate xmi:id="_bVg2EAv4EeSOiKqWiKPo8w" base_Abstraction="_bVbWgAv4EeSOiKqWiKPo8w"/>

-  <Allocations:Allocate xmi:id="_cGPIYAv4EeSOiKqWiKPo8w" base_Abstraction="_cGN6QAv4EeSOiKqWiKPo8w"/>

-  <Allocations:Allocate xmi:id="_cg1ZsAv4EeSOiKqWiKPo8w" base_Abstraction="_cg0yoAv4EeSOiKqWiKPo8w"/>

-  <Allocations:Allocate xmi:id="_c8T0wAv4EeSOiKqWiKPo8w" base_Abstraction="_c8TNsAv4EeSOiKqWiKPo8w"/>

-  <Requirements:Requirement xmi:id="_mDp5UAwwEeSc2dWiwYQWHA" base_Class="_mDRe0AwwEeSc2dWiwYQWHA"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Allocations="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements">
+  <uml:Model xmi:id="_o-VpUAKOEeSZ5cZUOQKWkw" name="SysMLmodel">
+    <packagedElement xmi:type="uml:Package" xmi:id="_tKOa8AKOEeSZ5cZUOQKWkw" name="Star Fighter">
+      <packagedElement xmi:type="uml:Class" xmi:id="_YNurgAKREeSZ5cZUOQKWkw" name="Requirement"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_q24fUAKOEeSZ5cZUOQKWkw" name="Durability" isActive="true">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_mCmlAANfEeSV3fVidaLvSQ" name="port" visibility="public" isReadOnly="true" aggregation="composite"/>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_wDPPcAKOEeSZ5cZUOQKWkw" name="Engine">
+          <nestedClassifier xmi:type="uml:Class" xmi:id="_yZofEAKOEeSZ5cZUOQKWkw" name="Maneuverability"/>
+        </nestedClassifier>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_xF_s8AKOEeSZ5cZUOQKWkw" name="Shield"/>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_mDRe0AwwEeSc2dWiwYQWHA" name="Firepower"/>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Abstraction" xmi:id="_bVbWgAv4EeSOiKqWiKPo8w" name="Allocate"/>
+    <packagedElement xmi:type="uml:Abstraction" xmi:id="_cGN6QAv4EeSOiKqWiKPo8w" name="Allocate1"/>
+    <packagedElement xmi:type="uml:Abstraction" xmi:id="_cg0yoAv4EeSOiKqWiKPo8w" name="Allocate2"/>
+    <packagedElement xmi:type="uml:Abstraction" xmi:id="_c8TNsAv4EeSOiKqWiKPo8w" name="Allocate3"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_o-0KcAKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o-0KcQKOEeSZ5cZUOQKWkw" 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>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2sAKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2sQKOEeSZ5cZUOQKWkw" 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#//modelelements"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2sgKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2swKOEeSZ5cZUOQKWkw" 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#//blocks"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2tAKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2tQKOEeSZ5cZUOQKWkw" 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#//portandflows"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2tgKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2twKOEeSZ5cZUOQKWkw" 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#//constraints"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2uAKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2uQKOEeSZ5cZUOQKWkw" 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#//activities"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2ugKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2uwKOEeSZ5cZUOQKWkw" 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#//allocations"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2vAKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2vQKOEeSZ5cZUOQKWkw" 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="_pBS2vgKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2vwKOEeSZ5cZUOQKWkw" 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#//interactions"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2wAKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2wQKOEeSZ5cZUOQKWkw" 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#//statemachines"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_pBS2wgKOEeSZ5cZUOQKWkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pBS2wwKOEeSZ5cZUOQKWkw" 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#//usecases"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_q5K-UAKOEeSZ5cZUOQKWkw" id="1" base_Class="_q24fUAKOEeSZ5cZUOQKWkw"/>
+  <Requirements:Requirement xmi:id="_wDbcuwKOEeSZ5cZUOQKWkw" id="1.2" base_Class="_wDPPcAKOEeSZ5cZUOQKWkw"/>
+  <Requirements:Requirement xmi:id="_xGSA0AKOEeSZ5cZUOQKWkw" text="none" id="1.1" base_Class="_xF_s8AKOEeSZ5cZUOQKWkw"/>
+  <Requirements:Requirement xmi:id="_yZ6y8AKOEeSZ5cZUOQKWkw" text="Huge" id="1.2.1" base_Class="_yZofEAKOEeSZ5cZUOQKWkw"/>
+  <Requirements:Requirement xmi:id="_YN0yIAKREeSZ5cZUOQKWkw" base_Class="_YNurgAKREeSZ5cZUOQKWkw"/>
+  <Allocations:Allocate xmi:id="_bVg2EAv4EeSOiKqWiKPo8w" base_Abstraction="_bVbWgAv4EeSOiKqWiKPo8w"/>
+  <Allocations:Allocate xmi:id="_cGPIYAv4EeSOiKqWiKPo8w" base_Abstraction="_cGN6QAv4EeSOiKqWiKPo8w"/>
+  <Allocations:Allocate xmi:id="_cg1ZsAv4EeSOiKqWiKPo8w" base_Abstraction="_cg0yoAv4EeSOiKqWiKPo8w"/>
+  <Allocations:Allocate xmi:id="_c8T0wAv4EeSOiKqWiKPo8w" base_Abstraction="_c8TNsAv4EeSOiKqWiKPo8w"/>
+  <Requirements:Requirement xmi:id="_mDp5UAwwEeSc2dWiwYQWHA" base_Class="_mDRe0AwwEeSc2dWiwYQWHA"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.notation
@@ -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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.uml
index e4295dcc7ec..36ca4730885 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/sysmlModel.uml
@@ -1,158 +1,158 @@
-<?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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">

-  <uml:Model xmi:id="_NydJMNjoEeKw9PDRLmC3Lg" name="SysMLmodel">

-    <packagedElement xmi:type="uml:Class" xmi:id="_pFCy0Nj3EeKw9PDRLmC3Lg" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_4P-YwNmjEeKw9PDRLmC3Lg" name="Requirement1">

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_EKEE0NmnEeKw9PDRLmC3Lg" name="NestedRequirement1"/>

-      <nestedClassifier xmi:type="uml:Class" xmi:id="_E0dssNmnEeKw9PDRLmC3Lg" name="NestedRequirement2"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_DY0OENmnEeKw9PDRLmC3Lg" name="Requirement2"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RE5KkNc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RE5Kktc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5Kk9c8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5KlNc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5Kldc8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5Kltc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5Kl9c8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RE5Kkdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3REMPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RE5KmNc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfngNc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfngdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfngtc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfng9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnhNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnhdc8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RE5Kmdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3YY8PgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFfnhtc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfniNc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnidc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnitc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfni9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnjNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnjdc8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnh9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3a1MPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFfnjtc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnkNc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnkdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnktc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnk9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnlNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnldc8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnj9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3efkPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFfnltc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnmNc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnmdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnmtc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnm9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnnNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnndc8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnl9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3fGoPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFoxcNc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxctc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxc9c8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxdNc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxddc8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxdtc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxd9c8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxcdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3gUwPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFoxeNc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxetc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxe9c8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxfNc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxfdc8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxftc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxf9c8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxedc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3iJ8PgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFoxgNc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyicNc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyicdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyictc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyic9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyidNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyiddc8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxgdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFyidtc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyieNc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyiedc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyietc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyie9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyifNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyifdc8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyid9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3nCcPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFyiftc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyigNc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyigdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyigtc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyig9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyihNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyihdc8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyif9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3npgPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RF8TcNc8EeaIfIDhMwu8rA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RF8Tctc8EeaIfIDhMwu8rA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8Tc9c8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8TdNc8EeaIfIDhMwu8rA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8Tddc8EeaIfIDhMwu8rA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8Tdtc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8Td9c8EeaIfIDhMwu8rA" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RF8Tcdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3oQkPgMEeWiHvr2EcCZeg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Requirements:Requirement xmi:id="_Sf5wANc8EeaIfIDhMwu8rA" base_Class="_4P-YwNmjEeKw9PDRLmC3Lg"/>

-  <Requirements:Requirement xmi:id="_TONngNc8EeaIfIDhMwu8rA" base_Class="_E0dssNmnEeKw9PDRLmC3Lg"/>

-  <Requirements:Requirement xmi:id="_T1fC4Nc8EeaIfIDhMwu8rA" base_Class="_EKEE0NmnEeKw9PDRLmC3Lg"/>

-  <Requirements:Requirement xmi:id="_UgLlsNc8EeaIfIDhMwu8rA" base_Class="_DY0OENmnEeKw9PDRLmC3Lg"/>

-</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:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysMLCopy/Requirements platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg">
+  <uml:Model xmi:id="_NydJMNjoEeKw9PDRLmC3Lg" name="SysMLmodel">
+    <packagedElement xmi:type="uml:Class" xmi:id="_pFCy0Nj3EeKw9PDRLmC3Lg" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_4P-YwNmjEeKw9PDRLmC3Lg" name="Requirement1">
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_EKEE0NmnEeKw9PDRLmC3Lg" name="NestedRequirement1"/>
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_E0dssNmnEeKw9PDRLmC3Lg" name="NestedRequirement2"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_DY0OENmnEeKw9PDRLmC3Lg" name="Requirement2"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RE5KkNc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RE5Kktc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5Kk9c8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5KlNc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5Kldc8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5Kltc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RE5Kl9c8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RE5Kkdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3REMPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RE5KmNc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfngNc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfngdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfngtc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfng9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnhNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnhdc8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RE5Kmdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3YY8PgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFfnhtc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfniNc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnidc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnitc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfni9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnjNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnjdc8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnh9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3a1MPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFfnjtc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnkNc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnkdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnktc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnk9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnlNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnldc8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnj9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3efkPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFfnltc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnmNc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnmdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnmtc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnm9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnnNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFfnndc8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFfnl9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3fGoPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFoxcNc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxctc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxc9c8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxdNc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxddc8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxdtc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxd9c8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxcdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3gUwPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFoxeNc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxetc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxe9c8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxfNc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxfdc8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxftc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFoxf9c8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxedc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3iJ8PgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFoxgNc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyicNc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyicdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyictc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyic9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyidNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyiddc8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFoxgdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3mbYPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFyidtc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyieNc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyiedc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyietc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyie9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyifNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyifdc8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyid9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3nCcPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RFyiftc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyigNc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyigdc8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyigtc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyig9c8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyihNc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RFyihdc8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RFyif9c8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3npgPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_RF8TcNc8EeaIfIDhMwu8rA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RF8Tctc8EeaIfIDhMwu8rA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8Tc9c8EeaIfIDhMwu8rA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8TdNc8EeaIfIDhMwu8rA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8Tddc8EeaIfIDhMwu8rA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8Tdtc8EeaIfIDhMwu8rA" key="Date" value="2016-04-01"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RF8Td9c8EeaIfIDhMwu8rA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RF8Tcdc8EeaIfIDhMwu8rA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_o3oQkPgMEeWiHvr2EcCZeg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="platform:/plugin/org.eclipse.papyrus.uml.dynamic.profile.tests/resources/DynamicSysMLProfileTests.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Requirements:Requirement xmi:id="_Sf5wANc8EeaIfIDhMwu8rA" base_Class="_4P-YwNmjEeKw9PDRLmC3Lg"/>
+  <Requirements:Requirement xmi:id="_TONngNc8EeaIfIDhMwu8rA" base_Class="_E0dssNmnEeKw9PDRLmC3Lg"/>
+  <Requirements:Requirement xmi:id="_T1fC4Nc8EeaIfIDhMwu8rA" base_Class="_EKEE0NmnEeKw9PDRLmC3Lg"/>
+  <Requirements:Requirement xmi:id="_UgLlsNc8EeaIfIDhMwu8rA" base_Class="_DY0OENmnEeKw9PDRLmC3Lg"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.di
index 782b2d1741f..0a8be98fb98 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.di
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList/>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="papyrus.welcome:dynamic#/"/>

-        </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/>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="papyrus.welcome:dynamic#/"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.notation
@@ -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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.uml
index 9bd7d004820..8007da3d640 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/resources/umlmodel.uml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Qv2HpNjoEeKw9PDRLmC3Lg" name="Model">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_Qv2HpdjoEeKw9PDRLmC3Lg">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Qv2HpNjoEeKw9PDRLmC3Lg" name="Model">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_Qv2HpdjoEeKw9PDRLmC3Lg">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/Activator.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/Activator.java
index ef6f2635a4b..adb81276bcf 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/Activator.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/Activator.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests;

-

-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.uml.nattable.stereotyped.elements.tests"; //$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)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static 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.uml.nattable.stereotyped.elements.tests;
+
+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.uml.nattable.stereotyped.elements.tests"; //$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)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/manager/axis/AllocateAxisManager.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/manager/axis/AllocateAxisManager.java
index 6c52bd0efc3..a208bfc0a1f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/manager/axis/AllocateAxisManager.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/manager/axis/AllocateAxisManager.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * 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.uml.nattable.stereotyped.elements.tests.manager.axis;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.impl.DynamicEObjectImpl;

-import org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * Axis Manager for dynamic Allocate.

- */

-public class AllocateAxisManager extends AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager<DynamicEObjectImpl> {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)

-	 */

-	@Override

-	public boolean canCreateAxisElement(final String elementId) {

-		return UMLElementTypes.ABSTRACTION.getId().equals(elementId);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isInstanceOfRequiredStereotypeApplication(java.lang.Object)

-	 */

-	@Override

-	protected boolean isInstanceOfRequiredStereotypeApplication(final Object object) {

-		return object instanceof DynamicEObjectImpl && ((DynamicEObjectImpl) object).eClass().getName().equals("Allocate"); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplication(org.eclipse.uml2.uml.Element)

-	 */

-	@Override

-	protected DynamicEObjectImpl getStereotypeApplication(final Element el) {

-		for (EObject stereotypeApplication : el.getStereotypeApplications()) {

-

-			if (stereotypeApplication instanceof DynamicEObjectImpl && ((DynamicEObjectImpl) stereotypeApplication).eClass().getName().equals("Allocate")) { //$NON-NLS-1$

-				return (DynamicEObjectImpl) stereotypeApplication;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplicationBasePropertyName()

-	 */

-	@Override

-	protected String getStereotypeApplicationBasePropertyName() {

-		return "base_Class"; //$NON-NLS-1$

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isAllowedAsBaseElement(org.eclipse.uml2.uml.Element)

-	 */

-	@Override

-	protected boolean isAllowedAsBaseElement(final Element element) {

-		return element instanceof Abstraction;

-	}

-

-

-}

+/*****************************************************************************
+ * 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.uml.nattable.stereotyped.elements.tests.manager.axis;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.DynamicEObjectImpl;
+import org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.uml2.uml.Abstraction;
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * Axis Manager for dynamic Allocate.
+ */
+public class AllocateAxisManager extends AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager<DynamicEObjectImpl> {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)
+	 */
+	@Override
+	public boolean canCreateAxisElement(final String elementId) {
+		return UMLElementTypes.ABSTRACTION.getId().equals(elementId);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isInstanceOfRequiredStereotypeApplication(java.lang.Object)
+	 */
+	@Override
+	protected boolean isInstanceOfRequiredStereotypeApplication(final Object object) {
+		return object instanceof DynamicEObjectImpl && ((DynamicEObjectImpl) object).eClass().getName().equals("Allocate"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplication(org.eclipse.uml2.uml.Element)
+	 */
+	@Override
+	protected DynamicEObjectImpl getStereotypeApplication(final Element el) {
+		for (EObject stereotypeApplication : el.getStereotypeApplications()) {
+
+			if (stereotypeApplication instanceof DynamicEObjectImpl && ((DynamicEObjectImpl) stereotypeApplication).eClass().getName().equals("Allocate")) { //$NON-NLS-1$
+				return (DynamicEObjectImpl) stereotypeApplication;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplicationBasePropertyName()
+	 */
+	@Override
+	protected String getStereotypeApplicationBasePropertyName() {
+		return "base_Class"; //$NON-NLS-1$
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isAllowedAsBaseElement(org.eclipse.uml2.uml.Element)
+	 */
+	@Override
+	protected boolean isAllowedAsBaseElement(final Element element) {
+		return element instanceof Abstraction;
+	}
+
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/manager/axis/RequirementAxisManager.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/manager/axis/RequirementAxisManager.java
index a76b1058638..198ef61b1d6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/manager/axis/RequirementAxisManager.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/manager/axis/RequirementAxisManager.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * 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.uml.nattable.stereotyped.elements.tests.manager.axis;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.impl.DynamicEObjectImpl;

-import org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * AxisManager for dynamic Requirements.

- */

-public class RequirementAxisManager extends AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager<DynamicEObjectImpl> {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)

-	 */

-	@Override

-	public boolean canCreateAxisElement(final String elementId) {

-		return UMLElementTypes.CLASS.getId().equals(elementId);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplication(org.eclipse.uml2.uml.Element)

-	 */

-	@Override

-	protected DynamicEObjectImpl getStereotypeApplication(final Element el) {

-		for (EObject stereotypeApplication : el.getStereotypeApplications()) {

-

-			if (stereotypeApplication instanceof DynamicEObjectImpl && ((DynamicEObjectImpl) stereotypeApplication).eClass().getName().equals("Requirement")) { //$NON-NLS-1$

-				return (DynamicEObjectImpl) stereotypeApplication;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isInstanceOfRequiredStereotypeApplication(java.lang.Object)

-	 */

-	@Override

-	protected boolean isInstanceOfRequiredStereotypeApplication(final Object object) {

-		return object instanceof DynamicEObjectImpl && ((DynamicEObjectImpl) object).eClass().getName().equals("Requirement"); //$NON-NLS-1$

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isAllowedAsBaseElement(org.eclipse.uml2.uml.Element)

-	 */

-	@Override

-	protected boolean isAllowedAsBaseElement(final Element element) {

-		return element instanceof Class;

-	}

-

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplicationBasePropertyName()

-	 */

-	@Override

-	protected String getStereotypeApplicationBasePropertyName() {

-		return "base_Class"; //$NON-NLS-1$

-	}

-

-}

+/*****************************************************************************
+ * 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.uml.nattable.stereotyped.elements.tests.manager.axis;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.DynamicEObjectImpl;
+import org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * AxisManager for dynamic Requirements.
+ */
+public class RequirementAxisManager extends AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager<DynamicEObjectImpl> {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)
+	 */
+	@Override
+	public boolean canCreateAxisElement(final String elementId) {
+		return UMLElementTypes.CLASS.getId().equals(elementId);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplication(org.eclipse.uml2.uml.Element)
+	 */
+	@Override
+	protected DynamicEObjectImpl getStereotypeApplication(final Element el) {
+		for (EObject stereotypeApplication : el.getStereotypeApplications()) {
+
+			if (stereotypeApplication instanceof DynamicEObjectImpl && ((DynamicEObjectImpl) stereotypeApplication).eClass().getName().equals("Requirement")) { //$NON-NLS-1$
+				return (DynamicEObjectImpl) stereotypeApplication;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isInstanceOfRequiredStereotypeApplication(java.lang.Object)
+	 */
+	@Override
+	protected boolean isInstanceOfRequiredStereotypeApplication(final Object object) {
+		return object instanceof DynamicEObjectImpl && ((DynamicEObjectImpl) object).eClass().getName().equals("Requirement"); //$NON-NLS-1$
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isAllowedAsBaseElement(org.eclipse.uml2.uml.Element)
+	 */
+	@Override
+	protected boolean isAllowedAsBaseElement(final Element element) {
+		return element instanceof Class;
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplicationBasePropertyName()
+	 */
+	@Override
+	protected String getStereotypeApplicationBasePropertyName() {
+		return "base_Class"; //$NON-NLS-1$
+	}
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/overwrite/PasteEmptyOverwriteAxisIdentifierNotExisting_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/overwrite/PasteEmptyOverwriteAxisIdentifierNotExisting_Test.java
index b367acb5406..2d9ffc32bde 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/overwrite/PasteEmptyOverwriteAxisIdentifierNotExisting_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/overwrite/PasteEmptyOverwriteAxisIdentifierNotExisting_Test.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests.paste.overwrite;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.MultiStatus;

-import org.eclipse.nebula.widgets.nattable.selection.command.SelectRowsCommand;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.junit.Assert;

-

-/**

- * Test pastes overwrite all of selection with hidden categories.

- */

-public class PasteEmptyOverwriteAxisIdentifierNotExisting_Test extends AbstractPasteEmptyOverwriteTest {

-

-	/**

-	 * Constructor.

-	 */

-	public PasteEmptyOverwriteAxisIdentifierNotExisting_Test() {

-		super();

-	}

-

-	/**

-	 * Manage the selection with the shift key.

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.overwrite.AbstractPasteOverwriteTest#manageSelection(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)

-	 */

-	@Override

-	public void manageSelection(final NattableModelManager manager) throws Exception {

-		super.manageSelection(manager);

-		manager.getBodyLayerStack().getSelectionLayer().doCommand(new SelectRowsCommand(manager.getBodyLayerStack().getSelectionLayer(), 0, 2, true, false));

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.overwrite.AbstractPasteOverwriteTest#checkReturned_Status(org.eclipse.core.runtime.IStatus)

-	 */

-	@Override

-	protected void checkReturned_Status(final IStatus status) {

-		Assert.assertEquals("Error must be caught", IStatus.ERROR, status.getSeverity()); //$NON-NLS-1$

-		Assert.assertEquals("Error message is not the expected message", Messages.AbstractPasteInSelectionNattableCommandProvider_ThePasteHasNotBeenDoneBecauseOfSomeProblems, status.getMessage()); //$NON-NLS-1$

-		Assert.assertTrue("Status must be a multi-status", status instanceof MultiStatus); //$NON-NLS-1$

-		Assert.assertEquals("Error message is not the expected message", Messages.AbstractPasteInSelectionNattableCommandProvider_TheAxisUsedAsIdentifierNotAvailable, ((MultiStatus)status).getChildren()[0].getMessage()); //$NON-NLS-1$

-	}

-}

+/*****************************************************************************
+ * 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests.paste.overwrite;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.nebula.widgets.nattable.selection.command.SelectRowsCommand;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.junit.Assert;
+
+/**
+ * Test pastes overwrite all of selection with hidden categories.
+ */
+public class PasteEmptyOverwriteAxisIdentifierNotExisting_Test extends AbstractPasteEmptyOverwriteTest {
+
+	/**
+	 * Constructor.
+	 */
+	public PasteEmptyOverwriteAxisIdentifierNotExisting_Test() {
+		super();
+	}
+
+	/**
+	 * Manage the selection with the shift key.
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.overwrite.AbstractPasteOverwriteTest#manageSelection(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+	 */
+	@Override
+	public void manageSelection(final NattableModelManager manager) throws Exception {
+		super.manageSelection(manager);
+		manager.getBodyLayerStack().getSelectionLayer().doCommand(new SelectRowsCommand(manager.getBodyLayerStack().getSelectionLayer(), 0, 2, true, false));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.overwrite.AbstractPasteOverwriteTest#checkReturned_Status(org.eclipse.core.runtime.IStatus)
+	 */
+	@Override
+	protected void checkReturned_Status(final IStatus status) {
+		Assert.assertEquals("Error must be caught", IStatus.ERROR, status.getSeverity()); //$NON-NLS-1$
+		Assert.assertEquals("Error message is not the expected message", Messages.AbstractPasteInSelectionNattableCommandProvider_ThePasteHasNotBeenDoneBecauseOfSomeProblems, status.getMessage()); //$NON-NLS-1$
+		Assert.assertTrue("Status must be a multi-status", status instanceof MultiStatus); //$NON-NLS-1$
+		Assert.assertEquals("Error message is not the expected message", Messages.AbstractPasteInSelectionNattableCommandProvider_TheAxisUsedAsIdentifierNotAvailable, ((MultiStatus)status).getChildren()[0].getMessage()); //$NON-NLS-1$
+	}
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.java
index 39c8aaf0838..79072e9bd75 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/overwrite/PasteRowsOverwriteAxisIdentifierNotExisting_Test.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests.paste.overwrite;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.MultiStatus;

-import org.eclipse.nebula.widgets.nattable.selection.command.SelectRowsCommand;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.junit.Assert;

-

-/**

- * Test pastes overwrite all of selection with hidden categories.

- */

-public class PasteRowsOverwriteAxisIdentifierNotExisting_Test extends AbstractPasteRowsOverwriteTest {

-

-	/**

-	 * Constructor.

-	 */

-	public PasteRowsOverwriteAxisIdentifierNotExisting_Test() {

-		super();

-	}

-

-	/**

-	 * Manage the selection with the shift key.

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.overwrite.AbstractPasteOverwriteTest#manageSelection(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)

-	 */

-	@Override

-	public void manageSelection(final NattableModelManager manager) throws Exception {

-		super.manageSelection(manager);

-		manager.getBodyLayerStack().getSelectionLayer().doCommand(new SelectRowsCommand(manager.getBodyLayerStack().getSelectionLayer(), 0, 2, true, false));

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.overwrite.AbstractPasteOverwriteTest#checkReturned_Status(org.eclipse.core.runtime.IStatus)

-	 */

-	@Override

-	protected void checkReturned_Status(final IStatus status) {

-		Assert.assertEquals("Error must be caught", IStatus.ERROR, status.getSeverity()); //$NON-NLS-1$

-		Assert.assertEquals("Error message is not the expected message", Messages.AbstractPasteInSelectionNattableCommandProvider_ThePasteHasNotBeenDoneBecauseOfSomeProblems, status.getMessage()); //$NON-NLS-1$

-		Assert.assertTrue("Status must be a multi-status", status instanceof MultiStatus); //$NON-NLS-1$

-		Assert.assertEquals("Error message is not the expected message", Messages.AbstractPasteInSelectionNattableCommandProvider_TheAxisUsedAsIdentifierNotAvailable, ((MultiStatus)status).getChildren()[0].getMessage()); //$NON-NLS-1$

-	}

-}

+/*****************************************************************************
+ * 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests.paste.overwrite;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.nebula.widgets.nattable.selection.command.SelectRowsCommand;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.junit.Assert;
+
+/**
+ * Test pastes overwrite all of selection with hidden categories.
+ */
+public class PasteRowsOverwriteAxisIdentifierNotExisting_Test extends AbstractPasteRowsOverwriteTest {
+
+	/**
+	 * Constructor.
+	 */
+	public PasteRowsOverwriteAxisIdentifierNotExisting_Test() {
+		super();
+	}
+
+	/**
+	 * Manage the selection with the shift key.
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.overwrite.AbstractPasteOverwriteTest#manageSelection(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+	 */
+	@Override
+	public void manageSelection(final NattableModelManager manager) throws Exception {
+		super.manageSelection(manager);
+		manager.getBodyLayerStack().getSelectionLayer().doCommand(new SelectRowsCommand(manager.getBodyLayerStack().getSelectionLayer(), 0, 2, true, false));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.overwrite.AbstractPasteOverwriteTest#checkReturned_Status(org.eclipse.core.runtime.IStatus)
+	 */
+	@Override
+	protected void checkReturned_Status(final IStatus status) {
+		Assert.assertEquals("Error must be caught", IStatus.ERROR, status.getSeverity()); //$NON-NLS-1$
+		Assert.assertEquals("Error message is not the expected message", Messages.AbstractPasteInSelectionNattableCommandProvider_ThePasteHasNotBeenDoneBecauseOfSomeProblems, status.getMessage()); //$NON-NLS-1$
+		Assert.assertTrue("Status must be a multi-status", status instanceof MultiStatus); //$NON-NLS-1$
+		Assert.assertEquals("Error message is not the expected message", Messages.AbstractPasteInSelectionNattableCommandProvider_TheAxisUsedAsIdentifierNotAvailable, ((MultiStatus)status).getChildren()[0].getMessage()); //$NON-NLS-1$
+	}
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/without/service/edit/AbstractOpenTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/without/service/edit/AbstractOpenTableTest.java
index 84595243156..b9206b08b72 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/without/service/edit/AbstractOpenTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/paste/without/service/edit/AbstractOpenTableTest.java
@@ -1,92 +1,92 @@
-/*****************************************************************************

- * 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.uml.nattable.stereotyped.elements.tests.paste.without.service.edit;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.papyrus.commands.OpenDiagramCommand;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.editor.integration.tests.tests.AbstractEditorIntegrationTest;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.menu.MenuUtils;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.junit.utils.GenericUtils;

-import org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests.Activator;

-import org.eclipse.ui.IEditorPart;

-import org.junit.AfterClass;

-import org.junit.Assert;

-import org.osgi.framework.Bundle;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractOpenTableTest extends AbstractEditorIntegrationTest {

-

-	/**

-	 * This test allows to be sure that we doesn't break existing table model

-	 *

-	 * @throws Exception

-	 */

-

-	public void testOpenExistingTable(String projectName, String modelName) throws Exception {

-		//		initModel(projectName, modelName, getBundle()); //$NON-NLS-1$ //$NON-NLS-2$

-

-//		Assert.assertEquals(1, pageManager.allPages().size());

-		IEditorPart tableEditor = editor.getActiveEditor();

-		Assert.assertNull(tableEditor);

-		Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();

-		Table table = (Table) notationResource.getContents().get(0);

-		TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);

-		editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, table)));

-		// to refresh the table content

-		// while(!Display.getDefault().isDisposed() && Display.getDefault().readAndDispatch());

-		tableEditor = editor.getActiveEditor();

-		Assert.assertTrue(tableEditor instanceof NatTableEditor);

-		INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);

-		Assert.assertNotNull(manager);

-		Assert.assertEquals("PapyrusDynamicRequirementTable", manager.getTable().getTableConfiguration().getType());

-

-		MenuUtils.registerNatTableWidgetInEclipseContext(manager, new LabelStack(GridRegion.BODY));

-	}

-

-

-	protected Table getTable() throws ServiceException {

-		Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();

-		Table table = (Table) notationResource.getContents().get(0);

-		return table;

-	}

-

-	@Override

-	protected String getSourcePath() {

-		return "/resources/"; //$NON-NLS-1$

-	}

-

-	@Override

-	protected Bundle getBundle() {

-		return Activator.getDefault().getBundle();

-	}

-

-	@AfterClass

-	public static void endOfTest() {

-		GenericUtils.closeAllEditors();

-	}

-

-}

+/*****************************************************************************
+ * 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.uml.nattable.stereotyped.elements.tests.paste.without.service.edit;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.editor.integration.tests.tests.AbstractEditorIntegrationTest;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.menu.MenuUtils;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests.Activator;
+import org.eclipse.ui.IEditorPart;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractOpenTableTest extends AbstractEditorIntegrationTest {
+
+	/**
+	 * This test allows to be sure that we doesn't break existing table model
+	 *
+	 * @throws Exception
+	 */
+
+	public void testOpenExistingTable(String projectName, String modelName) throws Exception {
+		//		initModel(projectName, modelName, getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+
+//		Assert.assertEquals(1, pageManager.allPages().size());
+		IEditorPart tableEditor = editor.getActiveEditor();
+		Assert.assertNull(tableEditor);
+		Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
+		Table table = (Table) notationResource.getContents().get(0);
+		TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+		editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, table)));
+		// to refresh the table content
+		// while(!Display.getDefault().isDisposed() && Display.getDefault().readAndDispatch());
+		tableEditor = editor.getActiveEditor();
+		Assert.assertTrue(tableEditor instanceof NatTableEditor);
+		INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);
+		Assert.assertNotNull(manager);
+		Assert.assertEquals("PapyrusDynamicRequirementTable", manager.getTable().getTableConfiguration().getType());
+
+		MenuUtils.registerNatTableWidgetInEclipseContext(manager, new LabelStack(GridRegion.BODY));
+	}
+
+
+	protected Table getTable() throws ServiceException {
+		Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
+		Table table = (Table) notationResource.getContents().get(0);
+		return table;
+	}
+
+	@Override
+	protected String getSourcePath() {
+		return "/resources/"; //$NON-NLS-1$
+	}
+
+	@Override
+	protected Bundle getBundle() {
+		return Activator.getDefault().getBundle();
+	}
+
+	@AfterClass
+	public static void endOfTest() {
+		GenericUtils.closeAllEditors();
+	}
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/tests/OpenTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/tests/OpenTableTest.java
index 1681fb2ce10..25139530f79 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/tests/OpenTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/src/org/eclipse/papyrus/uml/nattable/stereotyped/elements/tests/tests/OpenTableTest.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * 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.uml.nattable.stereotyped.elements.tests.tests;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.commands.OpenDiagramCommand;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.GenericUtils;

-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.eclipse.ui.IEditorPart;

-import org.junit.AfterClass;

-import org.junit.Assert;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * This allows to test the table opening

- */

-@PluginResource("/resources/openTest.di")

-public class OpenTableTest extends AbstractPapyrusTest {

-	

-	/**

-	 * The papyrus fixture.

-	 */

-	@Rule

-	public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();

-

-	/**

-	 * This test allows to be sure that we doesn't break existing table model

-	 * 

-	 * @throws Exception The caught exception.

-	 */

-	@Test

-	public void testOpenExistingTable() throws Exception {

-		IPageManager pageManager = fixture.getServiceRegistry().getService(IPageManager.class);

-		Assert.assertEquals(2, pageManager.allPages().size());

-		fixture.flushDisplayEvents();

-		Resource notationResource = NotationUtils.getNotationModel(fixture.getServiceRegistry().getService(ModelSet.class)).getResource();

-		Table requirementTable = (Table)notationResource.getContents().get(0);

-		TransactionalEditingDomain editingDomain = fixture.getServiceRegistry().getService(TransactionalEditingDomain.class);

-		editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, requirementTable)));

-		IEditorPart tableEditor = fixture.getActiveTableEditor();

-		Assert.assertTrue(tableEditor instanceof NatTableEditor);

-		INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);

-		Assert.assertNotNull(manager);

-		Assert.assertEquals(AllTests.REQUIREMENT_TABLE_ID, manager.getTable().getTableConfiguration().getType());

-	}

-

-	/**

-	 * End of the test.

-	 */

-	@AfterClass

-	public static void endOfTest() {

-		GenericUtils.closeAllEditors();

-	}

-}

+/*****************************************************************************
+ * 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.uml.nattable.stereotyped.elements.tests.tests;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.ui.IEditorPart;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * This allows to test the table opening
+ */
+@PluginResource("/resources/openTest.di")
+public class OpenTableTest extends AbstractPapyrusTest {
+	
+	/**
+	 * The papyrus fixture.
+	 */
+	@Rule
+	public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
+
+	/**
+	 * This test allows to be sure that we doesn't break existing table model
+	 * 
+	 * @throws Exception The caught exception.
+	 */
+	@Test
+	public void testOpenExistingTable() throws Exception {
+		IPageManager pageManager = fixture.getServiceRegistry().getService(IPageManager.class);
+		Assert.assertEquals(2, pageManager.allPages().size());
+		fixture.flushDisplayEvents();
+		Resource notationResource = NotationUtils.getNotationModel(fixture.getServiceRegistry().getService(ModelSet.class)).getResource();
+		Table requirementTable = (Table)notationResource.getContents().get(0);
+		TransactionalEditingDomain editingDomain = fixture.getServiceRegistry().getService(TransactionalEditingDomain.class);
+		editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, requirementTable)));
+		IEditorPart tableEditor = fixture.getActiveTableEditor();
+		Assert.assertTrue(tableEditor instanceof NatTableEditor);
+		INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
+		Assert.assertNotNull(manager);
+		Assert.assertEquals(AllTests.REQUIREMENT_TABLE_ID, manager.getTable().getTableConfiguration().getType());
+	}
+
+	/**
+	 * End of the test.
+	 */
+	@AfterClass
+	public static void endOfTest() {
+		GenericUtils.closeAllEditors();
+	}
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF
index 3d990c80430..56adee992c4 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.nattable.suite.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.suite.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.nattable.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.nattable.stereotype.display.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.nattable.matrix.tests;bundle-version="1.0.0"

+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 0.0.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.nattable.suite.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.suite.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.nattable.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.stereotype.display.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.matrix.tests;bundle-version="1.0.0"
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.classpath b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.classpath
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.project b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.project
index 641d28b5d52..79005e1bd55 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.project
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/OSGI-INF/l10n/bundle.properties
index 6e32c0d0226..974ac853f77 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.uml.nattable.tests

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.uml.nattable.tests
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = UML Table Tests
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/UMLNattableAllTests.launch b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/UMLNattableAllTests.launch
index 65fc64875a6..896945f6702 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/UMLNattableAllTests.launch
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/UMLNattableAllTests.launch
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<listAttribute key="classFilters">

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.infra.emf.*)"/>

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.uml.tools.*)"/>

-<listEntry value="ClassFilter(include, *.tests.*)"/>

-</listAttribute>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.tests.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.nattable.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms120m -Xmx512m "/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<listAttribute key="classFilters">
+<listEntry value="ClassFilter(include, org.eclipse.papyrus.infra.emf.*)"/>
+<listEntry value="ClassFilter(include, org.eclipse.papyrus.uml.tools.*)"/>
+<listEntry value="ClassFilter(include, *.tests.*)"/>
+</listAttribute>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.tests.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.nattable.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms120m -Xmx512m "/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/build.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/build.properties
index 0a66ecb90f8..ce3d30c4711 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/build.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               resources/,\

-               OSGI-INF/,\

-               about.html,\

-               UMLNattableAllTests.launch

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               resources/,\
+               OSGI-INF/,\
+               about.html,\
+               UMLNattableAllTests.launch
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.di
index 08128862c28..8c549eecdc6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.notation
@@ -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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.di
index 4f26340f8e6..247ed5e3570 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.uml.architecture.Profile"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.uml.architecture.Profile"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.notation
@@ -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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.uml
index 0172d20c933..8f936e514f8 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.profile.uml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_QxR48J-YEeeKcbwPMn2SnA" name="ProfileRootElement">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XnZcMJ-YEeeKcbwPMn2SnA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_XnaDQJ-YEeeKcbwPMn2SnA" name="ProfileRootElement" nsURI="http:///schemas/ProfileRootElement/_XnYOEJ-YEeeKcbwPMn2SnA/0" nsPrefix="ProfileRootElement">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xnb4cJ-YEeeKcbwPMn2SnA" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4cZ-YEeeKcbwPMn2SnA" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4cp-YEeeKcbwPMn2SnA" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4c5-YEeeKcbwPMn2SnA" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4dJ-YEeeKcbwPMn2SnA" key="Date" value="2017-09-22"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4dZ-YEeeKcbwPMn2SnA" key="Author" value=""/>

-      </eAnnotations>

-    </contents>

-  </eAnnotations>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_Q6_1oJ-YEeeKcbwPMn2SnA">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_Q7CR4J-YEeeKcbwPMn2SnA">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

-  </packageImport>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_QxR48J-YEeeKcbwPMn2SnA" name="ProfileRootElement">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XnZcMJ-YEeeKcbwPMn2SnA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_XnaDQJ-YEeeKcbwPMn2SnA" name="ProfileRootElement" nsURI="http:///schemas/ProfileRootElement/_XnYOEJ-YEeeKcbwPMn2SnA/0" nsPrefix="ProfileRootElement">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xnb4cJ-YEeeKcbwPMn2SnA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4cZ-YEeeKcbwPMn2SnA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4cp-YEeeKcbwPMn2SnA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4c5-YEeeKcbwPMn2SnA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4dJ-YEeeKcbwPMn2SnA" key="Date" value="2017-09-22"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xnb4dZ-YEeeKcbwPMn2SnA" key="Author" value=""/>
+      </eAnnotations>
+    </contents>
+  </eAnnotations>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_Q6_1oJ-YEeeKcbwPMn2SnA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_Q7CR4J-YEeeKcbwPMn2SnA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.uml
index 978b23815c8..b12f849480f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/UMLTableUtils/model.uml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_aakHYJ-YEeeKcbwPMn2SnA" name="RootElement">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_afiuAJ-YEeeKcbwPMn2SnA">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_aakHYJ-YEeeKcbwPMn2SnA" name="RootElement">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_afiuAJ-YEeeKcbwPMn2SnA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/model.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/model.di
index 36843c17deb..ccb36144dab 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/model.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/model.di
@@ -1,41 +1,41 @@
-<?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="model.notation#_AgBAgNcsEeK-8MB5BVhuRg"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_DKEL8NcsEeK-8MB5BVhuRg"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_GEn4kNcsEeK-8MB5BVhuRg"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_PfwWQNcsEeK-8MB5BVhuRg"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_QQG1INcsEeK-8MB5BVhuRg"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_AgBAgNcsEeK-8MB5BVhuRg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="model.notation#_DKEL8NcsEeK-8MB5BVhuRg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="model.notation#_GEn4kNcsEeK-8MB5BVhuRg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="model.notation#_PfwWQNcsEeK-8MB5BVhuRg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="model.notation#_QQG1INcsEeK-8MB5BVhuRg"/>

-        </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="model.notation#_AgBAgNcsEeK-8MB5BVhuRg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="model.notation#_DKEL8NcsEeK-8MB5BVhuRg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="model.notation#_GEn4kNcsEeK-8MB5BVhuRg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="model.notation#_PfwWQNcsEeK-8MB5BVhuRg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="model.notation#_QQG1INcsEeK-8MB5BVhuRg"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_AgBAgNcsEeK-8MB5BVhuRg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="model.notation#_DKEL8NcsEeK-8MB5BVhuRg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="model.notation#_GEn4kNcsEeK-8MB5BVhuRg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="model.notation#_PfwWQNcsEeK-8MB5BVhuRg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="model.notation#_QQG1INcsEeK-8MB5BVhuRg"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.di
index bc909c6dda4..95ac56cf9ad 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="model.profile.notation#_LBlXYNgUEeKydel9b5SKTQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.profile.notation#_LBlXYNgUEeKydel9b5SKTQ"/>

-        </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="model.profile.notation#_LBlXYNgUEeKydel9b5SKTQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.profile.notation#_LBlXYNgUEeKydel9b5SKTQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.notation
index f91a2ce66ba..da85b00645a 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.notation
@@ -1,174 +1,174 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_LBlXYNgUEeKydel9b5SKTQ" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_QoBbcNgUEeKydel9b5SKTQ" type="1031" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QoJ-UNgUEeKydel9b5SKTQ" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoJ-UdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QoKlYNgUEeKydel9b5SKTQ" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoKlYdgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QoKlYtgUEeKydel9b5SKTQ" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoKlY9gUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QoQE8NgUEeKydel9b5SKTQ" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE8dgUEeKydel9b5SKTQ" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE8tgUEeKydel9b5SKTQ" key="StereotypeList" value="StandardProfileL2::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE89gUEeKydel9b5SKTQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE9NgUEeKydel9b5SKTQ" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE9dgUEeKydel9b5SKTQ" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_QoMakNgUEeKydel9b5SKTQ" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QoMakdgUEeKydel9b5SKTQ" x="650" y="146"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_R3AXENgUEeKydel9b5SKTQ" type="1030" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R3A-INgUEeKydel9b5SKTQ" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R3A-IdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R3BlMNgUEeKydel9b5SKTQ" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R3BlMdgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R3BlMtgUEeKydel9b5SKTQ" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R3BlM9gUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_R3BlNNgUEeKydel9b5SKTQ" type="1047"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_R3BlNdgUEeKydel9b5SKTQ" type="1042">

-      <children xmi:type="notation:Shape" xmi:id="_S6NggNgUEeKydel9b5SKTQ" type="1024" fontName="Segoe UI" lineColor="0">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_S6OHkNgUEeKydel9b5SKTQ" source="ShadowFigure">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_S6OHkdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_S6OHktgUEeKydel9b5SKTQ" source="displayNameLabelIcon">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_S6OHk9gUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_S6OuoNgUEeKydel9b5SKTQ" source="QualifiedName">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_S6OuodgUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_S6OuotgUEeKydel9b5SKTQ" type="1050"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_S6Ouo9gUEeKydel9b5SKTQ" type="1051">

-          <children xmi:type="notation:Shape" xmi:id="_U6MbQNgUEeKydel9b5SKTQ" type="1023" fontName="Segoe UI" lineColor="0">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U6MbQtgUEeKydel9b5SKTQ" source="ShadowFigure">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U6MbQ9gUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U6NCUNgUEeKydel9b5SKTQ" source="displayNameLabelIcon">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U6NCUdgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U6NCUtgUEeKydel9b5SKTQ" source="QualifiedName">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U6NCU9gUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>

-            </eAnnotations>

-            <children xmi:type="notation:DecorationNode" xmi:id="_U6NCVNgUEeKydel9b5SKTQ" type="1046"/>

-            <children xmi:type="notation:BasicCompartment" xmi:id="_U6OQcNgUEeKydel9b5SKTQ" type="1052">

-              <children xmi:type="notation:Shape" xmi:id="_WKlFENgUEeKydel9b5SKTQ" type="3002" fontName="Segoe UI" lineColor="0">

-                <element xmi:type="uml:Property" href="model.profile.uml#_WJsUQNgUEeKydel9b5SKTQ"/>

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_WKlFEdgUEeKydel9b5SKTQ"/>

-              </children>

-              <styles xmi:type="notation:TitleStyle" xmi:id="_U6OQcdgUEeKydel9b5SKTQ"/>

-              <styles xmi:type="notation:SortingStyle" xmi:id="_U6OQctgUEeKydel9b5SKTQ"/>

-              <styles xmi:type="notation:FilteringStyle" xmi:id="_U6OQc9gUEeKydel9b5SKTQ"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6OQdNgUEeKydel9b5SKTQ"/>

-            </children>

-            <children xmi:type="notation:BasicCompartment" xmi:id="_U6OQddgUEeKydel9b5SKTQ" visible="false" type="1053">

-              <styles xmi:type="notation:TitleStyle" xmi:id="_U6OQdtgUEeKydel9b5SKTQ"/>

-              <styles xmi:type="notation:SortingStyle" xmi:id="_U6OQd9gUEeKydel9b5SKTQ"/>

-              <styles xmi:type="notation:FilteringStyle" xmi:id="_U6OQeNgUEeKydel9b5SKTQ"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6OQedgUEeKydel9b5SKTQ"/>

-            </children>

-            <element xmi:type="uml:Stereotype" href="model.profile.uml#_U58joNgUEeKydel9b5SKTQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6MbQdgUEeKydel9b5SKTQ" x="49" y="38"/>

-          </children>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_S6OupNgUEeKydel9b5SKTQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S6OupdgUEeKydel9b5SKTQ"/>

-        </children>

-        <element xmi:type="uml:Profile" href="model.profile.uml#_S6AFINgUEeKydel9b5SKTQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S6NggdgUEeKydel9b5SKTQ" x="146" y="87" width="270" height="241"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_R3BlNtgUEeKydel9b5SKTQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R3BlN9gUEeKydel9b5SKTQ"/>

-    </children>

-    <element xmi:type="uml:Profile" href="model.profile.uml#_R2fZsNgUEeKydel9b5SKTQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R3AXEdgUEeKydel9b5SKTQ" x="130" y="295" width="641" height="466"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_Ztvp0NgUEeKydel9b5SKTQ" type="2007" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZtwQ4NgUEeKydel9b5SKTQ" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZtwQ4dgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ztw38NgUEeKydel9b5SKTQ" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ztw38dgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ztw38tgUEeKydel9b5SKTQ" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ztw389gUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Ztw39NgUEeKydel9b5SKTQ" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Ztw39dgUEeKydel9b5SKTQ" type="1005">

-      <children xmi:type="notation:Shape" xmi:id="_aXJzMNgUEeKydel9b5SKTQ" type="1024" fontName="Segoe UI" lineColor="0">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aXKaQNgUEeKydel9b5SKTQ" source="ShadowFigure">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXKaQdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aXKaQtgUEeKydel9b5SKTQ" source="displayNameLabelIcon">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXLBUNgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aXLBUdgUEeKydel9b5SKTQ" source="QualifiedName">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXLBUtgUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_aXLBU9gUEeKydel9b5SKTQ" type="1050"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_aXLBVNgUEeKydel9b5SKTQ" type="1051">

-          <children xmi:type="notation:Shape" xmi:id="_b88FQNgUEeKydel9b5SKTQ" type="1023" fontName="Segoe UI" lineColor="0">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b88sUNgUEeKydel9b5SKTQ" source="ShadowFigure">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b88sUdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b88sUtgUEeKydel9b5SKTQ" source="displayNameLabelIcon">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b88sU9gUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>

-            </eAnnotations>

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b88sVNgUEeKydel9b5SKTQ" source="QualifiedName">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b88sVdgUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>

-            </eAnnotations>

-            <children xmi:type="notation:DecorationNode" xmi:id="_b89TYNgUEeKydel9b5SKTQ" type="1046"/>

-            <children xmi:type="notation:BasicCompartment" xmi:id="_b89TYdgUEeKydel9b5SKTQ" type="1052">

-              <children xmi:type="notation:Shape" xmi:id="_dViP4NgUEeKydel9b5SKTQ" type="3002" fontName="Segoe UI" lineColor="0">

-                <element xmi:type="uml:Property" href="model.profile.uml#_dVX30NgUEeKydel9b5SKTQ"/>

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_dViP4dgUEeKydel9b5SKTQ"/>

-              </children>

-              <styles xmi:type="notation:TitleStyle" xmi:id="_b89TYtgUEeKydel9b5SKTQ"/>

-              <styles xmi:type="notation:SortingStyle" xmi:id="_b89TY9gUEeKydel9b5SKTQ"/>

-              <styles xmi:type="notation:FilteringStyle" xmi:id="_b89TZNgUEeKydel9b5SKTQ"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b89TZdgUEeKydel9b5SKTQ"/>

-            </children>

-            <children xmi:type="notation:BasicCompartment" xmi:id="_b89TZtgUEeKydel9b5SKTQ" visible="false" type="1053">

-              <styles xmi:type="notation:TitleStyle" xmi:id="_b89TZ9gUEeKydel9b5SKTQ"/>

-              <styles xmi:type="notation:SortingStyle" xmi:id="_b89TaNgUEeKydel9b5SKTQ"/>

-              <styles xmi:type="notation:FilteringStyle" xmi:id="_b89TadgUEeKydel9b5SKTQ"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b89TatgUEeKydel9b5SKTQ"/>

-            </children>

-            <element xmi:type="uml:Stereotype" href="model.profile.uml#_b8pKUNgUEeKydel9b5SKTQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b88FQdgUEeKydel9b5SKTQ" x="55" y="20"/>

-          </children>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_aXLBVdgUEeKydel9b5SKTQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aXLBVtgUEeKydel9b5SKTQ"/>

-        </children>

-        <element xmi:type="uml:Profile" href="model.profile.uml#_aW7wwNgUEeKydel9b5SKTQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aXJzMdgUEeKydel9b5SKTQ" x="150" y="101" width="416" height="283"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Ztw39tgUEeKydel9b5SKTQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ztw399gUEeKydel9b5SKTQ"/>

-    </children>

-    <element xmi:type="uml:Package" href="model.profile.uml#_ZtcH0NgUEeKydel9b5SKTQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ztvp0dgUEeKydel9b5SKTQ" x="1110" y="300" width="726" height="471"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_LBlXYdgUEeKydel9b5SKTQ"/>

-  <element xmi:type="uml:Profile" href="model.profile.uml#_LBTDgNgUEeKydel9b5SKTQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_gUFEoNgUEeKydel9b5SKTQ" type="1013" source="_U6MbQNgUEeKydel9b5SKTQ" target="_QoBbcNgUEeKydel9b5SKTQ" lineColor="0">

-    <styles xmi:type="notation:FontStyle" xmi:id="_gUFEodgUEeKydel9b5SKTQ" fontName="Segoe UI"/>

-    <element xmi:type="uml:Extension" href="model.profile.uml#_gTzX0NgUEeKydel9b5SKTQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gUFEotgUEeKydel9b5SKTQ" points="[14, -18, -263, 336]$[265, -355, -12, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gUiXoNgUEeKydel9b5SKTQ" id="(0.45871559633027525,0.18)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gUiXodgUEeKydel9b5SKTQ" id="(0.12,0.48)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_gzIYINgUEeKydel9b5SKTQ" type="4002" source="_b88FQNgUEeKydel9b5SKTQ" target="_U6MbQNgUEeKydel9b5SKTQ" lineColor="0">

-    <children xmi:type="notation:DecorationNode" xmi:id="_gzI_MNgUEeKydel9b5SKTQ" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_gzI_MdgUEeKydel9b5SKTQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_gzIYIdgUEeKydel9b5SKTQ" fontName="Segoe UI"/>

-    <element xmi:type="uml:Generalization" href="model.profile.uml#_gy4ggNgUEeKydel9b5SKTQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gzIYItgUEeKydel9b5SKTQ" points="[-54, 1, 903, -24]$[-935, 31, 22, 6]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gzY20NgUEeKydel9b5SKTQ" id="(0.7981651376146789,0.6)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_LBlXYNgUEeKydel9b5SKTQ" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_QoBbcNgUEeKydel9b5SKTQ" type="1031" fontName="Segoe UI" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QoJ-UNgUEeKydel9b5SKTQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoJ-UdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QoKlYNgUEeKydel9b5SKTQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoKlYdgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QoKlYtgUEeKydel9b5SKTQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoKlY9gUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QoQE8NgUEeKydel9b5SKTQ" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE8dgUEeKydel9b5SKTQ" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE8tgUEeKydel9b5SKTQ" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE89gUEeKydel9b5SKTQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE9NgUEeKydel9b5SKTQ" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QoQE9dgUEeKydel9b5SKTQ" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QoMakNgUEeKydel9b5SKTQ" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QoMakdgUEeKydel9b5SKTQ" x="650" y="146"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_R3AXENgUEeKydel9b5SKTQ" type="1030" fontName="Segoe UI" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R3A-INgUEeKydel9b5SKTQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R3A-IdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R3BlMNgUEeKydel9b5SKTQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R3BlMdgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R3BlMtgUEeKydel9b5SKTQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R3BlM9gUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_R3BlNNgUEeKydel9b5SKTQ" type="1047"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_R3BlNdgUEeKydel9b5SKTQ" type="1042">
+      <children xmi:type="notation:Shape" xmi:id="_S6NggNgUEeKydel9b5SKTQ" type="1024" fontName="Segoe UI" lineColor="0">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_S6OHkNgUEeKydel9b5SKTQ" source="ShadowFigure">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_S6OHkdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_S6OHktgUEeKydel9b5SKTQ" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_S6OHk9gUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_S6OuoNgUEeKydel9b5SKTQ" source="QualifiedName">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_S6OuodgUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_S6OuotgUEeKydel9b5SKTQ" type="1050"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_S6Ouo9gUEeKydel9b5SKTQ" type="1051">
+          <children xmi:type="notation:Shape" xmi:id="_U6MbQNgUEeKydel9b5SKTQ" type="1023" fontName="Segoe UI" lineColor="0">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U6MbQtgUEeKydel9b5SKTQ" source="ShadowFigure">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U6MbQ9gUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>
+            </eAnnotations>
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U6NCUNgUEeKydel9b5SKTQ" source="displayNameLabelIcon">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U6NCUdgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>
+            </eAnnotations>
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U6NCUtgUEeKydel9b5SKTQ" source="QualifiedName">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U6NCU9gUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>
+            </eAnnotations>
+            <children xmi:type="notation:DecorationNode" xmi:id="_U6NCVNgUEeKydel9b5SKTQ" type="1046"/>
+            <children xmi:type="notation:BasicCompartment" xmi:id="_U6OQcNgUEeKydel9b5SKTQ" type="1052">
+              <children xmi:type="notation:Shape" xmi:id="_WKlFENgUEeKydel9b5SKTQ" type="3002" fontName="Segoe UI" lineColor="0">
+                <element xmi:type="uml:Property" href="model.profile.uml#_WJsUQNgUEeKydel9b5SKTQ"/>
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_WKlFEdgUEeKydel9b5SKTQ"/>
+              </children>
+              <styles xmi:type="notation:TitleStyle" xmi:id="_U6OQcdgUEeKydel9b5SKTQ"/>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_U6OQctgUEeKydel9b5SKTQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_U6OQc9gUEeKydel9b5SKTQ"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6OQdNgUEeKydel9b5SKTQ"/>
+            </children>
+            <children xmi:type="notation:BasicCompartment" xmi:id="_U6OQddgUEeKydel9b5SKTQ" visible="false" type="1053">
+              <styles xmi:type="notation:TitleStyle" xmi:id="_U6OQdtgUEeKydel9b5SKTQ"/>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_U6OQd9gUEeKydel9b5SKTQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_U6OQeNgUEeKydel9b5SKTQ"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6OQedgUEeKydel9b5SKTQ"/>
+            </children>
+            <element xmi:type="uml:Stereotype" href="model.profile.uml#_U58joNgUEeKydel9b5SKTQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6MbQdgUEeKydel9b5SKTQ" x="49" y="38"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_S6OupNgUEeKydel9b5SKTQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S6OupdgUEeKydel9b5SKTQ"/>
+        </children>
+        <element xmi:type="uml:Profile" href="model.profile.uml#_S6AFINgUEeKydel9b5SKTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S6NggdgUEeKydel9b5SKTQ" x="146" y="87" width="270" height="241"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_R3BlNtgUEeKydel9b5SKTQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R3BlN9gUEeKydel9b5SKTQ"/>
+    </children>
+    <element xmi:type="uml:Profile" href="model.profile.uml#_R2fZsNgUEeKydel9b5SKTQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R3AXEdgUEeKydel9b5SKTQ" x="130" y="295" width="641" height="466"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Ztvp0NgUEeKydel9b5SKTQ" type="2007" fontName="Segoe UI" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZtwQ4NgUEeKydel9b5SKTQ" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZtwQ4dgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ztw38NgUEeKydel9b5SKTQ" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ztw38dgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ztw38tgUEeKydel9b5SKTQ" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ztw389gUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Ztw39NgUEeKydel9b5SKTQ" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Ztw39dgUEeKydel9b5SKTQ" type="1005">
+      <children xmi:type="notation:Shape" xmi:id="_aXJzMNgUEeKydel9b5SKTQ" type="1024" fontName="Segoe UI" lineColor="0">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aXKaQNgUEeKydel9b5SKTQ" source="ShadowFigure">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXKaQdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aXKaQtgUEeKydel9b5SKTQ" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXLBUNgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aXLBUdgUEeKydel9b5SKTQ" source="QualifiedName">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXLBUtgUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_aXLBU9gUEeKydel9b5SKTQ" type="1050"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_aXLBVNgUEeKydel9b5SKTQ" type="1051">
+          <children xmi:type="notation:Shape" xmi:id="_b88FQNgUEeKydel9b5SKTQ" type="1023" fontName="Segoe UI" lineColor="0">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b88sUNgUEeKydel9b5SKTQ" source="ShadowFigure">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b88sUdgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>
+            </eAnnotations>
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b88sUtgUEeKydel9b5SKTQ" source="displayNameLabelIcon">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b88sU9gUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>
+            </eAnnotations>
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b88sVNgUEeKydel9b5SKTQ" source="QualifiedName">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b88sVdgUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>
+            </eAnnotations>
+            <children xmi:type="notation:DecorationNode" xmi:id="_b89TYNgUEeKydel9b5SKTQ" type="1046"/>
+            <children xmi:type="notation:BasicCompartment" xmi:id="_b89TYdgUEeKydel9b5SKTQ" type="1052">
+              <children xmi:type="notation:Shape" xmi:id="_dViP4NgUEeKydel9b5SKTQ" type="3002" fontName="Segoe UI" lineColor="0">
+                <element xmi:type="uml:Property" href="model.profile.uml#_dVX30NgUEeKydel9b5SKTQ"/>
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_dViP4dgUEeKydel9b5SKTQ"/>
+              </children>
+              <styles xmi:type="notation:TitleStyle" xmi:id="_b89TYtgUEeKydel9b5SKTQ"/>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_b89TY9gUEeKydel9b5SKTQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_b89TZNgUEeKydel9b5SKTQ"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b89TZdgUEeKydel9b5SKTQ"/>
+            </children>
+            <children xmi:type="notation:BasicCompartment" xmi:id="_b89TZtgUEeKydel9b5SKTQ" visible="false" type="1053">
+              <styles xmi:type="notation:TitleStyle" xmi:id="_b89TZ9gUEeKydel9b5SKTQ"/>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_b89TaNgUEeKydel9b5SKTQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_b89TadgUEeKydel9b5SKTQ"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b89TatgUEeKydel9b5SKTQ"/>
+            </children>
+            <element xmi:type="uml:Stereotype" href="model.profile.uml#_b8pKUNgUEeKydel9b5SKTQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b88FQdgUEeKydel9b5SKTQ" x="55" y="20"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_aXLBVdgUEeKydel9b5SKTQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aXLBVtgUEeKydel9b5SKTQ"/>
+        </children>
+        <element xmi:type="uml:Profile" href="model.profile.uml#_aW7wwNgUEeKydel9b5SKTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aXJzMdgUEeKydel9b5SKTQ" x="150" y="101" width="416" height="283"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ztw39tgUEeKydel9b5SKTQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ztw399gUEeKydel9b5SKTQ"/>
+    </children>
+    <element xmi:type="uml:Package" href="model.profile.uml#_ZtcH0NgUEeKydel9b5SKTQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ztvp0dgUEeKydel9b5SKTQ" x="1110" y="300" width="726" height="471"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_LBlXYdgUEeKydel9b5SKTQ"/>
+  <element xmi:type="uml:Profile" href="model.profile.uml#_LBTDgNgUEeKydel9b5SKTQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_gUFEoNgUEeKydel9b5SKTQ" type="1013" source="_U6MbQNgUEeKydel9b5SKTQ" target="_QoBbcNgUEeKydel9b5SKTQ" lineColor="0">
+    <styles xmi:type="notation:FontStyle" xmi:id="_gUFEodgUEeKydel9b5SKTQ" fontName="Segoe UI"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_gTzX0NgUEeKydel9b5SKTQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gUFEotgUEeKydel9b5SKTQ" points="[14, -18, -263, 336]$[265, -355, -12, -1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gUiXoNgUEeKydel9b5SKTQ" id="(0.45871559633027525,0.18)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gUiXodgUEeKydel9b5SKTQ" id="(0.12,0.48)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_gzIYINgUEeKydel9b5SKTQ" type="4002" source="_b88FQNgUEeKydel9b5SKTQ" target="_U6MbQNgUEeKydel9b5SKTQ" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_gzI_MNgUEeKydel9b5SKTQ" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_gzI_MdgUEeKydel9b5SKTQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_gzIYIdgUEeKydel9b5SKTQ" fontName="Segoe UI"/>
+    <element xmi:type="uml:Generalization" href="model.profile.uml#_gy4ggNgUEeKydel9b5SKTQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gzIYItgUEeKydel9b5SKTQ" points="[-54, 1, 903, -24]$[-935, 31, 22, 6]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gzY20NgUEeKydel9b5SKTQ" id="(0.7981651376146789,0.6)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.uml
index dc545535d73..f236ce00fce 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/model.profile.uml
@@ -1,112 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_LBTDgNgUEeKydel9b5SKTQ" name="Profile" metaclassReference="_QnsEQNgUEeKydel9b5SKTQ" metamodelReference="_LBTDgdgUEeKydel9b5SKTQ">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hg42ANgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_hiG-ANgUEeKydel9b5SKTQ" name="Profile" nsURI="http:///schemas/Profile/_hg3n4NgUEeKydel9b5SKTQ/0" nsPrefix="Profile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hiG-AdgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_R2fZsNgUEeKydel9b5SKTQ"/>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjyZANgUEeKydel9b5SKTQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZAdgUEeKydel9b5SKTQ" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZAtgUEeKydel9b5SKTQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZA9gUEeKydel9b5SKTQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZBNgUEeKydel9b5SKTQ" key="Date" value="2013-06-18"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZBdgUEeKydel9b5SKTQ" key="Author" value=""/>

-      </eAnnotations>

-      <eSubpackages xmi:type="ecore:EPackage" xmi:id="_hiG-AtgUEeKydel9b5SKTQ" name="Package1" nsURI="http:///Profile/Package1.ecore" nsPrefix="Profile.Package1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hiG-A9gUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ZtcH0NgUEeKydel9b5SKTQ"/>

-      </eSubpackages>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_QnsEQNgUEeKydel9b5SKTQ" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_LBTDgdgUEeKydel9b5SKTQ">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

-  </packageImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_LBTDgtgUEeKydel9b5SKTQ">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Profile" xmi:id="_R2fZsNgUEeKydel9b5SKTQ" name="Profile1">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hiZ48dgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-      <contents xmi:type="ecore:EPackage" xmi:id="_hi_HwNgUEeKydel9b5SKTQ" name="Profile1" nsURI="http://Profile/schemas/Profile1/_hiZ48NgUEeKydel9b5SKTQ/0" nsPrefix="Profile1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hi_HwdgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_S6AFINgUEeKydel9b5SKTQ"/>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hj34kNgUEeKydel9b5SKTQ" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34kdgUEeKydel9b5SKTQ" key="Version" value="0.0.1"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34ktgUEeKydel9b5SKTQ" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34k9gUEeKydel9b5SKTQ" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34lNgUEeKydel9b5SKTQ" key="Date" value="2013-06-18"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34ldgUEeKydel9b5SKTQ" key="Author" value=""/>

-        </eAnnotations>

-      </contents>

-    </eAnnotations>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_S6AFINgUEeKydel9b5SKTQ" name="SubProfile2">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjHDkNgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <contents xmi:type="ecore:EPackage" xmi:id="_hjWUINgUEeKydel9b5SKTQ" name="SubProfile2" nsURI="http://Profile.Profile1/schemas/SubProfile2/_hjF1cNgUEeKydel9b5SKTQ/0" nsPrefix="SubProfile2">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hkHJINgUEeKydel9b5SKTQ" source="PapyrusVersion">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJIdgUEeKydel9b5SKTQ" key="Version" value="0.0.1"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJItgUEeKydel9b5SKTQ" key="Comment" value=""/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJI9gUEeKydel9b5SKTQ" key="Copyright" value=""/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJJNgUEeKydel9b5SKTQ" key="Date" value="2013-06-18"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJJdgUEeKydel9b5SKTQ" key="Author" value=""/>

-          </eAnnotations>

-          <eClassifiers xmi:type="ecore:EClass" xmi:id="_hjWUIdgUEeKydel9b5SKTQ" name="Stereotype2">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjWUItgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_U58joNgUEeKydel9b5SKTQ"/>

-            <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_hjWUI9gUEeKydel9b5SKTQ" name="prop2" ordered="false" lowerBound="1">

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-            </eStructuralFeatures>

-            <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_hjW7MNgUEeKydel9b5SKTQ" name="base_Class" ordered="false" lowerBound="1">

-              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-            </eStructuralFeatures>

-          </eClassifiers>

-        </contents>

-      </eAnnotations>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_U58joNgUEeKydel9b5SKTQ" name="Stereotype2">

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_WJsUQNgUEeKydel9b5SKTQ" name="prop2" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YxCxANgUEeKydel9b5SKTQ" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YxQMYNgUEeKydel9b5SKTQ" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_YxsRQNgUEeKydel9b5SKTQ">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_gTtRMNgUEeKydel9b5SKTQ" name="base_Class" association="_gTzX0NgUEeKydel9b5SKTQ">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_gTzX0NgUEeKydel9b5SKTQ" name="E_Stereotype2_Class1" memberEnd="_gTzX0dgUEeKydel9b5SKTQ _gTtRMNgUEeKydel9b5SKTQ">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_gTzX0dgUEeKydel9b5SKTQ" name="extension_Stereotype2" type="_U58joNgUEeKydel9b5SKTQ" aggregation="composite" association="_gTzX0NgUEeKydel9b5SKTQ"/>

-      </packagedElement>

-    </packagedElement>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_ZtcH0NgUEeKydel9b5SKTQ" name="Package1">

-    <packagedElement xmi:type="uml:Profile" xmi:id="_aW7wwNgUEeKydel9b5SKTQ" name="SubProfile1">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjcawdgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <contents xmi:type="ecore:EPackage" xmi:id="_hjrrUNgUEeKydel9b5SKTQ" name="SubProfile1" nsURI="http://Profile.Package1/schemas/SubProfile1/_hjcawNgUEeKydel9b5SKTQ/0" nsPrefix="SubProfile1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjrrUdgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_S6AFINgUEeKydel9b5SKTQ"/>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hkeVgNgUEeKydel9b5SKTQ" source="PapyrusVersion">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVgdgUEeKydel9b5SKTQ" key="Version" value="0.0.1"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVgtgUEeKydel9b5SKTQ" key="Comment" value=""/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVg9gUEeKydel9b5SKTQ" key="Copyright" value=""/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVhNgUEeKydel9b5SKTQ" key="Date" value="2013-06-18"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVhdgUEeKydel9b5SKTQ" key="Author" value=""/>

-          </eAnnotations>

-          <eClassifiers xmi:type="ecore:EClass" xmi:id="_hjrrUtgUEeKydel9b5SKTQ" name="Stereotype1" eSuperTypes="_hjWUIdgUEeKydel9b5SKTQ">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjrrU9gUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_b8pKUNgUEeKydel9b5SKTQ"/>

-            <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_hjrrVNgUEeKydel9b5SKTQ" name="prop1" ordered="false" lowerBound="1">

-              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-            </eStructuralFeatures>

-          </eClassifiers>

-        </contents>

-      </eAnnotations>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_b8pKUNgUEeKydel9b5SKTQ" name="Stereotype1">

-        <generalization xmi:type="uml:Generalization" xmi:id="_gy4ggNgUEeKydel9b5SKTQ" general="_U58joNgUEeKydel9b5SKTQ"/>

-        <ownedAttribute xmi:type="uml:Property" xmi:id="_dVX30NgUEeKydel9b5SKTQ" name="prop1" visibility="public">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fg238NgUEeKydel9b5SKTQ" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fhAB4NgUEeKydel9b5SKTQ" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_fhYcYNgUEeKydel9b5SKTQ">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-      </packagedElement>

-    </packagedElement>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_LBTDgNgUEeKydel9b5SKTQ" name="Profile" metaclassReference="_QnsEQNgUEeKydel9b5SKTQ" metamodelReference="_LBTDgdgUEeKydel9b5SKTQ">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hg42ANgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_hiG-ANgUEeKydel9b5SKTQ" name="Profile" nsURI="http:///schemas/Profile/_hg3n4NgUEeKydel9b5SKTQ/0" nsPrefix="Profile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hiG-AdgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_R2fZsNgUEeKydel9b5SKTQ"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjyZANgUEeKydel9b5SKTQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZAdgUEeKydel9b5SKTQ" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZAtgUEeKydel9b5SKTQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZA9gUEeKydel9b5SKTQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZBNgUEeKydel9b5SKTQ" key="Date" value="2013-06-18"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hjyZBdgUEeKydel9b5SKTQ" key="Author" value=""/>
+      </eAnnotations>
+      <eSubpackages xmi:type="ecore:EPackage" xmi:id="_hiG-AtgUEeKydel9b5SKTQ" name="Package1" nsURI="http:///Profile/Package1.ecore" nsPrefix="Profile.Package1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hiG-A9gUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ZtcH0NgUEeKydel9b5SKTQ"/>
+      </eSubpackages>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_QnsEQNgUEeKydel9b5SKTQ" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_LBTDgdgUEeKydel9b5SKTQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_LBTDgtgUEeKydel9b5SKTQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Profile" xmi:id="_R2fZsNgUEeKydel9b5SKTQ" name="Profile1">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hiZ48dgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <contents xmi:type="ecore:EPackage" xmi:id="_hi_HwNgUEeKydel9b5SKTQ" name="Profile1" nsURI="http://Profile/schemas/Profile1/_hiZ48NgUEeKydel9b5SKTQ/0" nsPrefix="Profile1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hi_HwdgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_S6AFINgUEeKydel9b5SKTQ"/>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hj34kNgUEeKydel9b5SKTQ" source="PapyrusVersion">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34kdgUEeKydel9b5SKTQ" key="Version" value="0.0.1"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34ktgUEeKydel9b5SKTQ" key="Comment" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34k9gUEeKydel9b5SKTQ" key="Copyright" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34lNgUEeKydel9b5SKTQ" key="Date" value="2013-06-18"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hj34ldgUEeKydel9b5SKTQ" key="Author" value=""/>
+        </eAnnotations>
+      </contents>
+    </eAnnotations>
+    <packagedElement xmi:type="uml:Profile" xmi:id="_S6AFINgUEeKydel9b5SKTQ" name="SubProfile2">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjHDkNgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <contents xmi:type="ecore:EPackage" xmi:id="_hjWUINgUEeKydel9b5SKTQ" name="SubProfile2" nsURI="http://Profile.Profile1/schemas/SubProfile2/_hjF1cNgUEeKydel9b5SKTQ/0" nsPrefix="SubProfile2">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hkHJINgUEeKydel9b5SKTQ" source="PapyrusVersion">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJIdgUEeKydel9b5SKTQ" key="Version" value="0.0.1"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJItgUEeKydel9b5SKTQ" key="Comment" value=""/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJI9gUEeKydel9b5SKTQ" key="Copyright" value=""/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJJNgUEeKydel9b5SKTQ" key="Date" value="2013-06-18"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkHJJdgUEeKydel9b5SKTQ" key="Author" value=""/>
+          </eAnnotations>
+          <eClassifiers xmi:type="ecore:EClass" xmi:id="_hjWUIdgUEeKydel9b5SKTQ" name="Stereotype2">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjWUItgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_U58joNgUEeKydel9b5SKTQ"/>
+            <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_hjWUI9gUEeKydel9b5SKTQ" name="prop2" ordered="false" lowerBound="1">
+              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+            </eStructuralFeatures>
+            <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_hjW7MNgUEeKydel9b5SKTQ" name="base_Class" ordered="false" lowerBound="1">
+              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+            </eStructuralFeatures>
+          </eClassifiers>
+        </contents>
+      </eAnnotations>
+      <packagedElement xmi:type="uml:Stereotype" xmi:id="_U58joNgUEeKydel9b5SKTQ" name="Stereotype2">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_WJsUQNgUEeKydel9b5SKTQ" name="prop2" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YxCxANgUEeKydel9b5SKTQ" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YxQMYNgUEeKydel9b5SKTQ" value="1"/>
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_YxsRQNgUEeKydel9b5SKTQ">
+            <value xsi:nil="true"/>
+          </defaultValue>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_gTtRMNgUEeKydel9b5SKTQ" name="base_Class" association="_gTzX0NgUEeKydel9b5SKTQ">
+          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Extension" xmi:id="_gTzX0NgUEeKydel9b5SKTQ" name="E_Stereotype2_Class1" memberEnd="_gTzX0dgUEeKydel9b5SKTQ _gTtRMNgUEeKydel9b5SKTQ">
+        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_gTzX0dgUEeKydel9b5SKTQ" name="extension_Stereotype2" type="_U58joNgUEeKydel9b5SKTQ" aggregation="composite" association="_gTzX0NgUEeKydel9b5SKTQ"/>
+      </packagedElement>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_ZtcH0NgUEeKydel9b5SKTQ" name="Package1">
+    <packagedElement xmi:type="uml:Profile" xmi:id="_aW7wwNgUEeKydel9b5SKTQ" name="SubProfile1">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjcawdgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <contents xmi:type="ecore:EPackage" xmi:id="_hjrrUNgUEeKydel9b5SKTQ" name="SubProfile1" nsURI="http://Profile.Package1/schemas/SubProfile1/_hjcawNgUEeKydel9b5SKTQ/0" nsPrefix="SubProfile1">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjrrUdgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_S6AFINgUEeKydel9b5SKTQ"/>
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hkeVgNgUEeKydel9b5SKTQ" source="PapyrusVersion">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVgdgUEeKydel9b5SKTQ" key="Version" value="0.0.1"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVgtgUEeKydel9b5SKTQ" key="Comment" value=""/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVg9gUEeKydel9b5SKTQ" key="Copyright" value=""/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVhNgUEeKydel9b5SKTQ" key="Date" value="2013-06-18"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hkeVhdgUEeKydel9b5SKTQ" key="Author" value=""/>
+          </eAnnotations>
+          <eClassifiers xmi:type="ecore:EClass" xmi:id="_hjrrUtgUEeKydel9b5SKTQ" name="Stereotype1" eSuperTypes="_hjWUIdgUEeKydel9b5SKTQ">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hjrrU9gUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_b8pKUNgUEeKydel9b5SKTQ"/>
+            <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_hjrrVNgUEeKydel9b5SKTQ" name="prop1" ordered="false" lowerBound="1">
+              <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+            </eStructuralFeatures>
+          </eClassifiers>
+        </contents>
+      </eAnnotations>
+      <packagedElement xmi:type="uml:Stereotype" xmi:id="_b8pKUNgUEeKydel9b5SKTQ" name="Stereotype1">
+        <generalization xmi:type="uml:Generalization" xmi:id="_gy4ggNgUEeKydel9b5SKTQ" general="_U58joNgUEeKydel9b5SKTQ"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_dVX30NgUEeKydel9b5SKTQ" name="prop1" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fg238NgUEeKydel9b5SKTQ" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fhAB4NgUEeKydel9b5SKTQ" value="1"/>
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_fhYcYNgUEeKydel9b5SKTQ">
+            <value xsi:nil="true"/>
+          </defaultValue>
+        </ownedAttribute>
+      </packagedElement>
+    </packagedElement>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.di
index 8f933fb5ff4..c21854c868f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.di
@@ -1,23 +1,23 @@
-<?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="modelTest.notation#_mdq5ENgUEeKydel9b5SKTQ"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="modelTest.notation#_y3q7oNgUEeKydel9b5SKTQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="modelTest.notation#_mdq5ENgUEeKydel9b5SKTQ"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="modelTest.notation#_y3q7oNgUEeKydel9b5SKTQ"/>

-        </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="modelTest.notation#_mdq5ENgUEeKydel9b5SKTQ"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="modelTest.notation#_y3q7oNgUEeKydel9b5SKTQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="modelTest.notation#_mdq5ENgUEeKydel9b5SKTQ"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="modelTest.notation#_y3q7oNgUEeKydel9b5SKTQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.notation
index 49b1890ef33..20db78143c9 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.notation
@@ -1,268 +1,268 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/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="_mdq5ENgUEeKydel9b5SKTQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_p7VSwNgUEeKydel9b5SKTQ" type="2008" fontName="Segoe UI" lineColor="0">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p7V50NgUEeKydel9b5SKTQ" source="ShadowFigure">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p7V50dgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p7V50tgUEeKydel9b5SKTQ" source="displayNameLabelIcon">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p7Wg4NgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p7Wg4dgUEeKydel9b5SKTQ" source="QualifiedName">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p7Wg4tgUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tew9QNgUEeKydel9b5SKTQ" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tew9QdgUEeKydel9b5SKTQ" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_texkUNgUEeKydel9b5SKTQ" key="StereotypeList" value="Profile::Package1::SubProfile1::Stereotype1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_texkUdgUEeKydel9b5SKTQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_texkUtgUEeKydel9b5SKTQ" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_texkU9gUEeKydel9b5SKTQ" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_p7Wg49gUEeKydel9b5SKTQ" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_p7Wg5NgUEeKydel9b5SKTQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_p7Wg5dgUEeKydel9b5SKTQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_p7Wg5tgUEeKydel9b5SKTQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_p7Wg59gUEeKydel9b5SKTQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p7Wg6NgUEeKydel9b5SKTQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_p7Wg6dgUEeKydel9b5SKTQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_p7Wg6tgUEeKydel9b5SKTQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_p7Wg69gUEeKydel9b5SKTQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_p7Wg7NgUEeKydel9b5SKTQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p7Wg7dgUEeKydel9b5SKTQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_p7Wg7tgUEeKydel9b5SKTQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_p7Wg79gUEeKydel9b5SKTQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_p7Wg8NgUEeKydel9b5SKTQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_p7Wg8dgUEeKydel9b5SKTQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p7Wg8tgUEeKydel9b5SKTQ"/>

-      </children>

-      <element xmi:type="uml:Class" href="modelTest.uml#_p7Dl8NgUEeKydel9b5SKTQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p7VSwdgUEeKydel9b5SKTQ" x="704" y="360"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_mdq5EdgUEeKydel9b5SKTQ"/>

-    <element xmi:type="uml:Model" href="modelTest.uml#_mdpD4NgUEeKydel9b5SKTQ"/>

-  </notation:Diagram>

-  <nattable:Table xmi:id="_y3q7oNgUEeKydel9b5SKTQ" name="GenericTable0" currentRowAxisProvider="_y3q7otgUEeKydel9b5SKTQ" currentColumnAxisProvider="_y3q7odgUEeKydel9b5SKTQ">

-    <context xmi:type="uml:Model" href="modelTest.uml#_mdpD4NgUEeKydel9b5SKTQ"/>

-    <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="_y3q7odgUEeKydel9b5SKTQ" 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="_zPQVMNgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVMdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVMtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVM9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVNNgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVNdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVNtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVN9gUEeKydel9b5SKTQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVONgUEeKydel9b5SKTQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVOdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVOtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVO9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8QNgUEeKydel9b5SKTQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8QdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8QtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8Q9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8RNgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8RdgUEeKydel9b5SKTQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8RtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8R9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8SNgUEeKydel9b5SKTQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8SdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8StgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8S9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8TNgUEeKydel9b5SKTQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8TdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8TtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8T9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8UNgUEeKydel9b5SKTQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8UdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8UtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8U9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8VNgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8VdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8VtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8V9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8WNgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8WdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8WtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8W9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8XNgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8XdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8XtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8X9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8YNgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8YdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8YtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8Y9gUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8ZNgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8ZdgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8ZtgUEeKydel9b5SKTQ">

-        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_zPSKYNgUEeKydel9b5SKTQ" element="property_of_stereotype:/Profile::Profile1::SubProfile2::Stereotype2::prop2">

-        <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:FeatureIdAxis" xmi:id="_zPSKYdgUEeKydel9b5SKTQ" element="property_of_stereotype:/Profile::Package1::SubProfile1::Stereotype1::prop1">

-        <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="_y3q7otgUEeKydel9b5SKTQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_zPPuINgUEeKydel9b5SKTQ">

-        <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:Class" href="modelTest.uml#_p7Dl8NgUEeKydel9b5SKTQ"/>

-      </axis>

-    </rowAxisProvidersHistory>

-  </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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/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="_mdq5ENgUEeKydel9b5SKTQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_p7VSwNgUEeKydel9b5SKTQ" type="2008" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p7V50NgUEeKydel9b5SKTQ" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p7V50dgUEeKydel9b5SKTQ" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p7V50tgUEeKydel9b5SKTQ" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p7Wg4NgUEeKydel9b5SKTQ" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p7Wg4dgUEeKydel9b5SKTQ" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p7Wg4tgUEeKydel9b5SKTQ" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tew9QNgUEeKydel9b5SKTQ" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tew9QdgUEeKydel9b5SKTQ" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_texkUNgUEeKydel9b5SKTQ" key="StereotypeList" value="Profile::Package1::SubProfile1::Stereotype1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_texkUdgUEeKydel9b5SKTQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_texkUtgUEeKydel9b5SKTQ" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_texkU9gUEeKydel9b5SKTQ" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_p7Wg49gUEeKydel9b5SKTQ" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_p7Wg5NgUEeKydel9b5SKTQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_p7Wg5dgUEeKydel9b5SKTQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_p7Wg5tgUEeKydel9b5SKTQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_p7Wg59gUEeKydel9b5SKTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p7Wg6NgUEeKydel9b5SKTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_p7Wg6dgUEeKydel9b5SKTQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_p7Wg6tgUEeKydel9b5SKTQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_p7Wg69gUEeKydel9b5SKTQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_p7Wg7NgUEeKydel9b5SKTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p7Wg7dgUEeKydel9b5SKTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_p7Wg7tgUEeKydel9b5SKTQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_p7Wg79gUEeKydel9b5SKTQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_p7Wg8NgUEeKydel9b5SKTQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_p7Wg8dgUEeKydel9b5SKTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p7Wg8tgUEeKydel9b5SKTQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="modelTest.uml#_p7Dl8NgUEeKydel9b5SKTQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p7VSwdgUEeKydel9b5SKTQ" x="704" y="360"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_mdq5EdgUEeKydel9b5SKTQ"/>
+    <element xmi:type="uml:Model" href="modelTest.uml#_mdpD4NgUEeKydel9b5SKTQ"/>
+  </notation:Diagram>
+  <nattable:Table xmi:id="_y3q7oNgUEeKydel9b5SKTQ" name="GenericTable0" currentRowAxisProvider="_y3q7otgUEeKydel9b5SKTQ" currentColumnAxisProvider="_y3q7odgUEeKydel9b5SKTQ">
+    <context xmi:type="uml:Model" href="modelTest.uml#_mdpD4NgUEeKydel9b5SKTQ"/>
+    <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="_y3q7odgUEeKydel9b5SKTQ" 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="_zPQVMNgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVMdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVMtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVM9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVNNgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVNdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVNtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVN9gUEeKydel9b5SKTQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVONgUEeKydel9b5SKTQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVOdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVOtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQVO9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8QNgUEeKydel9b5SKTQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8QdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8QtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8Q9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8RNgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8RdgUEeKydel9b5SKTQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8RtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8R9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8SNgUEeKydel9b5SKTQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8SdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8StgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8S9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8TNgUEeKydel9b5SKTQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8TdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8TtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8T9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8UNgUEeKydel9b5SKTQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8UdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8UtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8U9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8VNgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8VdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8VtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8V9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8WNgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8WdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8WtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8W9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8XNgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8XdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8XtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8X9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8YNgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8YdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8YtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8Y9gUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8ZNgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8ZdgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_zPQ8ZtgUEeKydel9b5SKTQ">
+        <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/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_zPSKYNgUEeKydel9b5SKTQ" element="property_of_stereotype:/Profile::Profile1::SubProfile2::Stereotype2::prop2">
+        <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:FeatureIdAxis" xmi:id="_zPSKYdgUEeKydel9b5SKTQ" element="property_of_stereotype:/Profile::Package1::SubProfile1::Stereotype1::prop1">
+        <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="_y3q7otgUEeKydel9b5SKTQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_zPPuINgUEeKydel9b5SKTQ">
+        <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:Class" href="modelTest.uml#_p7Dl8NgUEeKydel9b5SKTQ"/>
+      </axis>
+    </rowAxisProvidersHistory>
+  </nattable:Table>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.uml
index ec7fcf54009..e0f7c3c1c8e 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/resources/withCustomProfile/modelTest.uml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SubProfile1="http://Profile.Package1/schemas/SubProfile1/_hjcawNgUEeKydel9b5SKTQ/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://Profile.Package1/schemas/SubProfile1/_hjcawNgUEeKydel9b5SKTQ/0 model.profile.uml#_hjrrUNgUEeKydel9b5SKTQ">

-  <uml:Model xmi:id="_mdpD4NgUEeKydel9b5SKTQ" name="Model">

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_mdpD4dgUEeKydel9b5SKTQ">

-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-    </packageImport>

-    <packagedElement xmi:type="uml:Class" xmi:id="_p7Dl8NgUEeKydel9b5SKTQ" name="Class1"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sPLksNgUEeKydel9b5SKTQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sP-O4NgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="model.profile.uml#_hiG-ANgUEeKydel9b5SKTQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_LBTDgNgUEeKydel9b5SKTQ"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sQa60NgUEeKydel9b5SKTQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sRIsgNgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="model.profile.uml#_hi_HwNgUEeKydel9b5SKTQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_R2fZsNgUEeKydel9b5SKTQ"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sRbAYNgUEeKydel9b5SKTQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sSG84NgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="model.profile.uml#_hjWUINgUEeKydel9b5SKTQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_S6AFINgUEeKydel9b5SKTQ"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sSZQwNgUEeKydel9b5SKTQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sTEmMNgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="model.profile.uml#_hjrrUNgUEeKydel9b5SKTQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_aW7wwNgUEeKydel9b5SKTQ"/>

-    </profileApplication>

-  </uml:Model>

-  <SubProfile1:Stereotype1 xmi:id="_tefQcNgUEeKydel9b5SKTQ" base_Class="_p7Dl8NgUEeKydel9b5SKTQ"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SubProfile1="http://Profile.Package1/schemas/SubProfile1/_hjcawNgUEeKydel9b5SKTQ/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://Profile.Package1/schemas/SubProfile1/_hjcawNgUEeKydel9b5SKTQ/0 model.profile.uml#_hjrrUNgUEeKydel9b5SKTQ">
+  <uml:Model xmi:id="_mdpD4NgUEeKydel9b5SKTQ" name="Model">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_mdpD4dgUEeKydel9b5SKTQ">
+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Class" xmi:id="_p7Dl8NgUEeKydel9b5SKTQ" name="Class1"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sPLksNgUEeKydel9b5SKTQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sP-O4NgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_hiG-ANgUEeKydel9b5SKTQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_LBTDgNgUEeKydel9b5SKTQ"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sQa60NgUEeKydel9b5SKTQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sRIsgNgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_hi_HwNgUEeKydel9b5SKTQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_R2fZsNgUEeKydel9b5SKTQ"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sRbAYNgUEeKydel9b5SKTQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sSG84NgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_hjWUINgUEeKydel9b5SKTQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_S6AFINgUEeKydel9b5SKTQ"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sSZQwNgUEeKydel9b5SKTQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sTEmMNgUEeKydel9b5SKTQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_hjrrUNgUEeKydel9b5SKTQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_aW7wwNgUEeKydel9b5SKTQ"/>
+    </profileApplication>
+  </uml:Model>
+  <SubProfile1:Stereotype1 xmi:id="_tefQcNgUEeKydel9b5SKTQ" base_Class="_p7Dl8NgUEeKydel9b5SKTQ"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/Activator.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/Activator.java
index dc6b214629b..206e3bf9c8d 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/Activator.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/Activator.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.tests;

-

-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.uml.nattable.tests"; //$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)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static 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.uml.nattable.tests;
+
+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.uml.nattable.tests"; //$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)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/UMLRestrictedContentProviderTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/UMLRestrictedContentProviderTest.java
index c7bfc5ef166..397e189b2e2 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/UMLRestrictedContentProviderTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/UMLRestrictedContentProviderTest.java
@@ -1,260 +1,260 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.tests.tests;

-

-

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.emf.common.util.URI;

-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.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.eclipse.papyrus.uml.nattable.tests.Activator;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * This test tests the class UMLRestrictedContentProvider, and its result according to its boolean value isRestricted and the contents of the table

- * <ul>

- * <li>the returned values according to isRestricted</li>

- * <li>the returned values according to the stereotype applied on the elements referenced by the table</li>

- * </ul>

- *

- * The tested model :

- * <ul>

- * <li>Model

- * <ul>

- * <li>Class1</li>

- * <li>Model1 (with the profile SysML::Blocks applied)</li>

- * <ul>

- * <li><< Block >> Block1</li>

- * <li>emptyTable2</li>

- * <li>notEmptyTable2 (contains Block1)</li>

- * </ul>

- * <li>emptyTable1</li>

- * <li>notEmptyTable1 (contains Class1)</li>

- * </ul>

- * </li>

- * </ul>

- *

- * @author Vincent Lorenzo

- *

- */

-public class UMLRestrictedContentProviderTest extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-	

-	/** the root of the model */

-	private Model modelRoot;

-

-	/** the sub model on which we apply the profile Blocks */

-	private Model subModel;

-

-	/** the first empty table, owned by modelRoot */

-	private Table emptyTable1;

-

-	/** the second empty table, owned by submodel */

-	private Table emptyTable2;

-

-	/** the first not empty table, which contains a Class without stereotype. this table is owned by modelRoot */

-	private Table notEmptyTable1;

-

-	/** the second not empty table which contains a Class stereotyped block. This table is owned by subModel */

-	private Table notEmptyTable2;

-

-	/** the resource set used to load the model */

-	private ResourceSet resourceSet;

-

-

-	@Before

-	public void init() {

-		try {

-			resourceSet = houseKeeper.createResourceSet();

-			EMFHelper.loadEMFModel(resourceSet, URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model.di", true)); //$NON-NLS-1$

-			Resource umlModel = resourceSet.getResource(URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model.uml", true), true); //$NON-NLS-1$

-

-			//we inits the field of this class

-			modelRoot = (Model)umlModel.getContents().get(0);

-			subModel = (Model)modelRoot.getMember("Model1"); //$NON-NLS-1$

-			Resource notation = resourceSet.getResource(URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model.notation", true), true); //$NON-NLS-1$

-			for(final EObject current : notation.getContents()) {

-				if(current instanceof Table) {

-					if(((Table)current).getContext() == modelRoot) {

-						if(((Table)current).getName().equals("emptyTable1")) { //$NON-NLS-1$

-							emptyTable1 = (Table)current;

-						} else if(((Table)current).getName().equals("notEmptyTable1")) { //$NON-NLS-1$

-							notEmptyTable1 = (Table)current;

-						}

-					} else if(((Table)current).getContext() == subModel) {

-						if(((Table)current).getName().equals("emptyTable2")) { //$NON-NLS-1$

-							emptyTable2 = (Table)current;

-						} else if(((Table)current).getName().equals("notEmptyTable2")) { //$NON-NLS-1$

-							notEmptyTable2 = (Table)current;

-						}

-					}

-				}

-			}

-

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-		}

-		Assert.assertNotNull(modelRoot);

-		Assert.assertNotNull(subModel);

-		Assert.assertNotNull(emptyTable1);

-		Assert.assertNotNull(emptyTable2);

-		Assert.assertNotNull(notEmptyTable1);

-		Assert.assertNotNull(notEmptyTable2);

-	}

-

-	/**

-	 * tests the children for an empty table, with restriction -> the content provider must return an empty array

-	 */

-	@Test

-	public void testEmptyTableWithRestriction() {

-		NattableModelManager modelManager = new NattableModelManager(emptyTable1);

-		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);

-		columnContentProvider.setIgnoreInheritedElements(true);

-		Object[] elements = columnContentProvider.getElements();

-		Assert.assertEquals(0, elements.length);

-	}

-

-	/**

-	 * tests the children for an empty table, without restriction -> the content provider must return an array referencing UMLPackage and

-	 * SysML::Blocks

-	 */

-	@Test

-	public void testEmptyTableWithoutRestriction() {

-		NattableModelManager modelManager = new NattableModelManager(emptyTable1);

-		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(false);

-		columnContentProvider.setIgnoreInheritedElements(true);

-		Object[] elements = columnContentProvider.getElements();

-		Assert.assertEquals(2, elements.length);

-		List<?> roots = Arrays.asList(elements);

-

-		Profile sysmlBlockProfile = null;

-		EPackage umlPackage = null;

-

-		for(final Object current : roots) {

-			if(current == UMLPackage.eINSTANCE) {

-				umlPackage = (EPackage)current;

-			} else if(current instanceof org.eclipse.uml2.uml.Package) {

-				sysmlBlockProfile = (Profile)current;

-			}

-		}

-

-		//we test the roots

-		Assert.assertNotNull(umlPackage);

-		Assert.assertEquals("Blocks", sysmlBlockProfile.getName()); //$NON-NLS-1$

-		elements = columnContentProvider.getChildren(sysmlBlockProfile);

-		Assert.assertEquals(6, elements.length);//we display all the children of the sysmlProfile block

-	}

-

-	/**

-	 * Test the contents provider on notEmptytable1 which contains only Class1 -> the SysML profile must not be visible

-	 * The content provider must return an array referencing only UMLPackage

-	 */

-	@Test

-	public void testNotEmptyTableWithRestriction() {

-		NattableModelManager modelManager = new NattableModelManager(notEmptyTable1);

-		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);

-		columnContentProvider.setIgnoreInheritedElements(true);

-		Object[] elements = columnContentProvider.getElements();

-		Assert.assertEquals(1, elements.length);

-		Assert.assertEquals(elements[0], UMLPackage.eINSTANCE);

-	}

-

-	/**

-	 * the contents provider must returns an array referencing UMLPackage ans SysML::Blocks

-	 */

-	@Test

-	public void testNotEmptyTableWithoutProfileWithoutRestriction() {

-		NattableModelManager modelManager = new NattableModelManager(notEmptyTable1);

-		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(false);

-		columnContentProvider.setIgnoreInheritedElements(true);

-		Object[] elements = columnContentProvider.getElements();

-		Assert.assertEquals(2, elements.length);

-		List<?> roots = Arrays.asList(elements);

-

-		Profile sysmlBlockProfile = null;

-		EPackage umlPackage = null;

-

-		for(final Object current : roots) {

-			if(current == UMLPackage.eINSTANCE) {

-				umlPackage = (EPackage)current;

-			} else if(current instanceof org.eclipse.uml2.uml.Package) {

-				sysmlBlockProfile = (Profile)current;

-			}

-		}

-

-		//we test the roots

-		Assert.assertNotNull(umlPackage);

-		Assert.assertEquals("Blocks", sysmlBlockProfile.getName()); //$NON-NLS-1$

-		elements = columnContentProvider.getChildren(sysmlBlockProfile);

-		Assert.assertEquals(6, elements.length);//we display all the children of the sysmlProfile block

-	}

-

-	/**

-	 * the content provider must returns an array with UMLPackage and SysML::Blocks.

-	 * SysMLBlocks must have only 1 child : SysML::Blocks::Block

-	 */

-	@Test

-	public void testNotEmptyTableWithProfileWithRestriction() {

-		NattableModelManager modelManager = new NattableModelManager(notEmptyTable2);

-		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);

-		columnContentProvider.setIgnoreInheritedElements(true);

-		Object[] elements = columnContentProvider.getElements();

-		Assert.assertEquals(2, elements.length);

-		List<?> roots = Arrays.asList(elements);

-

-		Profile sysmlBlockProfile = null;

-		EPackage umlPackage = null;

-

-		for(final Object current : roots) {

-			if(current == UMLPackage.eINSTANCE) {

-				umlPackage = (EPackage)current;

-			} else if(current instanceof org.eclipse.uml2.uml.Package) {

-				sysmlBlockProfile = (Profile)current;

-			}

-		}

-

-		//we test the roots

-		//the contents provider returns them, but they won't be displayed in the treeviewer because they don't have accepted children

-		Assert.assertNotNull(umlPackage);

-		Assert.assertEquals("Blocks", sysmlBlockProfile.getName()); //$NON-NLS-1$

-

-		Assert.assertEquals(1, columnContentProvider.getChildren(sysmlBlockProfile).length);

-		Assert.assertTrue(columnContentProvider.getChildren(umlPackage).length > 0);

-	}

-

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.tests.tests;
+
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+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.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.nattable.tests.Activator;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * This test tests the class UMLRestrictedContentProvider, and its result according to its boolean value isRestricted and the contents of the table
+ * <ul>
+ * <li>the returned values according to isRestricted</li>
+ * <li>the returned values according to the stereotype applied on the elements referenced by the table</li>
+ * </ul>
+ *
+ * The tested model :
+ * <ul>
+ * <li>Model
+ * <ul>
+ * <li>Class1</li>
+ * <li>Model1 (with the profile SysML::Blocks applied)</li>
+ * <ul>
+ * <li><< Block >> Block1</li>
+ * <li>emptyTable2</li>
+ * <li>notEmptyTable2 (contains Block1)</li>
+ * </ul>
+ * <li>emptyTable1</li>
+ * <li>notEmptyTable1 (contains Class1)</li>
+ * </ul>
+ * </li>
+ * </ul>
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class UMLRestrictedContentProviderTest extends AbstractPapyrusTest {
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+	
+	/** the root of the model */
+	private Model modelRoot;
+
+	/** the sub model on which we apply the profile Blocks */
+	private Model subModel;
+
+	/** the first empty table, owned by modelRoot */
+	private Table emptyTable1;
+
+	/** the second empty table, owned by submodel */
+	private Table emptyTable2;
+
+	/** the first not empty table, which contains a Class without stereotype. this table is owned by modelRoot */
+	private Table notEmptyTable1;
+
+	/** the second not empty table which contains a Class stereotyped block. This table is owned by subModel */
+	private Table notEmptyTable2;
+
+	/** the resource set used to load the model */
+	private ResourceSet resourceSet;
+
+
+	@Before
+	public void init() {
+		try {
+			resourceSet = houseKeeper.createResourceSet();
+			EMFHelper.loadEMFModel(resourceSet, URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model.di", true)); //$NON-NLS-1$
+			Resource umlModel = resourceSet.getResource(URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model.uml", true), true); //$NON-NLS-1$
+
+			//we inits the field of this class
+			modelRoot = (Model)umlModel.getContents().get(0);
+			subModel = (Model)modelRoot.getMember("Model1"); //$NON-NLS-1$
+			Resource notation = resourceSet.getResource(URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model.notation", true), true); //$NON-NLS-1$
+			for(final EObject current : notation.getContents()) {
+				if(current instanceof Table) {
+					if(((Table)current).getContext() == modelRoot) {
+						if(((Table)current).getName().equals("emptyTable1")) { //$NON-NLS-1$
+							emptyTable1 = (Table)current;
+						} else if(((Table)current).getName().equals("notEmptyTable1")) { //$NON-NLS-1$
+							notEmptyTable1 = (Table)current;
+						}
+					} else if(((Table)current).getContext() == subModel) {
+						if(((Table)current).getName().equals("emptyTable2")) { //$NON-NLS-1$
+							emptyTable2 = (Table)current;
+						} else if(((Table)current).getName().equals("notEmptyTable2")) { //$NON-NLS-1$
+							notEmptyTable2 = (Table)current;
+						}
+					}
+				}
+			}
+
+		} catch (IOException ex) {
+			Activator.log.error(ex);
+		}
+		Assert.assertNotNull(modelRoot);
+		Assert.assertNotNull(subModel);
+		Assert.assertNotNull(emptyTable1);
+		Assert.assertNotNull(emptyTable2);
+		Assert.assertNotNull(notEmptyTable1);
+		Assert.assertNotNull(notEmptyTable2);
+	}
+
+	/**
+	 * tests the children for an empty table, with restriction -> the content provider must return an empty array
+	 */
+	@Test
+	public void testEmptyTableWithRestriction() {
+		NattableModelManager modelManager = new NattableModelManager(emptyTable1);
+		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);
+		columnContentProvider.setIgnoreInheritedElements(true);
+		Object[] elements = columnContentProvider.getElements();
+		Assert.assertEquals(0, elements.length);
+	}
+
+	/**
+	 * tests the children for an empty table, without restriction -> the content provider must return an array referencing UMLPackage and
+	 * SysML::Blocks
+	 */
+	@Test
+	public void testEmptyTableWithoutRestriction() {
+		NattableModelManager modelManager = new NattableModelManager(emptyTable1);
+		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(false);
+		columnContentProvider.setIgnoreInheritedElements(true);
+		Object[] elements = columnContentProvider.getElements();
+		Assert.assertEquals(2, elements.length);
+		List<?> roots = Arrays.asList(elements);
+
+		Profile sysmlBlockProfile = null;
+		EPackage umlPackage = null;
+
+		for(final Object current : roots) {
+			if(current == UMLPackage.eINSTANCE) {
+				umlPackage = (EPackage)current;
+			} else if(current instanceof org.eclipse.uml2.uml.Package) {
+				sysmlBlockProfile = (Profile)current;
+			}
+		}
+
+		//we test the roots
+		Assert.assertNotNull(umlPackage);
+		Assert.assertEquals("Blocks", sysmlBlockProfile.getName()); //$NON-NLS-1$
+		elements = columnContentProvider.getChildren(sysmlBlockProfile);
+		Assert.assertEquals(6, elements.length);//we display all the children of the sysmlProfile block
+	}
+
+	/**
+	 * Test the contents provider on notEmptytable1 which contains only Class1 -> the SysML profile must not be visible
+	 * The content provider must return an array referencing only UMLPackage
+	 */
+	@Test
+	public void testNotEmptyTableWithRestriction() {
+		NattableModelManager modelManager = new NattableModelManager(notEmptyTable1);
+		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);
+		columnContentProvider.setIgnoreInheritedElements(true);
+		Object[] elements = columnContentProvider.getElements();
+		Assert.assertEquals(1, elements.length);
+		Assert.assertEquals(elements[0], UMLPackage.eINSTANCE);
+	}
+
+	/**
+	 * the contents provider must returns an array referencing UMLPackage ans SysML::Blocks
+	 */
+	@Test
+	public void testNotEmptyTableWithoutProfileWithoutRestriction() {
+		NattableModelManager modelManager = new NattableModelManager(notEmptyTable1);
+		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(false);
+		columnContentProvider.setIgnoreInheritedElements(true);
+		Object[] elements = columnContentProvider.getElements();
+		Assert.assertEquals(2, elements.length);
+		List<?> roots = Arrays.asList(elements);
+
+		Profile sysmlBlockProfile = null;
+		EPackage umlPackage = null;
+
+		for(final Object current : roots) {
+			if(current == UMLPackage.eINSTANCE) {
+				umlPackage = (EPackage)current;
+			} else if(current instanceof org.eclipse.uml2.uml.Package) {
+				sysmlBlockProfile = (Profile)current;
+			}
+		}
+
+		//we test the roots
+		Assert.assertNotNull(umlPackage);
+		Assert.assertEquals("Blocks", sysmlBlockProfile.getName()); //$NON-NLS-1$
+		elements = columnContentProvider.getChildren(sysmlBlockProfile);
+		Assert.assertEquals(6, elements.length);//we display all the children of the sysmlProfile block
+	}
+
+	/**
+	 * the content provider must returns an array with UMLPackage and SysML::Blocks.
+	 * SysMLBlocks must have only 1 child : SysML::Blocks::Block
+	 */
+	@Test
+	public void testNotEmptyTableWithProfileWithRestriction() {
+		NattableModelManager modelManager = new NattableModelManager(notEmptyTable2);
+		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);
+		columnContentProvider.setIgnoreInheritedElements(true);
+		Object[] elements = columnContentProvider.getElements();
+		Assert.assertEquals(2, elements.length);
+		List<?> roots = Arrays.asList(elements);
+
+		Profile sysmlBlockProfile = null;
+		EPackage umlPackage = null;
+
+		for(final Object current : roots) {
+			if(current == UMLPackage.eINSTANCE) {
+				umlPackage = (EPackage)current;
+			} else if(current instanceof org.eclipse.uml2.uml.Package) {
+				sysmlBlockProfile = (Profile)current;
+			}
+		}
+
+		//we test the roots
+		//the contents provider returns them, but they won't be displayed in the treeviewer because they don't have accepted children
+		Assert.assertNotNull(umlPackage);
+		Assert.assertEquals("Blocks", sysmlBlockProfile.getName()); //$NON-NLS-1$
+
+		Assert.assertEquals(1, columnContentProvider.getChildren(sysmlBlockProfile).length);
+		Assert.assertTrue(columnContentProvider.getChildren(umlPackage).length > 0);
+	}
+
+
+
+
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/UMLRestrictedContentProviderTestCustomProfile.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/UMLRestrictedContentProviderTestCustomProfile.java
index b54ba2d126c..1f6d92b5f24 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/UMLRestrictedContentProviderTestCustomProfile.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/UMLRestrictedContentProviderTestCustomProfile.java
@@ -1,466 +1,466 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.tests.tests;

-

-

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.emf.common.util.URI;

-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.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.uml.nattable.tests.Activator;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-

-public class UMLRestrictedContentProviderTestCustomProfile extends AbstractPapyrusTest {

-

-	/** the root of the model */

-	private Model modelRoot;

-

-	/** the sub model on which we apply the profile Blocks */

-	private Class stereotypedClass;

-

-	/** the tested table */

-	private Table table;

-

-	/**

-	 * the base properties

-	 */

-	private Property basePropSte1;

-

-	private Property basePropSte2;

-

-	/**

-	 * the packages and the profiles

-	 */

-	private Profile rootProfile;

-

-	private Profile profile1;

-

-	private Profile subProfile1;

-

-	private Profile subProfile2;

-

-	private Package package1;

-

-	private Property prop1;

-

-	private Property prop2;

-

-	/**

-	 * the stereotypes

-	 */

-	private Stereotype stereotype1;

-

-	private Stereotype stereotype2;

-

-	/** the resource set used to load the model */

-	private ResourceSet resourceSet;

-

-	private String resourcePath = "/resources/withCustomProfile/modelTest";

-

-	@Before

-	public void init() {

-		try {

-			resourceSet = new ResourceSetImpl();

-			EMFHelper.loadEMFModel(resourceSet, URI.createPlatformPluginURI(Activator.PLUGIN_ID + resourcePath + ".di", true)); //$NON-NLS-1$

-			Resource umlModel = resourceSet.getResource(URI.createPlatformPluginURI(Activator.PLUGIN_ID + resourcePath + ".uml", true), true); //$NON-NLS-1$

-

-			//we inits the field of this class

-			modelRoot = (Model)umlModel.getContents().get(0);

-			stereotypedClass = (Class)modelRoot.getMember("Class1"); //$NON-NLS-1$

-			Resource notation = resourceSet.getResource(URI.createPlatformPluginURI(Activator.PLUGIN_ID + resourcePath + ".notation", true), true); //$NON-NLS-1$

-			for(final EObject current : notation.getContents()) {

-				if(current instanceof Table) {

-					if(((Table)current).getContext() == modelRoot) {

-						if(((Table)current).getName().equals("GenericTable0")) { //$NON-NLS-1$

-							table = (Table)current;

-						}

-					}

-				}

-			}

-

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-		}

-		Assert.assertNotNull(modelRoot);

-		Assert.assertNotNull(stereotypedClass);

-		Assert.assertNotNull(table);

-

-

-		stereotype1 = stereotypedClass.getAppliedStereotypes().get(0);

-		Assert.assertEquals("Stereotype1", stereotype1.getName());

-		stereotype2 = (Stereotype)stereotype1.getGeneral("Stereotype2");

-		basePropSte2 = (Property)stereotype2.getMember("base_Class");

-

-		prop1 = (Property)stereotype1.getMember("prop1");

-		prop2 = (Property)stereotype2.getMember("prop2");

-

-		subProfile1 = stereotype1.containingProfile();

-		package1 = (Package)subProfile1.eContainer();

-		subProfile2 = stereotype2.containingProfile();

-		profile1 = (Profile)subProfile2.eContainer();

-		rootProfile = (Profile)profile1.eContainer();

-

-

-

-		//		Assert.assertNotNull(basePropSte1);

-		Assert.assertNotNull(basePropSte2);

-		Assert.assertNotNull(rootProfile);

-		Assert.assertNotNull(subProfile1);

-		Assert.assertNotNull(subProfile2);

-		Assert.assertNotNull(package1);

-		Assert.assertNotNull(stereotype1);

-		Assert.assertNotNull(stereotype2);

-

-		Assert.assertNotNull(prop1);

-		Assert.assertNotNull(prop2);

-		Assert.assertNotNull(profile1);

-

-	}

-

-	@After

-	public void fini() {

-		if(resourceSet != null) {

-			EMFHelper.unload(resourceSet);

-			resourceSet = null;

-		}

-

-		basePropSte1 = null;

-		basePropSte2 = null;

-		rootProfile = null;

-		subProfile1 = null;

-		subProfile2 = null;

-		package1 = null;

-		stereotype1 = null;

-		stereotype2 = null;

-		profile1 = null;

-		prop1 = null;

-		prop2 = null;

-		modelRoot = null;

-		table = null;

-		stereotypedClass = null;

-	}

-	

-	@Test

-	public void testWithRestriction() {

-		NattableModelManager modelManager = new NattableModelManager(table);

-		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);

-		columnContentProvider.setIgnoreInheritedElements(true);

-		Object[] elements = columnContentProvider.getElements();

-		Assert.assertEquals(2, elements.length);

-		List<?> roots = Arrays.asList(elements);

-		Profile rootProfile = null;

-		EPackage umlPackage = null;

-

-		for(final Object current : roots) {

-			if(current == UMLPackage.eINSTANCE) {

-				umlPackage = (EPackage)current;

-			} else if(current == this.rootProfile) {

-				rootProfile = (Profile)current;

-			}

-		}

-

-		Assert.assertNotNull(umlPackage);

-		Assert.assertNotNull(rootProfile);

-

-		//test the children for umlPackage

-		List<?> children = Arrays.asList(columnContentProvider.getChildren(umlPackage));

-		Assert.assertEquals(13, children.size());//1 of them is not displayed in the dialog, because it doesn't have valid feature

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getBehavioredClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getClass_()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getEncapsulatedClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamedElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamespace()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getPackageableElement()));//not displayed

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getParameterableElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getRedefinableElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getStructuredClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getTemplateableElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getType()));

-

-		//test that we don't have the inherited properties

-		children = Arrays.asList(columnContentProvider.getChildren(UMLPackage.eINSTANCE.getClassifier()));

-		Assert.assertFalse(children.contains(UMLPackage.eINSTANCE.getNamedElement_Name()));

-

-		//test the children for the rootProfile

-		children = Arrays.asList(columnContentProvider.getChildren(rootProfile));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(package1));

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(subProfile1));

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(stereotype1));

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(prop1));

-

-	}

-

-

-	@Test

-	public void testWithoutRestriction() {

-		NattableModelManager modelManager = new NattableModelManager(table);

-		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(false);

-		columnContentProvider.setIgnoreInheritedElements(true);

-		Object[] elements = columnContentProvider.getElements();

-		Assert.assertEquals(2, elements.length);

-		List<?> roots = Arrays.asList(elements);

-		Profile rootProfile = null;

-		EPackage umlPackage = null;

-

-		for(final Object current : roots) {

-			if(current == UMLPackage.eINSTANCE) {

-				umlPackage = (EPackage)current;

-			} else if(current == this.rootProfile) {

-				rootProfile = (Profile)current;

-			}

-		}

-

-		Assert.assertNotNull(umlPackage);

-		Assert.assertNotNull(rootProfile);

-

-		//test the children for umlPackage

-		List<?> children = Arrays.asList(columnContentProvider.getChildren(umlPackage));

-		Assert.assertTrue(children.size() >= 242);//approximatly 242 metaclasses in UML

-

-		//test that we don't have the inherited properties

-		children = Arrays.asList(columnContentProvider.getChildren(UMLPackage.eINSTANCE.getClassifier()));

-		Assert.assertFalse(children.contains(UMLPackage.eINSTANCE.getNamedElement_Name()));

-

-

-		//test the children for the rootProfile

-		children = Arrays.asList(columnContentProvider.getChildren(rootProfile));

-		Assert.assertEquals(2, children.size());

-		Profile profile1 = null;

-		Package package1 = null;

-		for(final Object current : children) {

-			if(current instanceof Profile && ((Profile)current).getName().equals("Profile1")) {

-				profile1 = (Profile)current;

-			} else if(current instanceof Package && ((Package)current).getName().equals("Package1")) {

-				package1 = (Package)current;

-			}

-		}

-

-		Assert.assertNotNull(package1);

-		Assert.assertNotNull(profile1);

-

-		//test the children of package1

-		children = Arrays.asList(columnContentProvider.getChildren(package1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(subProfile1));

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(stereotype1));

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(prop1));

-

-

-

-		//test the children for profile1

-		children = Arrays.asList(columnContentProvider.getChildren(profile1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(subProfile2));

-

-

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(stereotype2));

-

-

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(prop2));

-

-	}

-

-	@Test

-	public void testWithRestrictionWithInheritedProperties() {

-		NattableModelManager modelManager = new NattableModelManager(table);

-		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);

-		columnContentProvider.setIgnoreInheritedElements(false);

-		Object[] elements = columnContentProvider.getElements();

-		Assert.assertEquals(2, elements.length);

-		List<?> roots = Arrays.asList(elements);

-		Profile rootProfile = null;

-		EPackage umlPackage = null;

-

-		for(final Object current : roots) {

-			if(current == UMLPackage.eINSTANCE) {

-				umlPackage = (EPackage)current;

-			} else if(current == this.rootProfile) {

-				rootProfile = (Profile)current;

-			}

-		}

-

-		Assert.assertNotNull(umlPackage);

-		Assert.assertNotNull(rootProfile);

-

-		//test the children for umlPackage

-		List<?> children = Arrays.asList(columnContentProvider.getChildren(umlPackage));

-		Assert.assertEquals(13, children.size());//1 of them is not displayed in the dialog, because it doesn't have valid feature

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getBehavioredClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getClass_()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getEncapsulatedClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamedElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamespace()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getPackageableElement()));//not displayed

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getParameterableElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getRedefinableElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getStructuredClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getTemplateableElement()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getType()));

-

-		//test that we have the inherited properties

-		children = Arrays.asList(columnContentProvider.getChildren(UMLPackage.eINSTANCE.getClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamedElement_Name()));

-

-

-		//test the children for the rootProfile

-		children = Arrays.asList(columnContentProvider.getChildren(rootProfile));

-		Assert.assertEquals(1, children.size());

-

-		Assert.assertTrue(children.contains(package1));

-

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(subProfile1));

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(stereotype1));

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(2, children.size());

-

-		Assert.assertTrue(children.contains(prop1));

-		Assert.assertTrue(children.contains(prop2));

-

-	}

-

-

-	@Test

-	public void testWithoutRestrictionWithInheritedProperties() {

-		NattableModelManager modelManager = new NattableModelManager(table);

-		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(false);

-		columnContentProvider.setIgnoreInheritedElements(false);

-		Object[] elements = columnContentProvider.getElements();

-		Assert.assertEquals(2, elements.length);

-		List<?> roots = Arrays.asList(elements);

-		Profile rootProfile = null;

-		EPackage umlPackage = null;

-

-		for(final Object current : roots) {

-			if(current == UMLPackage.eINSTANCE) {

-				umlPackage = (EPackage)current;

-			} else if(current == this.rootProfile) {

-				rootProfile = (Profile)current;

-			}

-		}

-

-		Assert.assertNotNull(umlPackage);

-		Assert.assertNotNull(rootProfile);

-

-		//test the children for umlPackage

-		List<?> children = Arrays.asList(columnContentProvider.getChildren(umlPackage));

-		Assert.assertTrue(children.size() >= 242);//approximatly 242 metaclasses in UML

-

-		//test that we have the inherited properties

-		children = Arrays.asList(columnContentProvider.getChildren(UMLPackage.eINSTANCE.getClassifier()));

-		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamedElement_Name()));

-

-		//test the children for the rootProfile

-		children = Arrays.asList(columnContentProvider.getChildren(rootProfile));

-		Assert.assertEquals(2, children.size());

-		Profile profile1 = null;

-		Package package1 = null;

-		for(final Object current : children) {

-			if(current instanceof Profile && ((Profile)current).getName().equals("Profile1")) {

-				profile1 = (Profile)current;

-			} else if(current instanceof Package && ((Package)current).getName().equals("Package1")) {

-				package1 = (Package)current;

-			}

-		}

-

-		Assert.assertNotNull(package1);

-		Assert.assertNotNull(profile1);

-

-		//test the children of package1

-		children = Arrays.asList(columnContentProvider.getChildren(package1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(subProfile1));

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(stereotype1));

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(2, children.size());

-		Assert.assertTrue(children.contains(prop1));

-		Assert.assertTrue(children.contains(prop2));

-

-

-		//test the children for profile1

-		children = Arrays.asList(columnContentProvider.getChildren(profile1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(subProfile2));

-

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(stereotype2));

-

-

-		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(prop2));

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.tests.tests;
+
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+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.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.uml.nattable.tests.Activator;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class UMLRestrictedContentProviderTestCustomProfile extends AbstractPapyrusTest {
+
+	/** the root of the model */
+	private Model modelRoot;
+
+	/** the sub model on which we apply the profile Blocks */
+	private Class stereotypedClass;
+
+	/** the tested table */
+	private Table table;
+
+	/**
+	 * the base properties
+	 */
+	private Property basePropSte1;
+
+	private Property basePropSte2;
+
+	/**
+	 * the packages and the profiles
+	 */
+	private Profile rootProfile;
+
+	private Profile profile1;
+
+	private Profile subProfile1;
+
+	private Profile subProfile2;
+
+	private Package package1;
+
+	private Property prop1;
+
+	private Property prop2;
+
+	/**
+	 * the stereotypes
+	 */
+	private Stereotype stereotype1;
+
+	private Stereotype stereotype2;
+
+	/** the resource set used to load the model */
+	private ResourceSet resourceSet;
+
+	private String resourcePath = "/resources/withCustomProfile/modelTest";
+
+	@Before
+	public void init() {
+		try {
+			resourceSet = new ResourceSetImpl();
+			EMFHelper.loadEMFModel(resourceSet, URI.createPlatformPluginURI(Activator.PLUGIN_ID + resourcePath + ".di", true)); //$NON-NLS-1$
+			Resource umlModel = resourceSet.getResource(URI.createPlatformPluginURI(Activator.PLUGIN_ID + resourcePath + ".uml", true), true); //$NON-NLS-1$
+
+			//we inits the field of this class
+			modelRoot = (Model)umlModel.getContents().get(0);
+			stereotypedClass = (Class)modelRoot.getMember("Class1"); //$NON-NLS-1$
+			Resource notation = resourceSet.getResource(URI.createPlatformPluginURI(Activator.PLUGIN_ID + resourcePath + ".notation", true), true); //$NON-NLS-1$
+			for(final EObject current : notation.getContents()) {
+				if(current instanceof Table) {
+					if(((Table)current).getContext() == modelRoot) {
+						if(((Table)current).getName().equals("GenericTable0")) { //$NON-NLS-1$
+							table = (Table)current;
+						}
+					}
+				}
+			}
+
+		} catch (IOException ex) {
+			Activator.log.error(ex);
+		}
+		Assert.assertNotNull(modelRoot);
+		Assert.assertNotNull(stereotypedClass);
+		Assert.assertNotNull(table);
+
+
+		stereotype1 = stereotypedClass.getAppliedStereotypes().get(0);
+		Assert.assertEquals("Stereotype1", stereotype1.getName());
+		stereotype2 = (Stereotype)stereotype1.getGeneral("Stereotype2");
+		basePropSte2 = (Property)stereotype2.getMember("base_Class");
+
+		prop1 = (Property)stereotype1.getMember("prop1");
+		prop2 = (Property)stereotype2.getMember("prop2");
+
+		subProfile1 = stereotype1.containingProfile();
+		package1 = (Package)subProfile1.eContainer();
+		subProfile2 = stereotype2.containingProfile();
+		profile1 = (Profile)subProfile2.eContainer();
+		rootProfile = (Profile)profile1.eContainer();
+
+
+
+		//		Assert.assertNotNull(basePropSte1);
+		Assert.assertNotNull(basePropSte2);
+		Assert.assertNotNull(rootProfile);
+		Assert.assertNotNull(subProfile1);
+		Assert.assertNotNull(subProfile2);
+		Assert.assertNotNull(package1);
+		Assert.assertNotNull(stereotype1);
+		Assert.assertNotNull(stereotype2);
+
+		Assert.assertNotNull(prop1);
+		Assert.assertNotNull(prop2);
+		Assert.assertNotNull(profile1);
+
+	}
+
+	@After
+	public void fini() {
+		if(resourceSet != null) {
+			EMFHelper.unload(resourceSet);
+			resourceSet = null;
+		}
+
+		basePropSte1 = null;
+		basePropSte2 = null;
+		rootProfile = null;
+		subProfile1 = null;
+		subProfile2 = null;
+		package1 = null;
+		stereotype1 = null;
+		stereotype2 = null;
+		profile1 = null;
+		prop1 = null;
+		prop2 = null;
+		modelRoot = null;
+		table = null;
+		stereotypedClass = null;
+	}
+	
+	@Test
+	public void testWithRestriction() {
+		NattableModelManager modelManager = new NattableModelManager(table);
+		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);
+		columnContentProvider.setIgnoreInheritedElements(true);
+		Object[] elements = columnContentProvider.getElements();
+		Assert.assertEquals(2, elements.length);
+		List<?> roots = Arrays.asList(elements);
+		Profile rootProfile = null;
+		EPackage umlPackage = null;
+
+		for(final Object current : roots) {
+			if(current == UMLPackage.eINSTANCE) {
+				umlPackage = (EPackage)current;
+			} else if(current == this.rootProfile) {
+				rootProfile = (Profile)current;
+			}
+		}
+
+		Assert.assertNotNull(umlPackage);
+		Assert.assertNotNull(rootProfile);
+
+		//test the children for umlPackage
+		List<?> children = Arrays.asList(columnContentProvider.getChildren(umlPackage));
+		Assert.assertEquals(13, children.size());//1 of them is not displayed in the dialog, because it doesn't have valid feature
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getBehavioredClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getClass_()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getEncapsulatedClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamedElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamespace()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getPackageableElement()));//not displayed
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getParameterableElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getRedefinableElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getStructuredClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getTemplateableElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getType()));
+
+		//test that we don't have the inherited properties
+		children = Arrays.asList(columnContentProvider.getChildren(UMLPackage.eINSTANCE.getClassifier()));
+		Assert.assertFalse(children.contains(UMLPackage.eINSTANCE.getNamedElement_Name()));
+
+		//test the children for the rootProfile
+		children = Arrays.asList(columnContentProvider.getChildren(rootProfile));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(package1));
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(subProfile1));
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(stereotype1));
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(prop1));
+
+	}
+
+
+	@Test
+	public void testWithoutRestriction() {
+		NattableModelManager modelManager = new NattableModelManager(table);
+		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(false);
+		columnContentProvider.setIgnoreInheritedElements(true);
+		Object[] elements = columnContentProvider.getElements();
+		Assert.assertEquals(2, elements.length);
+		List<?> roots = Arrays.asList(elements);
+		Profile rootProfile = null;
+		EPackage umlPackage = null;
+
+		for(final Object current : roots) {
+			if(current == UMLPackage.eINSTANCE) {
+				umlPackage = (EPackage)current;
+			} else if(current == this.rootProfile) {
+				rootProfile = (Profile)current;
+			}
+		}
+
+		Assert.assertNotNull(umlPackage);
+		Assert.assertNotNull(rootProfile);
+
+		//test the children for umlPackage
+		List<?> children = Arrays.asList(columnContentProvider.getChildren(umlPackage));
+		Assert.assertTrue(children.size() >= 242);//approximatly 242 metaclasses in UML
+
+		//test that we don't have the inherited properties
+		children = Arrays.asList(columnContentProvider.getChildren(UMLPackage.eINSTANCE.getClassifier()));
+		Assert.assertFalse(children.contains(UMLPackage.eINSTANCE.getNamedElement_Name()));
+
+
+		//test the children for the rootProfile
+		children = Arrays.asList(columnContentProvider.getChildren(rootProfile));
+		Assert.assertEquals(2, children.size());
+		Profile profile1 = null;
+		Package package1 = null;
+		for(final Object current : children) {
+			if(current instanceof Profile && ((Profile)current).getName().equals("Profile1")) {
+				profile1 = (Profile)current;
+			} else if(current instanceof Package && ((Package)current).getName().equals("Package1")) {
+				package1 = (Package)current;
+			}
+		}
+
+		Assert.assertNotNull(package1);
+		Assert.assertNotNull(profile1);
+
+		//test the children of package1
+		children = Arrays.asList(columnContentProvider.getChildren(package1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(subProfile1));
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(stereotype1));
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(prop1));
+
+
+
+		//test the children for profile1
+		children = Arrays.asList(columnContentProvider.getChildren(profile1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(subProfile2));
+
+
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(stereotype2));
+
+
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(prop2));
+
+	}
+
+	@Test
+	public void testWithRestrictionWithInheritedProperties() {
+		NattableModelManager modelManager = new NattableModelManager(table);
+		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(true);
+		columnContentProvider.setIgnoreInheritedElements(false);
+		Object[] elements = columnContentProvider.getElements();
+		Assert.assertEquals(2, elements.length);
+		List<?> roots = Arrays.asList(elements);
+		Profile rootProfile = null;
+		EPackage umlPackage = null;
+
+		for(final Object current : roots) {
+			if(current == UMLPackage.eINSTANCE) {
+				umlPackage = (EPackage)current;
+			} else if(current == this.rootProfile) {
+				rootProfile = (Profile)current;
+			}
+		}
+
+		Assert.assertNotNull(umlPackage);
+		Assert.assertNotNull(rootProfile);
+
+		//test the children for umlPackage
+		List<?> children = Arrays.asList(columnContentProvider.getChildren(umlPackage));
+		Assert.assertEquals(13, children.size());//1 of them is not displayed in the dialog, because it doesn't have valid feature
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getBehavioredClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getClass_()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getEncapsulatedClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamedElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamespace()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getPackageableElement()));//not displayed
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getParameterableElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getRedefinableElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getStructuredClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getTemplateableElement()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getType()));
+
+		//test that we have the inherited properties
+		children = Arrays.asList(columnContentProvider.getChildren(UMLPackage.eINSTANCE.getClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamedElement_Name()));
+
+
+		//test the children for the rootProfile
+		children = Arrays.asList(columnContentProvider.getChildren(rootProfile));
+		Assert.assertEquals(1, children.size());
+
+		Assert.assertTrue(children.contains(package1));
+
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(subProfile1));
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(stereotype1));
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(2, children.size());
+
+		Assert.assertTrue(children.contains(prop1));
+		Assert.assertTrue(children.contains(prop2));
+
+	}
+
+
+	@Test
+	public void testWithoutRestrictionWithInheritedProperties() {
+		NattableModelManager modelManager = new NattableModelManager(table);
+		IRestrictedContentProvider columnContentProvider = modelManager.getColumnAxisManager().createPossibleAxisContentProvider(false);
+		columnContentProvider.setIgnoreInheritedElements(false);
+		Object[] elements = columnContentProvider.getElements();
+		Assert.assertEquals(2, elements.length);
+		List<?> roots = Arrays.asList(elements);
+		Profile rootProfile = null;
+		EPackage umlPackage = null;
+
+		for(final Object current : roots) {
+			if(current == UMLPackage.eINSTANCE) {
+				umlPackage = (EPackage)current;
+			} else if(current == this.rootProfile) {
+				rootProfile = (Profile)current;
+			}
+		}
+
+		Assert.assertNotNull(umlPackage);
+		Assert.assertNotNull(rootProfile);
+
+		//test the children for umlPackage
+		List<?> children = Arrays.asList(columnContentProvider.getChildren(umlPackage));
+		Assert.assertTrue(children.size() >= 242);//approximatly 242 metaclasses in UML
+
+		//test that we have the inherited properties
+		children = Arrays.asList(columnContentProvider.getChildren(UMLPackage.eINSTANCE.getClassifier()));
+		Assert.assertTrue(children.contains(UMLPackage.eINSTANCE.getNamedElement_Name()));
+
+		//test the children for the rootProfile
+		children = Arrays.asList(columnContentProvider.getChildren(rootProfile));
+		Assert.assertEquals(2, children.size());
+		Profile profile1 = null;
+		Package package1 = null;
+		for(final Object current : children) {
+			if(current instanceof Profile && ((Profile)current).getName().equals("Profile1")) {
+				profile1 = (Profile)current;
+			} else if(current instanceof Package && ((Package)current).getName().equals("Package1")) {
+				package1 = (Package)current;
+			}
+		}
+
+		Assert.assertNotNull(package1);
+		Assert.assertNotNull(profile1);
+
+		//test the children of package1
+		children = Arrays.asList(columnContentProvider.getChildren(package1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(subProfile1));
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(stereotype1));
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(2, children.size());
+		Assert.assertTrue(children.contains(prop1));
+		Assert.assertTrue(children.contains(prop2));
+
+
+		//test the children for profile1
+		children = Arrays.asList(columnContentProvider.getChildren(profile1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(subProfile2));
+
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(stereotype2));
+
+
+		children = Arrays.asList(columnContentProvider.getChildren(children.get(0)));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(prop2));
+
+	}
+}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/META-INF/MANIFEST.MF
index 7cebeabfadf..c23d3a8d322 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %Bundle-Name

-Bundle-SymbolicName: org.eclipse.papyrus.uml.dynamic.profile.tests;singleton:=true

-Bundle-Version: 1.2.0.qualifier

-Bundle-Vendor: %Bundle-Vendor

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)"

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Bundle-ActivationPolicy: lazy

-Bundle-Description: %Bundle-Description

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.papyrus.uml.dynamic.profile.tests;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Bundle-Description: %Bundle-Description
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/META-INF/MANIFEST.MF
index 7140812766d..58553ce810a 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.filters.tests

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore;bundle-version="2.11.0";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.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,

- org.junit;visibility:=reexport,

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.filters.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.filters.tests
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="2.11.0";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.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
+ org.junit;visibility:=reexport,
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.filters.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF
index dc005a5ea4a..3f94c9f58e4 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.uml.modelrepair.internal.stereotypes,

- org.eclipse.papyrus.uml.modelrepair.internal.uripattern,

- org.eclipse.papyrus.uml.modelrepair.tests

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.100.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.modelrepair.internal.stereotypes,
+ org.eclipse.papyrus.uml.modelrepair.internal.uripattern,
+ org.eclipse.papyrus.uml.modelrepair.tests
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.100.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.tests;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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.project b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.project
index bb00c355cb3..4e55ea97b34 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.project
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.service.types.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.service.types.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF
index 8d6bdf7a9f3..6bb423c4a3e 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.hamcrest.core,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.uml.service.types.tests.creation,

- org.eclipse.papyrus.uml.service.types.tests.deletion,

- org.eclipse.papyrus.uml.service.types.tests.registry,

- org.eclipse.papyrus.uml.service.types.tests.suites

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.hamcrest.core,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.service.types.tests.creation,
+ org.eclipse.papyrus.uml.service.types.tests.deletion,
+ org.eclipse.papyrus.uml.service.types.tests.registry,
+ org.eclipse.papyrus.uml.service.types.tests.suites
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/about.html b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/about.html
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/plugin.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/plugin.properties
index e36d4bacc5c..90cf75fb639 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/plugin.properties
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/plugin.properties
@@ -1,14 +1,14 @@
-#################################################################################

-# 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.

-#

-##################################################################################

-pluginName=Papyrus UML Service Types Tests

-providerName=Eclipse Modeling Project

+#################################################################################
+# 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.
+#
+##################################################################################
+pluginName=Papyrus UML Service Types Tests
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.di
index 1a38b5c6e6b..9288b174c34 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.di
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="TestPureUMLModel.notation#_ifkzQKjqEeKyBfPA9htSew"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="TestPureUMLModel.notation#_ifkzQKjqEeKyBfPA9htSew"/>

-        </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="TestPureUMLModel.notation#_ifkzQKjqEeKyBfPA9htSew"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="TestPureUMLModel.notation#_ifkzQKjqEeKyBfPA9htSew"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.notation
index 0c72ca5d6a8..171b743d186 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.notation
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.notation
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_ifkzQKjqEeKyBfPA9htSew" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_ifkzQajqEeKyBfPA9htSew"/>

-  <element xmi:type="uml:Model" href="TestPureUMLModel.uml#_05JHMJLTEeK-Fomwlc5mQg"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_ifkzQKjqEeKyBfPA9htSew" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_ifkzQajqEeKyBfPA9htSew"/>
+  <element xmi:type="uml:Model" href="TestPureUMLModel.uml#_05JHMJLTEeK-Fomwlc5mQg"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.uml
index 252d0028787..4710d783cbf 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.uml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestPureUMLModel.uml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_05JHMJLTEeK-Fomwlc5mQg" name="TestModel">

-  <packagedElement xmi:type="uml:Activity" xmi:id="_61hmEJLTEeK-Fomwlc5mQg" name="TestActivity"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_l6hf4JLgEeKQTaIG2N8aVQ" name="TestClass"/>

-  <packagedElement xmi:type="uml:Activity" xmi:id="_n84ZMJLgEeKQTaIG2N8aVQ" name="TestActivityWithNode" node="_zKYzcJLgEeKQTaIG2N8aVQ">

-    <node xmi:type="uml:CentralBufferNode" xmi:id="_zKYzcJLgEeKQTaIG2N8aVQ" name="CentralBufferNode1">

-      <upperBound xmi:type="uml:LiteralInteger" xmi:id="_zKhWUJLgEeKQTaIG2N8aVQ" value="1"/>

-    </node>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Activity" xmi:id="_Nsk64KjpEeK-PI9mVkoyCA" name="TestActivityDelete" node="_YadZ4KjpEeK-PI9mVkoyCA _YuwO4KjpEeK-PI9mVkoyCA _kjcvgKjqEeKyBfPA9htSew _mpfO8KjqEeKyBfPA9htSew">

-    <node xmi:type="uml:CentralBufferNode" xmi:id="_YadZ4KjpEeK-PI9mVkoyCA" name="CentralBufferNode1">

-      <upperBound xmi:type="uml:LiteralInteger" xmi:id="_YadZ4ajpEeK-PI9mVkoyCA" value="1"/>

-    </node>

-    <node xmi:type="uml:CentralBufferNode" xmi:id="_YuwO4KjpEeK-PI9mVkoyCA" name="CentralBufferNode2">

-      <upperBound xmi:type="uml:LiteralInteger" xmi:id="_YuwO4ajpEeK-PI9mVkoyCA" value="1"/>

-    </node>

-    <node xmi:type="uml:AddVariableValueAction" xmi:id="_kjcvgKjqEeKyBfPA9htSew" name="AddVariableValueAction1">

-      <value xmi:id="_klBc0KjqEeKyBfPA9htSew" name="value">

-        <upperBound xmi:type="uml:LiteralInteger" xmi:id="_klCD4KjqEeKyBfPA9htSew" value="1"/>

-      </value>

-      <insertAt xmi:id="_klNqEKjqEeKyBfPA9htSew" name="insertAt">

-        <upperBound xmi:type="uml:LiteralInteger" xmi:id="_klNqEajqEeKyBfPA9htSew" value="1"/>

-      </insertAt>

-    </node>

-    <node xmi:type="uml:AddVariableValueAction" xmi:id="_mpfO8KjqEeKyBfPA9htSew" name="AddVariableValueAction2">

-      <value xmi:id="_mp3pcKjqEeKyBfPA9htSew" name="value">

-        <upperBound xmi:type="uml:LiteralInteger" xmi:id="_mp3pcajqEeKyBfPA9htSew" value="1"/>

-      </value>

-      <insertAt xmi:id="_mqG6AKjqEeKyBfPA9htSew" name="insertAt">

-        <upperBound xmi:type="uml:LiteralInteger" xmi:id="_mqG6AajqEeKyBfPA9htSew" value="1"/>

-      </insertAt>

-    </node>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_05JHMJLTEeK-Fomwlc5mQg" name="TestModel">
+  <packagedElement xmi:type="uml:Activity" xmi:id="_61hmEJLTEeK-Fomwlc5mQg" name="TestActivity"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_l6hf4JLgEeKQTaIG2N8aVQ" name="TestClass"/>
+  <packagedElement xmi:type="uml:Activity" xmi:id="_n84ZMJLgEeKQTaIG2N8aVQ" name="TestActivityWithNode" node="_zKYzcJLgEeKQTaIG2N8aVQ">
+    <node xmi:type="uml:CentralBufferNode" xmi:id="_zKYzcJLgEeKQTaIG2N8aVQ" name="CentralBufferNode1">
+      <upperBound xmi:type="uml:LiteralInteger" xmi:id="_zKhWUJLgEeKQTaIG2N8aVQ" value="1"/>
+    </node>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Activity" xmi:id="_Nsk64KjpEeK-PI9mVkoyCA" name="TestActivityDelete" node="_YadZ4KjpEeK-PI9mVkoyCA _YuwO4KjpEeK-PI9mVkoyCA _kjcvgKjqEeKyBfPA9htSew _mpfO8KjqEeKyBfPA9htSew">
+    <node xmi:type="uml:CentralBufferNode" xmi:id="_YadZ4KjpEeK-PI9mVkoyCA" name="CentralBufferNode1">
+      <upperBound xmi:type="uml:LiteralInteger" xmi:id="_YadZ4ajpEeK-PI9mVkoyCA" value="1"/>
+    </node>
+    <node xmi:type="uml:CentralBufferNode" xmi:id="_YuwO4KjpEeK-PI9mVkoyCA" name="CentralBufferNode2">
+      <upperBound xmi:type="uml:LiteralInteger" xmi:id="_YuwO4ajpEeK-PI9mVkoyCA" value="1"/>
+    </node>
+    <node xmi:type="uml:AddVariableValueAction" xmi:id="_kjcvgKjqEeKyBfPA9htSew" name="AddVariableValueAction1">
+      <value xmi:id="_klBc0KjqEeKyBfPA9htSew" name="value">
+        <upperBound xmi:type="uml:LiteralInteger" xmi:id="_klCD4KjqEeKyBfPA9htSew" value="1"/>
+      </value>
+      <insertAt xmi:id="_klNqEKjqEeKyBfPA9htSew" name="insertAt">
+        <upperBound xmi:type="uml:LiteralInteger" xmi:id="_klNqEajqEeKyBfPA9htSew" value="1"/>
+      </insertAt>
+    </node>
+    <node xmi:type="uml:AddVariableValueAction" xmi:id="_mpfO8KjqEeKyBfPA9htSew" name="AddVariableValueAction2">
+      <value xmi:id="_mp3pcKjqEeKyBfPA9htSew" name="value">
+        <upperBound xmi:type="uml:LiteralInteger" xmi:id="_mp3pcajqEeKyBfPA9htSew" value="1"/>
+      </value>
+      <insertAt xmi:id="_mqG6AKjqEeKyBfPA9htSew" name="insertAt">
+        <upperBound xmi:type="uml:LiteralInteger" xmi:id="_mqG6AajqEeKyBfPA9htSew" value="1"/>
+      </insertAt>
+    </node>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.di
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.notation
index eb19de96962..923af847545 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.notation
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.notation
@@ -1,375 +1,375 @@
-<?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: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">

-  <notation:Diagram xmi:id="_X6pV4BjYEeaV3KztP2zOoA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_A0u4UBjaEeaV3KztP2zOoA" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_A0wtgBjaEeaV3KztP2zOoA" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A0u4URjaEeaV3KztP2zOoA" x="313" y="195" width="342" height="232"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_BPmPYBjaEeaV3KztP2zOoA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_BPmPYhjaEeaV3KztP2zOoA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_BPmPYxjaEeaV3KztP2zOoA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BPmPZBjaEeaV3KztP2zOoA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_BPm2cBjaEeaV3KztP2zOoA" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BPm2cRjaEeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BPm2chjaEeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BPm2cxjaEeaV3KztP2zOoA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPm2dBjaEeaV3KztP2zOoA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_BPm2dRjaEeaV3KztP2zOoA" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BPm2dhjaEeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BPm2dxjaEeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BPm2eBjaEeaV3KztP2zOoA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPm2eRjaEeaV3KztP2zOoA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_BPndgBjaEeaV3KztP2zOoA" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BPndgRjaEeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_BPndghjaEeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BPndgxjaEeaV3KztP2zOoA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPndhBjaEeaV3KztP2zOoA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_BPe6oBjaEeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPmPYRjaEeaV3KztP2zOoA" x="930" y="39" width="348" height="247"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_rgyG0Bt8EeaV3KztP2zOoA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_rgyt4Bt8EeaV3KztP2zOoA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_rgyt4Rt8EeaV3KztP2zOoA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rgyt4ht8EeaV3KztP2zOoA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_rgyt4xt8EeaV3KztP2zOoA" type="Class_AttributeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_rgyt5Bt8EeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_rgyt5Rt8EeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rgyt5ht8EeaV3KztP2zOoA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rgyt5xt8EeaV3KztP2zOoA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_rgyt6Bt8EeaV3KztP2zOoA" type="Class_OperationCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_rgyt6Rt8EeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_rgyt6ht8EeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rgyt6xt8EeaV3KztP2zOoA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rgyt7Bt8EeaV3KztP2zOoA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_rgyt7Rt8EeaV3KztP2zOoA" type="Class_NestedClassifierCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_rgyt7ht8EeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_rgyt7xt8EeaV3KztP2zOoA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rgyt8Bt8EeaV3KztP2zOoA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rgyt8Rt8EeaV3KztP2zOoA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_rgwRoBt8EeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rgyG0Rt8EeaV3KztP2zOoA" x="1002" y="484" width="202" height="143"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_uV89IBt8EeaV3KztP2zOoA" type="Constraint_PackagedElementShape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_uV89Iht8EeaV3KztP2zOoA" type="Constraint_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_uV89Ixt8EeaV3KztP2zOoA" type="Constraint_BodyLabel"/>

-      <element xmi:type="uml:Constraint" href="model.uml#_uV4EoBt8EeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uV89IRt8EeaV3KztP2zOoA" x="17" y="11" width="148" height="111"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_zhTAoBt8EeaV3KztP2zOoA" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_zhTnsBt8EeaV3KztP2zOoA" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="model.uml#_zhSZkBt8EeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zhTAoRt8EeaV3KztP2zOoA" x="28" y="488" width="192" height="97"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_rdDA4Bt9EeaV3KztP2zOoA" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_rdEPABt9EeaV3KztP2zOoA" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rdDA4Rt9EeaV3KztP2zOoA" x="298" y="506" width="241" height="141"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_X6pV4RjYEeaV3KztP2zOoA" name="diagram_compatibility_version" stringValue="1.2.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_X6pV4hjYEeaV3KztP2zOoA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_X6pV4xjYEeaV3KztP2zOoA">

-      <owner xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>

-    </styles>

-    <element xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>

-    <edges xmi:type="notation:Connector" xmi:id="_Cqh8UBjaEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_A0u4UBjaEeaV3KztP2zOoA" target="_BPmPYBjaEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Cqh8URjaEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Cqh8UhjaEeaV3KztP2zOoA" points="[655, 352, -643984, -643984]$[836, 438, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CsCYMBjaEeaV3KztP2zOoA" id="(1.0,0.673728813559322)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CsC_QBjaEeaV3KztP2zOoA" id="(0.0,0.17813765182186234)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_tDfPsBt8EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_A0u4UBjaEeaV3KztP2zOoA" target="_rgyG0Bt8EeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_tDf2wBt8EeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tDf2wRt8EeaV3KztP2zOoA" points="[655, 393, -643984, -643984]$[1002, 511, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tDoZoBt8EeaV3KztP2zOoA" id="(1.0,0.8494795695899853)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tDoZoRt8EeaV3KztP2zOoA" id="(0.0,0.1888111888111888)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_wWsF0Bt8EeaV3KztP2zOoA" type="Constraint_ContextEdge" source="_uV89IBt8EeaV3KztP2zOoA" target="_BPmPYBjaEeaV3KztP2zOoA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_wWsF0xt8EeaV3KztP2zOoA" type="Constraint_KeywordLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wWsF1Bt8EeaV3KztP2zOoA" y="15"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_wWsF0Rt8EeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wWsF0ht8EeaV3KztP2zOoA" points="[165, 91, -643984, -643984]$[930, 97, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wXSiwBt8EeaV3KztP2zOoA" id="(1.0,0.4860585836114202)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wXSiwRt8EeaV3KztP2zOoA" id="(0.0,0.06882591093117409)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_-SAKIBt8EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_zhTAoBt8EeaV3KztP2zOoA" target="_A0u4UBjaEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_-SAxMBt8EeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-SAxMRt8EeaV3KztP2zOoA" points="[208, 498, -643984, -643984]$[313, 418, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-SNlgBt8EeaV3KztP2zOoA" id="(0.765625,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-SNlgRt8EeaV3KztP2zOoA" id="(0.0,0.9533898305084746)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_CAd_8Bt9EeaV3KztP2zOoA" type="Constraint_ConstrainedElementEdge" source="_uV89IBt8EeaV3KztP2zOoA" target="_A0u4UBjaEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_CAd_8Rt9EeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CAd_8ht9EeaV3KztP2zOoA" points="[162, 122, -643984, -643984]$[313, 233, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CAvswBt9EeaV3KztP2zOoA" id="(0.9723507380480284,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CAvswRt9EeaV3KztP2zOoA" id="(0.0,0.1731285310734464)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_i8SgwBt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_A0u4UBjaEeaV3KztP2zOoA" target="_uV89IBt8EeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_i8SgwRt9EeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i8Sgwht9EeaV3KztP2zOoA" points="[313, 286, -643984, -643984]$[60, 122, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i8c40Bt9EeaV3KztP2zOoA" id="(0.0,0.3922830923248053)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i8c40Rt9EeaV3KztP2zOoA" id="(0.2908766975931156,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_tJeGcBt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_rdDA4Bt9EeaV3KztP2zOoA" target="_BPmPYBjaEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_tJeGcRt9EeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tJeGcht9EeaV3KztP2zOoA" points="[539, 514, -643984, -643984]$[930, 245, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tJsv8Bt9EeaV3KztP2zOoA" id="(1.0,0.06226219827717356)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tJsv8Rt9EeaV3KztP2zOoA" id="(0.0,0.8340080971659919)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_thEHEBt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_rdDA4Bt9EeaV3KztP2zOoA" target="_rgyG0Bt8EeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_thEHERt9EeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_thEHEht9EeaV3KztP2zOoA" points="[539, 598, -643984, -643984]$[1002, 568, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thPGMBt9EeaV3KztP2zOoA" id="(1.0,0.6573639126830619)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thPGMRt9EeaV3KztP2zOoA" id="(0.0,0.5874125874125874)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_uAPWYBt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_rdDA4Bt9EeaV3KztP2zOoA" target="_uV89IBt8EeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_uAPWYRt9EeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uAPWYht9EeaV3KztP2zOoA" points="[323, 506, -643984, -643984]$[90, 122, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uAa8kBt9EeaV3KztP2zOoA" id="(0.10631378266233059,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uAa8kRt9EeaV3KztP2zOoA" id="(0.4939737034331631,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_u6Tx8Bt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_zhTAoBt8EeaV3KztP2zOoA" target="_rdDA4Bt9EeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_u6Tx8Rt9EeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u6Tx8ht9EeaV3KztP2zOoA" points="[220, 557, -643984, -643984]$[298, 571, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u6exEBt9EeaV3KztP2zOoA" id="(1.0,0.7203212953007403)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u6exERt9EeaV3KztP2zOoA" id="(0.0,0.46290736631423274)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_cZdcwBwIEeaV3KztP2zOoA" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_eUYRUBwIEeaV3KztP2zOoA" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_eUY4YBwIEeaV3KztP2zOoA" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eUYRURwIEeaV3KztP2zOoA" x="217" y="380" width="461" height="187"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_eUlFoBwIEeaV3KztP2zOoA" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_eUlFohwIEeaV3KztP2zOoA" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="model.uml#_zhSZkBt8EeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eUlFoRwIEeaV3KztP2zOoA" x="-125" y="617" width="337" height="167"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_gtFOEBwIEeaV3KztP2zOoA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_gtFOEhwIEeaV3KztP2zOoA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_gtF1IBwIEeaV3KztP2zOoA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gtF1IRwIEeaV3KztP2zOoA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_gtF1IhwIEeaV3KztP2zOoA" type="Class_StructureCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_gtF1IxwIEeaV3KztP2zOoA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gtF1JBwIEeaV3KztP2zOoA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_BPe6oBjaEeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gtFOERwIEeaV3KztP2zOoA" x="752" y="109" width="111" height="106"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_gtrrABwIEeaV3KztP2zOoA" type="Class_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_gtrrAhwIEeaV3KztP2zOoA" type="Class_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_gtrrAxwIEeaV3KztP2zOoA" type="Class_FloatingNameLabel">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gtrrBBwIEeaV3KztP2zOoA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_gtsSEBwIEeaV3KztP2zOoA" type="Class_StructureCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_gtsSERwIEeaV3KztP2zOoA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gtsSEhwIEeaV3KztP2zOoA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_rgwRoBt8EeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gtrrARwIEeaV3KztP2zOoA" x="829" y="264" width="94" height="157"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_iDau4BwIEeaV3KztP2zOoA" type="Constraint_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_iDbV8BwIEeaV3KztP2zOoA" type="Constraint_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_iDbV8RwIEeaV3KztP2zOoA" type="Constraint_BodyLabel"/>

-      <element xmi:type="uml:Constraint" href="model.uml#_uV4EoBt8EeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iDau4RwIEeaV3KztP2zOoA" x="20" y="25"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ton3cBwIEeaV3KztP2zOoA" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ton3chwIEeaV3KztP2zOoA" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ton3cRwIEeaV3KztP2zOoA" x="345" y="648" width="215" height="131"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_cZdcwRwIEeaV3KztP2zOoA" name="diagram_compatibility_version" stringValue="1.2.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_cZdcwhwIEeaV3KztP2zOoA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_cZdcwxwIEeaV3KztP2zOoA">

-      <owner xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>

-    </styles>

-    <element xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>

-    <edges xmi:type="notation:Connector" xmi:id="_iD6eIBwIEeaV3KztP2zOoA" type="Constraint_ConstrainedElementEdge" source="_iDau4BwIEeaV3KztP2zOoA" target="_eUYRUBwIEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_iD6eIRwIEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iD6eIhwIEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[359, 380, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SyOtsBwREeaV3KztP2zOoA" id="(0.5860655737704918,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SyPUwBwREeaV3KztP2zOoA" id="(0.351409978308026,0.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_oji0ABwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUYRUBwIEeaV3KztP2zOoA" target="_gtFOEBwIEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_oji0ARwIEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oji0AhwIEeaV3KztP2zOoA" points="[561, 380, -643984, -643984]$[752, 212, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ojvBQBwIEeaV3KztP2zOoA" id="(0.7463163814573793,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ojvBQRwIEeaV3KztP2zOoA" id="(0.0,0.9716981132075472)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_o3iHABwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUYRUBwIEeaV3KztP2zOoA" target="_gtrrABwIEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_o3iHARwIEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o3iHAhwIEeaV3KztP2zOoA" points="[678, 430, -643984, -643984]$[829, 367, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3qC0BwIEeaV3KztP2zOoA" id="(1.0,0.2716262975778548)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3qC0RwIEeaV3KztP2zOoA" id="(0.0,0.6560509554140127)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_pPf7EBwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUYRUBwIEeaV3KztP2zOoA" target="_iDau4BwIEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_pPf7ERwIEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pPf7EhwIEeaV3KztP2zOoA" points="[312, 380, -643984, -643984]$[245, 126, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pPmowBwIEeaV3KztP2zOoA" id="(0.20607375271149675,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pPmowRwIEeaV3KztP2zOoA" id="(0.4098360655737705,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_rvaTEBwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUlFoBwIEeaV3KztP2zOoA" target="_eUYRUBwIEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_rvaTERwIEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rvaTEhwIEeaV3KztP2zOoA" points="[312, 626, -643984, -643984]$[345, 567, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rvrY0BwIEeaV3KztP2zOoA" id="(0.4421364985163205,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rvr_4BwIEeaV3KztP2zOoA" id="(0.27765726681127983,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_toxBYBwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_ton3cBwIEeaV3KztP2zOoA" target="_gtFOEBwIEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_toxBYRwIEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_toxBYhwIEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[752, 150, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4ARwIEeaV3KztP2zOoA" id="(1.0,0.4580152671755725)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4AhwIEeaV3KztP2zOoA" id="(0.0,0.5)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_to2g8BwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_ton3cBwIEeaV3KztP2zOoA" target="_gtrrABwIEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_to2g8RwIEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_to2g8hwIEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[829, 324, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4AxwIEeaV3KztP2zOoA" id="(1.0,0.9618320610687023)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4BBwIEeaV3KztP2zOoA" id="(0.0,0.33121019108280253)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_to9OoBwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_ton3cBwIEeaV3KztP2zOoA" target="_iDau4BwIEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_to9OoRwIEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_to9OohwIEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[183, 66, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqxQ8BwIEeaV3KztP2zOoA" id="(0.0,0.2900763358778626)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4ABwIEeaV3KztP2zOoA" id="(1.0,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_zHgiABwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUlFoBwIEeaV3KztP2zOoA" target="_ton3cBwIEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_zHgiARwIEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zHgiAhwIEeaV3KztP2zOoA" points="[452, 626, -643984, -643984]$[530, 210, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zHqTABwIEeaV3KztP2zOoA" id="(1.0,0.19161676646706588)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zHqTARwIEeaV3KztP2zOoA" id="(0.0,0.6793893129770993)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_8TTMEBwcEeaV3KztP2zOoA" type="PapyrusUMLComponentDiagram" name="ComponentDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_-SvUQBwcEeaV3KztP2zOoA" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_-SvUQhwcEeaV3KztP2zOoA" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="model.uml#_zhSZkBt8EeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-SvUQRwcEeaV3KztP2zOoA" y="617" width="608" height="209"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_-S66cBwcEeaV3KztP2zOoA" type="NamedElement_DefaultShape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_-S7hgBwcEeaV3KztP2zOoA" type="NamedElement_NameLabel"/>

-      <element xmi:type="uml:Class" href="model.uml#_BPe6oBjaEeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-S66cRwcEeaV3KztP2zOoA" x="1459" y="57"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_-TdtABwcEeaV3KztP2zOoA" type="Constraint_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_-TeUERwcEeaV3KztP2zOoA" type="Constraint_NameLabel"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_-TeUEhwcEeaV3KztP2zOoA" type="Constraint_BodyLabel"/>

-      <element xmi:type="uml:Constraint" href="model.uml#_uV4EoBt8EeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-TeUEBwcEeaV3KztP2zOoA" x="273" y="163"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_-T9cQBwcEeaV3KztP2zOoA" type="NamedElement_DefaultShape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_-T-DUBwcEeaV3KztP2zOoA" type="NamedElement_NameLabel"/>

-      <element xmi:type="uml:Class" href="model.uml#_rgwRoBt8EeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-T9cQRwcEeaV3KztP2zOoA" x="1446" y="240"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_BkZSQBwdEeaV3KztP2zOoA" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_BkZSQhwdEeaV3KztP2zOoA" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BkZSQRwdEeaV3KztP2zOoA" x="813" y="629" width="423" height="183"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_DB2uwBwdEeaV3KztP2zOoA" type="Comment_Shape">

-      <children xmi:type="notation:DecorationNode" xmi:id="_DB2uwhwdEeaV3KztP2zOoA" type="Comment_BodyLabel"/>

-      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DB2uwRwdEeaV3KztP2zOoA" x="773" y="137" width="435" height="308"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_8TTMERwcEeaV3KztP2zOoA" name="diagram_compatibility_version" stringValue="1.2.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_8TTMEhwcEeaV3KztP2zOoA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_8TTMExwcEeaV3KztP2zOoA">

-      <owner xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>

-    </styles>

-    <element xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>

-    <edges xmi:type="notation:Connector" xmi:id="_BkhOEBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_BkZSQBwdEeaV3KztP2zOoA" target="_-S66cBwcEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_BkhOERwdEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BkhOEhwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[1459, 79, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EIBsoBwdEeaV3KztP2zOoA" id="(0.6619385342789598,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EICTsBwdEeaV3KztP2zOoA" id="(0.31,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_BktbUBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_BkZSQBwdEeaV3KztP2zOoA" target="_-T9cQBwcEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_BktbURwdEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BktbUhwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[1446, 256, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EICTsRwdEeaV3KztP2zOoA" id="(0.723404255319149,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EICTshwdEeaV3KztP2zOoA" id="(0.24,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_BkyT0BwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_BkZSQBwdEeaV3KztP2zOoA" target="_-TdtABwcEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_BkyT0RwdEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BkyT0hwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[333, 163, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EH-pUBwdEeaV3KztP2zOoA" id="(0.24113475177304963,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EH-pURwdEeaV3KztP2zOoA" id="(0.6434426229508197,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_DB81YBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_DB2uwBwdEeaV3KztP2zOoA" target="_-S66cBwcEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_DB81YRwdEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DB81YhwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[1459, 79, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GJkBwdEeaV3KztP2zOoA" id="(1.0,0.21428571428571427)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GJkRwdEeaV3KztP2zOoA" id="(0.0,0.9)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_DCBt4BwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_DB2uwBwdEeaV3KztP2zOoA" target="_-T9cQBwcEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_DCBt4RwdEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DCBt4hwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[1446, 256, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GwoBwdEeaV3KztP2zOoA" id="(1.0,0.461038961038961)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GwoRwdEeaV3KztP2zOoA" id="(0.0,0.54)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_DCH0gBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_DB2uwBwdEeaV3KztP2zOoA" target="_-TdtABwcEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_DCH0gRwdEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DCH0ghwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[333, 163, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GwohwdEeaV3KztP2zOoA" id="(0.0,0.38311688311688313)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GwoxwdEeaV3KztP2zOoA" id="(1.0,0.8333333333333334)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_HbqnoBwdEeaV3KztP2zOoA" type="Constraint_ConstrainedElementEdge" source="_-TdtABwcEeaV3KztP2zOoA" target="_BkZSQBwdEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_HbqnoRwdEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HbqnohwdEeaV3KztP2zOoA" points="[345, 223, -643984, -643984]$[813, 647, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hb4DABwdEeaV3KztP2zOoA" id="(0.29799438492319613,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hb4qEBwdEeaV3KztP2zOoA" id="(0.0,0.10194824872674658)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_H_qskBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_-SvUQBwcEeaV3KztP2zOoA" target="_DB2uwBwdEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_H_qskRwdEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H_qskhwdEeaV3KztP2zOoA" points="[504, 617, -643984, -643984]$[798, 445, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H_1EoBwdEeaV3KztP2zOoA" id="(0.8302919708029196,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H_1EoRwdEeaV3KztP2zOoA" id="(0.058847218726403076,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_OhHnYBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_-SvUQBwcEeaV3KztP2zOoA" target="_BkZSQBwdEeaV3KztP2zOoA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_OhHnYRwdEeaV3KztP2zOoA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OhHnYhwdEeaV3KztP2zOoA" points="[608, 721, -643984, -643984]$[813, 732, -643984, -643984]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OhR_cBwdEeaV3KztP2zOoA" id="(1.0,0.49763813122847644)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OhR_cRwdEeaV3KztP2zOoA" id="(0.0,0.5669833977237134)"/>

-    </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: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">
+  <notation:Diagram xmi:id="_X6pV4BjYEeaV3KztP2zOoA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_A0u4UBjaEeaV3KztP2zOoA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_A0wtgBjaEeaV3KztP2zOoA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A0u4URjaEeaV3KztP2zOoA" x="313" y="195" width="342" height="232"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BPmPYBjaEeaV3KztP2zOoA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BPmPYhjaEeaV3KztP2zOoA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BPmPYxjaEeaV3KztP2zOoA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BPmPZBjaEeaV3KztP2zOoA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BPm2cBjaEeaV3KztP2zOoA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BPm2cRjaEeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BPm2chjaEeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BPm2cxjaEeaV3KztP2zOoA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPm2dBjaEeaV3KztP2zOoA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BPm2dRjaEeaV3KztP2zOoA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BPm2dhjaEeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BPm2dxjaEeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BPm2eBjaEeaV3KztP2zOoA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPm2eRjaEeaV3KztP2zOoA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BPndgBjaEeaV3KztP2zOoA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BPndgRjaEeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BPndghjaEeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BPndgxjaEeaV3KztP2zOoA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPndhBjaEeaV3KztP2zOoA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_BPe6oBjaEeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BPmPYRjaEeaV3KztP2zOoA" x="930" y="39" width="348" height="247"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rgyG0Bt8EeaV3KztP2zOoA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rgyt4Bt8EeaV3KztP2zOoA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rgyt4Rt8EeaV3KztP2zOoA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rgyt4ht8EeaV3KztP2zOoA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rgyt4xt8EeaV3KztP2zOoA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rgyt5Bt8EeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rgyt5Rt8EeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rgyt5ht8EeaV3KztP2zOoA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rgyt5xt8EeaV3KztP2zOoA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rgyt6Bt8EeaV3KztP2zOoA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rgyt6Rt8EeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rgyt6ht8EeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rgyt6xt8EeaV3KztP2zOoA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rgyt7Bt8EeaV3KztP2zOoA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rgyt7Rt8EeaV3KztP2zOoA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rgyt7ht8EeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rgyt7xt8EeaV3KztP2zOoA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rgyt8Bt8EeaV3KztP2zOoA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rgyt8Rt8EeaV3KztP2zOoA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_rgwRoBt8EeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rgyG0Rt8EeaV3KztP2zOoA" x="1002" y="484" width="202" height="143"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_uV89IBt8EeaV3KztP2zOoA" type="Constraint_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_uV89Iht8EeaV3KztP2zOoA" type="Constraint_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uV89Ixt8EeaV3KztP2zOoA" type="Constraint_BodyLabel"/>
+      <element xmi:type="uml:Constraint" href="model.uml#_uV4EoBt8EeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uV89IRt8EeaV3KztP2zOoA" x="17" y="11" width="148" height="111"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_zhTAoBt8EeaV3KztP2zOoA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zhTnsBt8EeaV3KztP2zOoA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_zhSZkBt8EeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zhTAoRt8EeaV3KztP2zOoA" x="28" y="488" width="192" height="97"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rdDA4Bt9EeaV3KztP2zOoA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rdEPABt9EeaV3KztP2zOoA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rdDA4Rt9EeaV3KztP2zOoA" x="298" y="506" width="241" height="141"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_X6pV4RjYEeaV3KztP2zOoA" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_X6pV4hjYEeaV3KztP2zOoA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_X6pV4xjYEeaV3KztP2zOoA">
+      <owner xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Cqh8UBjaEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_A0u4UBjaEeaV3KztP2zOoA" target="_BPmPYBjaEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Cqh8URjaEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Cqh8UhjaEeaV3KztP2zOoA" points="[655, 352, -643984, -643984]$[836, 438, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CsCYMBjaEeaV3KztP2zOoA" id="(1.0,0.673728813559322)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CsC_QBjaEeaV3KztP2zOoA" id="(0.0,0.17813765182186234)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_tDfPsBt8EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_A0u4UBjaEeaV3KztP2zOoA" target="_rgyG0Bt8EeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_tDf2wBt8EeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tDf2wRt8EeaV3KztP2zOoA" points="[655, 393, -643984, -643984]$[1002, 511, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tDoZoBt8EeaV3KztP2zOoA" id="(1.0,0.8494795695899853)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tDoZoRt8EeaV3KztP2zOoA" id="(0.0,0.1888111888111888)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_wWsF0Bt8EeaV3KztP2zOoA" type="Constraint_ContextEdge" source="_uV89IBt8EeaV3KztP2zOoA" target="_BPmPYBjaEeaV3KztP2zOoA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_wWsF0xt8EeaV3KztP2zOoA" type="Constraint_KeywordLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wWsF1Bt8EeaV3KztP2zOoA" y="15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_wWsF0Rt8EeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wWsF0ht8EeaV3KztP2zOoA" points="[165, 91, -643984, -643984]$[930, 97, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wXSiwBt8EeaV3KztP2zOoA" id="(1.0,0.4860585836114202)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wXSiwRt8EeaV3KztP2zOoA" id="(0.0,0.06882591093117409)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-SAKIBt8EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_zhTAoBt8EeaV3KztP2zOoA" target="_A0u4UBjaEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_-SAxMBt8EeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-SAxMRt8EeaV3KztP2zOoA" points="[208, 498, -643984, -643984]$[313, 418, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-SNlgBt8EeaV3KztP2zOoA" id="(0.765625,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-SNlgRt8EeaV3KztP2zOoA" id="(0.0,0.9533898305084746)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CAd_8Bt9EeaV3KztP2zOoA" type="Constraint_ConstrainedElementEdge" source="_uV89IBt8EeaV3KztP2zOoA" target="_A0u4UBjaEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_CAd_8Rt9EeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CAd_8ht9EeaV3KztP2zOoA" points="[162, 122, -643984, -643984]$[313, 233, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CAvswBt9EeaV3KztP2zOoA" id="(0.9723507380480284,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CAvswRt9EeaV3KztP2zOoA" id="(0.0,0.1731285310734464)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_i8SgwBt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_A0u4UBjaEeaV3KztP2zOoA" target="_uV89IBt8EeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_i8SgwRt9EeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i8Sgwht9EeaV3KztP2zOoA" points="[313, 286, -643984, -643984]$[60, 122, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i8c40Bt9EeaV3KztP2zOoA" id="(0.0,0.3922830923248053)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i8c40Rt9EeaV3KztP2zOoA" id="(0.2908766975931156,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_tJeGcBt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_rdDA4Bt9EeaV3KztP2zOoA" target="_BPmPYBjaEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_tJeGcRt9EeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tJeGcht9EeaV3KztP2zOoA" points="[539, 514, -643984, -643984]$[930, 245, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tJsv8Bt9EeaV3KztP2zOoA" id="(1.0,0.06226219827717356)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tJsv8Rt9EeaV3KztP2zOoA" id="(0.0,0.8340080971659919)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_thEHEBt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_rdDA4Bt9EeaV3KztP2zOoA" target="_rgyG0Bt8EeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_thEHERt9EeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_thEHEht9EeaV3KztP2zOoA" points="[539, 598, -643984, -643984]$[1002, 568, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thPGMBt9EeaV3KztP2zOoA" id="(1.0,0.6573639126830619)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thPGMRt9EeaV3KztP2zOoA" id="(0.0,0.5874125874125874)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uAPWYBt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_rdDA4Bt9EeaV3KztP2zOoA" target="_uV89IBt8EeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_uAPWYRt9EeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uAPWYht9EeaV3KztP2zOoA" points="[323, 506, -643984, -643984]$[90, 122, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uAa8kBt9EeaV3KztP2zOoA" id="(0.10631378266233059,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uAa8kRt9EeaV3KztP2zOoA" id="(0.4939737034331631,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_u6Tx8Bt9EeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_zhTAoBt8EeaV3KztP2zOoA" target="_rdDA4Bt9EeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_u6Tx8Rt9EeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u6Tx8ht9EeaV3KztP2zOoA" points="[220, 557, -643984, -643984]$[298, 571, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u6exEBt9EeaV3KztP2zOoA" id="(1.0,0.7203212953007403)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u6exERt9EeaV3KztP2zOoA" id="(0.0,0.46290736631423274)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_cZdcwBwIEeaV3KztP2zOoA" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_eUYRUBwIEeaV3KztP2zOoA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_eUY4YBwIEeaV3KztP2zOoA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eUYRURwIEeaV3KztP2zOoA" x="217" y="380" width="461" height="187"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_eUlFoBwIEeaV3KztP2zOoA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_eUlFohwIEeaV3KztP2zOoA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_zhSZkBt8EeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eUlFoRwIEeaV3KztP2zOoA" x="-125" y="617" width="337" height="167"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_gtFOEBwIEeaV3KztP2zOoA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_gtFOEhwIEeaV3KztP2zOoA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gtF1IBwIEeaV3KztP2zOoA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gtF1IRwIEeaV3KztP2zOoA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gtF1IhwIEeaV3KztP2zOoA" type="Class_StructureCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gtF1IxwIEeaV3KztP2zOoA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gtF1JBwIEeaV3KztP2zOoA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_BPe6oBjaEeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gtFOERwIEeaV3KztP2zOoA" x="752" y="109" width="111" height="106"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_gtrrABwIEeaV3KztP2zOoA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_gtrrAhwIEeaV3KztP2zOoA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gtrrAxwIEeaV3KztP2zOoA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gtrrBBwIEeaV3KztP2zOoA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gtsSEBwIEeaV3KztP2zOoA" type="Class_StructureCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gtsSERwIEeaV3KztP2zOoA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gtsSEhwIEeaV3KztP2zOoA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_rgwRoBt8EeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gtrrARwIEeaV3KztP2zOoA" x="829" y="264" width="94" height="157"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_iDau4BwIEeaV3KztP2zOoA" type="Constraint_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iDbV8BwIEeaV3KztP2zOoA" type="Constraint_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iDbV8RwIEeaV3KztP2zOoA" type="Constraint_BodyLabel"/>
+      <element xmi:type="uml:Constraint" href="model.uml#_uV4EoBt8EeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iDau4RwIEeaV3KztP2zOoA" x="20" y="25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ton3cBwIEeaV3KztP2zOoA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ton3chwIEeaV3KztP2zOoA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ton3cRwIEeaV3KztP2zOoA" x="345" y="648" width="215" height="131"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_cZdcwRwIEeaV3KztP2zOoA" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_cZdcwhwIEeaV3KztP2zOoA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_cZdcwxwIEeaV3KztP2zOoA">
+      <owner xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_iD6eIBwIEeaV3KztP2zOoA" type="Constraint_ConstrainedElementEdge" source="_iDau4BwIEeaV3KztP2zOoA" target="_eUYRUBwIEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_iD6eIRwIEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iD6eIhwIEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[359, 380, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SyOtsBwREeaV3KztP2zOoA" id="(0.5860655737704918,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SyPUwBwREeaV3KztP2zOoA" id="(0.351409978308026,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_oji0ABwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUYRUBwIEeaV3KztP2zOoA" target="_gtFOEBwIEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_oji0ARwIEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oji0AhwIEeaV3KztP2zOoA" points="[561, 380, -643984, -643984]$[752, 212, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ojvBQBwIEeaV3KztP2zOoA" id="(0.7463163814573793,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ojvBQRwIEeaV3KztP2zOoA" id="(0.0,0.9716981132075472)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_o3iHABwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUYRUBwIEeaV3KztP2zOoA" target="_gtrrABwIEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o3iHARwIEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o3iHAhwIEeaV3KztP2zOoA" points="[678, 430, -643984, -643984]$[829, 367, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3qC0BwIEeaV3KztP2zOoA" id="(1.0,0.2716262975778548)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3qC0RwIEeaV3KztP2zOoA" id="(0.0,0.6560509554140127)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_pPf7EBwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUYRUBwIEeaV3KztP2zOoA" target="_iDau4BwIEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_pPf7ERwIEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pPf7EhwIEeaV3KztP2zOoA" points="[312, 380, -643984, -643984]$[245, 126, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pPmowBwIEeaV3KztP2zOoA" id="(0.20607375271149675,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pPmowRwIEeaV3KztP2zOoA" id="(0.4098360655737705,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_rvaTEBwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUlFoBwIEeaV3KztP2zOoA" target="_eUYRUBwIEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_rvaTERwIEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rvaTEhwIEeaV3KztP2zOoA" points="[312, 626, -643984, -643984]$[345, 567, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rvrY0BwIEeaV3KztP2zOoA" id="(0.4421364985163205,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rvr_4BwIEeaV3KztP2zOoA" id="(0.27765726681127983,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_toxBYBwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_ton3cBwIEeaV3KztP2zOoA" target="_gtFOEBwIEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_toxBYRwIEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_toxBYhwIEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[752, 150, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4ARwIEeaV3KztP2zOoA" id="(1.0,0.4580152671755725)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4AhwIEeaV3KztP2zOoA" id="(0.0,0.5)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_to2g8BwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_ton3cBwIEeaV3KztP2zOoA" target="_gtrrABwIEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_to2g8RwIEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_to2g8hwIEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[829, 324, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4AxwIEeaV3KztP2zOoA" id="(1.0,0.9618320610687023)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4BBwIEeaV3KztP2zOoA" id="(0.0,0.33121019108280253)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_to9OoBwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_ton3cBwIEeaV3KztP2zOoA" target="_iDau4BwIEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_to9OoRwIEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_to9OohwIEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[183, 66, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqxQ8BwIEeaV3KztP2zOoA" id="(0.0,0.2900763358778626)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uqx4ABwIEeaV3KztP2zOoA" id="(1.0,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_zHgiABwIEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_eUlFoBwIEeaV3KztP2zOoA" target="_ton3cBwIEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_zHgiARwIEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zHgiAhwIEeaV3KztP2zOoA" points="[452, 626, -643984, -643984]$[530, 210, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zHqTABwIEeaV3KztP2zOoA" id="(1.0,0.19161676646706588)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zHqTARwIEeaV3KztP2zOoA" id="(0.0,0.6793893129770993)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_8TTMEBwcEeaV3KztP2zOoA" type="PapyrusUMLComponentDiagram" name="ComponentDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_-SvUQBwcEeaV3KztP2zOoA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-SvUQhwcEeaV3KztP2zOoA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_zhSZkBt8EeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-SvUQRwcEeaV3KztP2zOoA" y="617" width="608" height="209"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-S66cBwcEeaV3KztP2zOoA" type="NamedElement_DefaultShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-S7hgBwcEeaV3KztP2zOoA" type="NamedElement_NameLabel"/>
+      <element xmi:type="uml:Class" href="model.uml#_BPe6oBjaEeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-S66cRwcEeaV3KztP2zOoA" x="1459" y="57"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-TdtABwcEeaV3KztP2zOoA" type="Constraint_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-TeUERwcEeaV3KztP2zOoA" type="Constraint_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-TeUEhwcEeaV3KztP2zOoA" type="Constraint_BodyLabel"/>
+      <element xmi:type="uml:Constraint" href="model.uml#_uV4EoBt8EeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-TeUEBwcEeaV3KztP2zOoA" x="273" y="163"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-T9cQBwcEeaV3KztP2zOoA" type="NamedElement_DefaultShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-T-DUBwcEeaV3KztP2zOoA" type="NamedElement_NameLabel"/>
+      <element xmi:type="uml:Class" href="model.uml#_rgwRoBt8EeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-T9cQRwcEeaV3KztP2zOoA" x="1446" y="240"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BkZSQBwdEeaV3KztP2zOoA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BkZSQhwdEeaV3KztP2zOoA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BkZSQRwdEeaV3KztP2zOoA" x="813" y="629" width="423" height="183"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_DB2uwBwdEeaV3KztP2zOoA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DB2uwhwdEeaV3KztP2zOoA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_A0dykBjaEeaV3KztP2zOoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DB2uwRwdEeaV3KztP2zOoA" x="773" y="137" width="435" height="308"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_8TTMERwcEeaV3KztP2zOoA" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_8TTMEhwcEeaV3KztP2zOoA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_8TTMExwcEeaV3KztP2zOoA">
+      <owner xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model.uml#_iQwqkBjXEeaAu8qnqsGe1A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_BkhOEBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_BkZSQBwdEeaV3KztP2zOoA" target="_-S66cBwcEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BkhOERwdEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BkhOEhwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[1459, 79, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EIBsoBwdEeaV3KztP2zOoA" id="(0.6619385342789598,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EICTsBwdEeaV3KztP2zOoA" id="(0.31,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_BktbUBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_BkZSQBwdEeaV3KztP2zOoA" target="_-T9cQBwcEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BktbURwdEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BktbUhwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[1446, 256, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EICTsRwdEeaV3KztP2zOoA" id="(0.723404255319149,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EICTshwdEeaV3KztP2zOoA" id="(0.24,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_BkyT0BwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_BkZSQBwdEeaV3KztP2zOoA" target="_-TdtABwcEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BkyT0RwdEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BkyT0hwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[333, 163, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EH-pUBwdEeaV3KztP2zOoA" id="(0.24113475177304963,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EH-pURwdEeaV3KztP2zOoA" id="(0.6434426229508197,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_DB81YBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_DB2uwBwdEeaV3KztP2zOoA" target="_-S66cBwcEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_DB81YRwdEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DB81YhwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[1459, 79, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GJkBwdEeaV3KztP2zOoA" id="(1.0,0.21428571428571427)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GJkRwdEeaV3KztP2zOoA" id="(0.0,0.9)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_DCBt4BwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_DB2uwBwdEeaV3KztP2zOoA" target="_-T9cQBwcEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_DCBt4RwdEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DCBt4hwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[1446, 256, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GwoBwdEeaV3KztP2zOoA" id="(1.0,0.461038961038961)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GwoRwdEeaV3KztP2zOoA" id="(0.0,0.54)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_DCH0gBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_DB2uwBwdEeaV3KztP2zOoA" target="_-TdtABwcEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_DCH0gRwdEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DCH0ghwdEeaV3KztP2zOoA" points="[0, 0, -643984, -643984]$[333, 163, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GwohwdEeaV3KztP2zOoA" id="(0.0,0.38311688311688313)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D1GwoxwdEeaV3KztP2zOoA" id="(1.0,0.8333333333333334)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HbqnoBwdEeaV3KztP2zOoA" type="Constraint_ConstrainedElementEdge" source="_-TdtABwcEeaV3KztP2zOoA" target="_BkZSQBwdEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HbqnoRwdEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HbqnohwdEeaV3KztP2zOoA" points="[345, 223, -643984, -643984]$[813, 647, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hb4DABwdEeaV3KztP2zOoA" id="(0.29799438492319613,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hb4qEBwdEeaV3KztP2zOoA" id="(0.0,0.10194824872674658)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_H_qskBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_-SvUQBwcEeaV3KztP2zOoA" target="_DB2uwBwdEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_H_qskRwdEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H_qskhwdEeaV3KztP2zOoA" points="[504, 617, -643984, -643984]$[798, 445, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H_1EoBwdEeaV3KztP2zOoA" id="(0.8302919708029196,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H_1EoRwdEeaV3KztP2zOoA" id="(0.058847218726403076,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_OhHnYBwdEeaV3KztP2zOoA" type="Comment_AnnotatedElementEdge" source="_-SvUQBwcEeaV3KztP2zOoA" target="_BkZSQBwdEeaV3KztP2zOoA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_OhHnYRwdEeaV3KztP2zOoA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OhHnYhwdEeaV3KztP2zOoA" points="[608, 721, -643984, -643984]$[813, 732, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OhR_cBwdEeaV3KztP2zOoA" id="(1.0,0.49763813122847644)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OhR_cRwdEeaV3KztP2zOoA" id="(0.0,0.5669833977237134)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.uml
index 634d48c67c9..d02fb447638 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.uml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/bug492522/model.uml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_iQwqkBjXEeaAu8qnqsGe1A" name="RootElement">

-  <ownedComment xmi:type="uml:Comment" xmi:id="_A0dykBjaEeaV3KztP2zOoA" annotatedElement="_BPe6oBjaEeaV3KztP2zOoA _rgwRoBt8EeaV3KztP2zOoA _uV4EoBt8EeaV3KztP2zOoA">

-    <body>&lt;p>Comment1:This comment is displayed on ClassDiagram, Composite Diagram, Component Diagram, and annotates Class1, Class2 and the Constraint Constraint1. It is commented by the second Comment.&lt;/p>

-</body>

-  </ownedComment>

-  <ownedComment xmi:type="uml:Comment" xmi:id="_zhSZkBt8EeaV3KztP2zOoA" annotatedElement="_A0dykBjaEeaV3KztP2zOoA">

-    <body>&lt;p>Comment2:This comment, comments the other comment.&lt;/p>

-</body>

-  </ownedComment>

-  <packagedElement xmi:type="uml:Class" xmi:id="_BPe6oBjaEeaV3KztP2zOoA" name="Class1">

-    <ownedRule xmi:type="uml:Constraint" xmi:id="_uV4EoBt8EeaV3KztP2zOoA" name="Constraint1" constrainedElement="_A0dykBjaEeaV3KztP2zOoA">

-      <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlAiIBt9EeaV3KztP2zOoA">

-        <language>OCL</language>

-        <body>This constraint, constraints Class1.</body>

-      </specification>

-    </ownedRule>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_rgwRoBt8EeaV3KztP2zOoA" name="Class2"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_iQwqkBjXEeaAu8qnqsGe1A" name="RootElement">
+  <ownedComment xmi:type="uml:Comment" xmi:id="_A0dykBjaEeaV3KztP2zOoA" annotatedElement="_BPe6oBjaEeaV3KztP2zOoA _rgwRoBt8EeaV3KztP2zOoA _uV4EoBt8EeaV3KztP2zOoA">
+    <body>&lt;p>Comment1:This comment is displayed on ClassDiagram, Composite Diagram, Component Diagram, and annotates Class1, Class2 and the Constraint Constraint1. It is commented by the second Comment.&lt;/p>
+</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_zhSZkBt8EeaV3KztP2zOoA" annotatedElement="_A0dykBjaEeaV3KztP2zOoA">
+    <body>&lt;p>Comment2:This comment, comments the other comment.&lt;/p>
+</body>
+  </ownedComment>
+  <packagedElement xmi:type="uml:Class" xmi:id="_BPe6oBjaEeaV3KztP2zOoA" name="Class1">
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_uV4EoBt8EeaV3KztP2zOoA" name="Constraint1" constrainedElement="_A0dykBjaEeaV3KztP2zOoA">
+      <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlAiIBt9EeaV3KztP2zOoA">
+        <language>OCL</language>
+        <body>This constraint, constraints Class1.</body>
+      </specification>
+    </ownedRule>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_rgwRoBt8EeaV3KztP2zOoA" name="Class2"/>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF
index 70eedad42a6..f8922a98d6c 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.hamcrest.core,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.uml.service.types.ui.tests.creation,

- org.eclipse.papyrus.uml.service.types.ui.tests.deletion,

- org.eclipse.papyrus.uml.service.types.ui.tests.suites

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.ui.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.hamcrest.core,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.service.types.ui.tests.creation,
+ org.eclipse.papyrus.uml.service.types.ui.tests.deletion,
+ org.eclipse.papyrus.uml.service.types.ui.tests.suites
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.ui.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF
index 114d70743af..0d1cecf095c 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF
@@ -1,39 +1,39 @@
-Manifest-Version: 1.0

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.suite.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.suite.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.service.types.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.service.types.ui.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.tools.tests;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.modelrepair.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.profile.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.decoratormodel.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.validation.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.filters.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.profile.assistants.generator.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.profile.drafter.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.validation.tests.staticprofile;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.internationalization.tests;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.uml.alf.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.expressions.tests;bundle-version="[1.0.0,2.0.0)"

+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 0.0.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.suite.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.suite.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.modelrepair.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.decoratormodel.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.validation.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.filters.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile.assistants.generator.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile.drafter.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.validation.tests.staticprofile;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.internationalization.tests;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.expressions.tests;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF
index 0a2b8f10b88..ccac03436ee 100644
--- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter.tests;singleton:=true

-Bundle-Version: 1.2.0.qualifier

-Bundle-Activator: org.eclipse.papyrus.uml.profile.drafter.tests.Activator

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.papyrus.uml.profile.drafter;bundle-version="[1.3.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.core.databinding,

- org.eclipse.core.databinding.beans,

- org.eclipse.core.databinding.observable,

- org.eclipse.core.databinding.property,

- org.eclipse.jface.databinding,

- com.ibm.icu,

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.core.runtime

-Export-Package: org.eclipse.papyrus.uml.profile.drafter.tests,

- org.eclipse.papyrus.uml.profile.drafter.tests.exception

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-ActivationPolicy: lazy

-Import-Package: com.google.common.collect;version="21.0.0"

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter.tests;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.profile.drafter.tests.Activator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.papyrus.uml.profile.drafter;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.core.databinding,
+ org.eclipse.core.databinding.beans,
+ org.eclipse.core.databinding.observable,
+ org.eclipse.core.databinding.property,
+ org.eclipse.jface.databinding,
+ com.ibm.icu,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.runtime
+Export-Package: org.eclipse.papyrus.uml.profile.drafter.tests,
+ org.eclipse.papyrus.uml.profile.drafter.tests.exception
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/src/org/eclipse/papyrus/uml/profile/drafter/tests/Activator.java b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/src/org/eclipse/papyrus/uml/profile/drafter/tests/Activator.java
index 8fc381aea88..49868147330 100644
--- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/src/org/eclipse/papyrus/uml/profile/drafter/tests/Activator.java
+++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/src/org/eclipse/papyrus/uml/profile/drafter/tests/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre  francois.le-fevre@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.profile.drafter.tests;

-

-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.uml.profile.drafter.tests"; //$NON-NLS-1$

-

-	 /** Logging helper */

-    public static LogHelper log;

-

-    // The shared instance

-	private static Activator plugin;

-	

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		// register the login helper

-        log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre  francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.profile.drafter.tests;
+
+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.uml.profile.drafter.tests"; //$NON-NLS-1$
+
+	 /** Logging helper */
+    public static LogHelper log;
+
+    // The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		// register the login helper
+        log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/META-INF/MANIFEST.MF
index 61a60d9237b..3c682fb4a40 100644
--- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0

-Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.uml.profile.service,

- org.eclipse.papyrus.uml.profile.tests

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.profile.service,
+ org.eclipse.papyrus.uml.profile.tests
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.classpath
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.project b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.project
index e553de260d3..1f0d7d0b5dc 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.project
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.parameter.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.parameter.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF
index 21ea0a2f8d9..d0af41e70cc 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.textedit.parameter.xtext.ui;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.uml.textedit.parameter.tests,

- org.eclipse.papyrus.uml.textedit.parameter.tests.suites

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: UML Textedit Parameter Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.parameter.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.ui;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.parameter.tests,
+ org.eclipse.papyrus.uml.textedit.parameter.tests.suites
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: UML Textedit Parameter Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.parameter.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/ParameterGrammarTest.launch b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/ParameterGrammarTest.launch
index f8f32342576..8c6bec20716 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/ParameterGrammarTest.launch
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/ParameterGrammarTest.launch
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/ParameterGrammarTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.textedit.parameter.tests.suites.ParameterGrammarTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.textedit.parameter.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2048m"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/ParameterGrammarTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.textedit.parameter.tests.suites.ParameterGrammarTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.textedit.parameter.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2048m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/about.html b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/about.html
index 35b45e096ae..ee7cad035a4 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/about.html
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/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>September 30, 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>September 30, 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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/build.properties b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/build.properties
index e2306275b30..74d76124156 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/build.properties
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               model/,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               model/,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.di b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.di
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.notation b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.notation
index bb4f8ce7e96..d3a47b7288c 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.notation
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.notation
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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">

-  <notation:Diagram xmi:id="_ARn8UFn0EeS6Qb3CQxLHEQ" type="CompositeStructure" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_Jc1usFn0EeS6Qb3CQxLHEQ" type="2069">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Jc1usln0EeS6Qb3CQxLHEQ" type="5121"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Jc1us1n0EeS6Qb3CQxLHEQ" type="7069">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Jc1utFn0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jc1utVn0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_JdSaoFn0EeS6Qb3CQxLHEQ" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_JdSaoVn0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JdSaoln0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <element xmi:type="uml:Component" href="xtextParameterModel.uml#_EN8n8Fn0EeS6Qb3CQxLHEQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jc1usVn0EeS6Qb3CQxLHEQ" x="181" y="96" width="438" height="284"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_ARn8UVn0EeS6Qb3CQxLHEQ" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_ARn8Uln0EeS6Qb3CQxLHEQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ARn8U1n0EeS6Qb3CQxLHEQ">

-      <owner xmi:type="uml:Model" href="xtextParameterModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="xtextParameterModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_D5aiYFn0EeS6Qb3CQxLHEQ" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_EOGY8Fn0EeS6Qb3CQxLHEQ" type="2002">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EOGY8ln0EeS6Qb3CQxLHEQ" type="5005"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY81n0EeS6Qb3CQxLHEQ" type="7002">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY9Fn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY9Vn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGY9ln0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY91n0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY-Fn0EeS6Qb3CQxLHEQ" type="7003">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY-Vn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY-ln0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGY-1n0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY_Fn0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY_Vn0EeS6Qb3CQxLHEQ" type="7004">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY_ln0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY_1n0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGZAFn0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGZAVn0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <element xmi:type="uml:Component" href="xtextParameterModel.uml#_EN8n8Fn0EeS6Qb3CQxLHEQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY8Vn0EeS6Qb3CQxLHEQ" x="82" y="94" width="593" height="229"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Expx8Fn0EeS6Qb3CQxLHEQ" type="2010">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Expx8ln0EeS6Qb3CQxLHEQ" type="5035"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Expx81n0EeS6Qb3CQxLHEQ" type="7020">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Expx9Fn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Expx9Vn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Expx9ln0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx91n0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Expx-Fn0EeS6Qb3CQxLHEQ" type="7021">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Expx-Vn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Expx-ln0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Expx-1n0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx_Fn0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <element xmi:type="uml:DataType" href="xtextParameterModel.uml#_ExgA8Fn0EeS6Qb3CQxLHEQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx8Vn0EeS6Qb3CQxLHEQ" x="781" y="99"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Fe4EUVn0EeS6Qb3CQxLHEQ" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fe4EU1n0EeS6Qb3CQxLHEQ" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_FfB1UFn0EeS6Qb3CQxLHEQ" type="7016">

-        <children xmi:type="notation:Shape" xmi:id="_F6__oVn0EeS6Qb3CQxLHEQ" type="3026">

-          <children xmi:type="notation:DecorationNode" xmi:id="_F6__o1n0EeS6Qb3CQxLHEQ" type="5058"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_F6__pFn0EeS6Qb3CQxLHEQ" type="7041">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_F6__pVn0EeS6Qb3CQxLHEQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_F6__pln0EeS6Qb3CQxLHEQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_F6__p1n0EeS6Qb3CQxLHEQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__qFn0EeS6Qb3CQxLHEQ"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_F6__qVn0EeS6Qb3CQxLHEQ" type="7042">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_F6__qln0EeS6Qb3CQxLHEQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_F6__q1n0EeS6Qb3CQxLHEQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_F6__rFn0EeS6Qb3CQxLHEQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__rVn0EeS6Qb3CQxLHEQ"/>

-          </children>

-          <element xmi:type="uml:PrimitiveType" href="xtextParameterModel.uml#_F6__oFn0EeS6Qb3CQxLHEQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__oln0EeS6Qb3CQxLHEQ" x="61" y="14"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_FfB1UVn0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FfB1Uln0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <element xmi:type="uml:Package" href="xtextParameterModel.uml#_Fe4EUFn0EeS6Qb3CQxLHEQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fe4EUln0EeS6Qb3CQxLHEQ" x="747" y="261" width="314" height="173"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_D5aiYVn0EeS6Qb3CQxLHEQ" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_D5aiYln0EeS6Qb3CQxLHEQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_D5aiY1n0EeS6Qb3CQxLHEQ">

-      <owner xmi:type="uml:Model" href="xtextParameterModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="xtextParameterModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>

-  </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: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">
+  <notation:Diagram xmi:id="_ARn8UFn0EeS6Qb3CQxLHEQ" type="CompositeStructure" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Jc1usFn0EeS6Qb3CQxLHEQ" type="2069">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Jc1usln0EeS6Qb3CQxLHEQ" type="5121"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Jc1us1n0EeS6Qb3CQxLHEQ" type="7069">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Jc1utFn0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jc1utVn0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JdSaoFn0EeS6Qb3CQxLHEQ" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JdSaoVn0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JdSaoln0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <element xmi:type="uml:Component" href="xtextParameterModel.uml#_EN8n8Fn0EeS6Qb3CQxLHEQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jc1usVn0EeS6Qb3CQxLHEQ" x="181" y="96" width="438" height="284"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_ARn8UVn0EeS6Qb3CQxLHEQ" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_ARn8Uln0EeS6Qb3CQxLHEQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ARn8U1n0EeS6Qb3CQxLHEQ">
+      <owner xmi:type="uml:Model" href="xtextParameterModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="xtextParameterModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_D5aiYFn0EeS6Qb3CQxLHEQ" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_EOGY8Fn0EeS6Qb3CQxLHEQ" type="2002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EOGY8ln0EeS6Qb3CQxLHEQ" type="5005"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY81n0EeS6Qb3CQxLHEQ" type="7002">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY9Fn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY9Vn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGY9ln0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY91n0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY-Fn0EeS6Qb3CQxLHEQ" type="7003">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY-Vn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY-ln0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGY-1n0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY_Fn0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY_Vn0EeS6Qb3CQxLHEQ" type="7004">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY_ln0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY_1n0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGZAFn0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGZAVn0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <element xmi:type="uml:Component" href="xtextParameterModel.uml#_EN8n8Fn0EeS6Qb3CQxLHEQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY8Vn0EeS6Qb3CQxLHEQ" x="82" y="94" width="593" height="229"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Expx8Fn0EeS6Qb3CQxLHEQ" type="2010">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Expx8ln0EeS6Qb3CQxLHEQ" type="5035"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Expx81n0EeS6Qb3CQxLHEQ" type="7020">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Expx9Fn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Expx9Vn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Expx9ln0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx91n0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Expx-Fn0EeS6Qb3CQxLHEQ" type="7021">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Expx-Vn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Expx-ln0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Expx-1n0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx_Fn0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <element xmi:type="uml:DataType" href="xtextParameterModel.uml#_ExgA8Fn0EeS6Qb3CQxLHEQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx8Vn0EeS6Qb3CQxLHEQ" x="781" y="99"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Fe4EUVn0EeS6Qb3CQxLHEQ" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fe4EU1n0EeS6Qb3CQxLHEQ" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FfB1UFn0EeS6Qb3CQxLHEQ" type="7016">
+        <children xmi:type="notation:Shape" xmi:id="_F6__oVn0EeS6Qb3CQxLHEQ" type="3026">
+          <children xmi:type="notation:DecorationNode" xmi:id="_F6__o1n0EeS6Qb3CQxLHEQ" type="5058"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_F6__pFn0EeS6Qb3CQxLHEQ" type="7041">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_F6__pVn0EeS6Qb3CQxLHEQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_F6__pln0EeS6Qb3CQxLHEQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_F6__p1n0EeS6Qb3CQxLHEQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__qFn0EeS6Qb3CQxLHEQ"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_F6__qVn0EeS6Qb3CQxLHEQ" type="7042">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_F6__qln0EeS6Qb3CQxLHEQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_F6__q1n0EeS6Qb3CQxLHEQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_F6__rFn0EeS6Qb3CQxLHEQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__rVn0EeS6Qb3CQxLHEQ"/>
+          </children>
+          <element xmi:type="uml:PrimitiveType" href="xtextParameterModel.uml#_F6__oFn0EeS6Qb3CQxLHEQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__oln0EeS6Qb3CQxLHEQ" x="61" y="14"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_FfB1UVn0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FfB1Uln0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <element xmi:type="uml:Package" href="xtextParameterModel.uml#_Fe4EUFn0EeS6Qb3CQxLHEQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fe4EUln0EeS6Qb3CQxLHEQ" x="747" y="261" width="314" height="173"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_D5aiYVn0EeS6Qb3CQxLHEQ" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_D5aiYln0EeS6Qb3CQxLHEQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_D5aiY1n0EeS6Qb3CQxLHEQ">
+      <owner xmi:type="uml:Model" href="xtextParameterModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="xtextParameterModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.uml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.uml
index b7d6eb917a9..111bdfe3d2c 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.uml
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/model/xtextParameterModel.uml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AP_koFn0EeS6Qb3CQxLHEQ" name="model">

-  <packagedElement xmi:type="uml:Component" xmi:id="_EN8n8Fn0EeS6Qb3CQxLHEQ" name="Component1"/>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_ExgA8Fn0EeS6Qb3CQxLHEQ" name="type1"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_Fe4EUFn0EeS6Qb3CQxLHEQ" name="Package1">

-    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_F6__oFn0EeS6Qb3CQxLHEQ" name="type2"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AP_koFn0EeS6Qb3CQxLHEQ" name="model">
+  <packagedElement xmi:type="uml:Component" xmi:id="_EN8n8Fn0EeS6Qb3CQxLHEQ" name="Component1"/>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_ExgA8Fn0EeS6Qb3CQxLHEQ" name="type1"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_Fe4EUFn0EeS6Qb3CQxLHEQ" name="Package1">
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_F6__oFn0EeS6Qb3CQxLHEQ" name="type2"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/Activator.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/Activator.java
index 3c28fa87ffb..6a3299cfcaa 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/Activator.java
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/Activator.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.textedit.parameter.tests;

-

-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) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.textedit.parameter.tests;
+
+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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/AllTests.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/AllTests.java
index a4552c77878..c1d85899573 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/AllTests.java
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/AllTests.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.textedit.parameter.tests.suites;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		ParameterGrammarTests.class

-})

-public class AllTests {

-	// JUnit 4 Test Suite

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.textedit.parameter.tests.suites;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		ParameterGrammarTests.class
+})
+public class AllTests {
+	// JUnit 4 Test Suite
+}
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/ParameterGrammarTests.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/ParameterGrammarTests.java
index 6a3e2dbf0ea..932b4613c9c 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/ParameterGrammarTests.java
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/ParameterGrammarTests.java
@@ -1,126 +1,126 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.textedit.parameter.tests.suites;

-

-

-import org.eclipse.emf.common.util.BasicEList;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contributions.ParameterXtextDirectEditorConfiguration;

-import org.eclipse.papyrus.uml.textedit.tests.AbstractGrammarTest;

-import org.eclipse.papyrus.uml.xtext.integration.DefaultXtextDirectEditorConfiguration;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.LiteralReal;

-import org.eclipse.uml2.uml.LiteralString;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.Parameter;

-import org.eclipse.uml2.uml.ParameterDirectionKind;

-import org.eclipse.uml2.uml.ParameterEffectKind;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.VisibilityKind;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-@PluginResource("/model/xtextParameterModel.uml")

-public class ParameterGrammarTests extends AbstractGrammarTest<Parameter> {

-

-	protected PrimitiveType type2; /* QName = model::Package1::type2 */

-

-	protected DataType type1; /* QName = model::type1 */

-

-	protected Model rootModel;

-

-	protected Parameter testedParameter;

-

-	@Before

-	public void loadTestModel() {

-		type2 = findElement(PrimitiveType.class, "type2");

-		type1 = findElement(DataType.class, "type1");

-		rootModel = findElement(Model.class, "model");

-

-		Component component = (Component) rootModel.createPackagedElement("Component1", UMLPackage.eINSTANCE.getComponent());

-		Operation operation = component.createOwnedOperation("op1", new BasicEList<String>(), new BasicEList<Type>());

-		testedParameter = operation.createOwnedParameter("p1", null);

-	}

-

-	@Test

-	public void testParser() throws Exception {

-		tester.parseText(testedParameter, "~in p1: <Undefined>");

-		Assert.assertEquals(ParameterDirectionKind.IN_LITERAL, testedParameter.getDirection());

-		Assert.assertEquals(VisibilityKind.PACKAGE_LITERAL, testedParameter.getVisibility());

-

-		tester.parseText(testedParameter, "p2");

-		Assert.assertEquals(ParameterDirectionKind.IN_LITERAL, testedParameter.getDirection()); // Direction is optional; should not change

-		Assert.assertEquals(VisibilityKind.PACKAGE_LITERAL, testedParameter.getVisibility()); // Visibility is optional; should not change

-		Assert.assertEquals("p2", testedParameter.getName());

-

-		tester.parseText(testedParameter, "p2: model::type1");

-		Assert.assertTrue(testedParameter.getType() == type1);

-

-		tester.parseText(testedParameter, "p2 {exception, ordered, stream, unique}");

-		Assert.assertTrue(testedParameter.isException());

-		Assert.assertTrue(testedParameter.isOrdered());

-		Assert.assertTrue(testedParameter.isStream());

-		Assert.assertTrue(testedParameter.isUnique());

-

-		tester.parseText(testedParameter, "p2 {}");

-		Assert.assertFalse(testedParameter.isException());

-		Assert.assertFalse(testedParameter.isOrdered());

-		Assert.assertFalse(testedParameter.isStream());

-		Assert.assertFalse(testedParameter.isUnique());

-

-		tester.parseText(testedParameter, "p2 = \"Hello\"");

-		Assert.assertNotNull(testedParameter.getDefaultValue());

-		Assert.assertTrue(testedParameter.getDefaultValue() instanceof LiteralString);

-		Assert.assertEquals("Hello", ((LiteralString) testedParameter.getDefaultValue()).getValue());

-	}

-

-	@Test

-	public void testInitialText() {

-		Assert.assertEquals("+ in p1 : <Undefined> {unique}{effect: create}", tester.getInitialText(testedParameter));

-

-		testedParameter.setIsUnique(false);

-		Assert.assertEquals("+ in p1 : <Undefined> {effect: create}", tester.getInitialText(testedParameter));

-

-		testedParameter.setIsStream(true);

-		testedParameter.setIsOrdered(true);

-		testedParameter.setVisibility(VisibilityKind.PROTECTED_LITERAL);

-		testedParameter.setType(type1);

-		testedParameter.setEffect(ParameterEffectKind.DELETE_LITERAL);

-		testedParameter.setDirection(ParameterDirectionKind.RETURN_LITERAL);

-		Assert.assertEquals("# return p1 : model::type1 {ordered, stream}{effect: delete}", tester.getInitialText(testedParameter));

-	}

-

-	@Test

-	public void testDefaultValues() throws Exception {

-		testedParameter.setIsUnique(false);

-

-		LiteralReal defaultRealValue = UMLFactory.eINSTANCE.createLiteralReal();

-		defaultRealValue.setValue(123.54);

-		testedParameter.setDefaultValue(defaultRealValue);

-

-		Assert.assertEquals("+ in p1 : <Undefined> {effect: create} = 123.54", tester.getInitialText(testedParameter));

-		tester.parseText(testedParameter, "p1 = .2");

-		Assert.assertEquals("The instance of ValueSpecification should not change when compatible types are used", defaultRealValue, testedParameter.getDefaultValue());

-		Assert.assertEquals(.2, defaultRealValue.getValue(), 0.001);

-	}

-

-	@Override

-	public DefaultXtextDirectEditorConfiguration getEditor() {

-		return new ParameterXtextDirectEditorConfiguration();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.textedit.parameter.tests.suites;
+
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contributions.ParameterXtextDirectEditorConfiguration;
+import org.eclipse.papyrus.uml.textedit.tests.AbstractGrammarTest;
+import org.eclipse.papyrus.uml.xtext.integration.DefaultXtextDirectEditorConfiguration;
+import org.eclipse.uml2.uml.Component;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.LiteralReal;
+import org.eclipse.uml2.uml.LiteralString;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.ParameterEffectKind;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.VisibilityKind;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+@PluginResource("/model/xtextParameterModel.uml")
+public class ParameterGrammarTests extends AbstractGrammarTest<Parameter> {
+
+	protected PrimitiveType type2; /* QName = model::Package1::type2 */
+
+	protected DataType type1; /* QName = model::type1 */
+
+	protected Model rootModel;
+
+	protected Parameter testedParameter;
+
+	@Before
+	public void loadTestModel() {
+		type2 = findElement(PrimitiveType.class, "type2");
+		type1 = findElement(DataType.class, "type1");
+		rootModel = findElement(Model.class, "model");
+
+		Component component = (Component) rootModel.createPackagedElement("Component1", UMLPackage.eINSTANCE.getComponent());
+		Operation operation = component.createOwnedOperation("op1", new BasicEList<String>(), new BasicEList<Type>());
+		testedParameter = operation.createOwnedParameter("p1", null);
+	}
+
+	@Test
+	public void testParser() throws Exception {
+		tester.parseText(testedParameter, "~in p1: <Undefined>");
+		Assert.assertEquals(ParameterDirectionKind.IN_LITERAL, testedParameter.getDirection());
+		Assert.assertEquals(VisibilityKind.PACKAGE_LITERAL, testedParameter.getVisibility());
+
+		tester.parseText(testedParameter, "p2");
+		Assert.assertEquals(ParameterDirectionKind.IN_LITERAL, testedParameter.getDirection()); // Direction is optional; should not change
+		Assert.assertEquals(VisibilityKind.PACKAGE_LITERAL, testedParameter.getVisibility()); // Visibility is optional; should not change
+		Assert.assertEquals("p2", testedParameter.getName());
+
+		tester.parseText(testedParameter, "p2: model::type1");
+		Assert.assertTrue(testedParameter.getType() == type1);
+
+		tester.parseText(testedParameter, "p2 {exception, ordered, stream, unique}");
+		Assert.assertTrue(testedParameter.isException());
+		Assert.assertTrue(testedParameter.isOrdered());
+		Assert.assertTrue(testedParameter.isStream());
+		Assert.assertTrue(testedParameter.isUnique());
+
+		tester.parseText(testedParameter, "p2 {}");
+		Assert.assertFalse(testedParameter.isException());
+		Assert.assertFalse(testedParameter.isOrdered());
+		Assert.assertFalse(testedParameter.isStream());
+		Assert.assertFalse(testedParameter.isUnique());
+
+		tester.parseText(testedParameter, "p2 = \"Hello\"");
+		Assert.assertNotNull(testedParameter.getDefaultValue());
+		Assert.assertTrue(testedParameter.getDefaultValue() instanceof LiteralString);
+		Assert.assertEquals("Hello", ((LiteralString) testedParameter.getDefaultValue()).getValue());
+	}
+
+	@Test
+	public void testInitialText() {
+		Assert.assertEquals("+ in p1 : <Undefined> {unique}{effect: create}", tester.getInitialText(testedParameter));
+
+		testedParameter.setIsUnique(false);
+		Assert.assertEquals("+ in p1 : <Undefined> {effect: create}", tester.getInitialText(testedParameter));
+
+		testedParameter.setIsStream(true);
+		testedParameter.setIsOrdered(true);
+		testedParameter.setVisibility(VisibilityKind.PROTECTED_LITERAL);
+		testedParameter.setType(type1);
+		testedParameter.setEffect(ParameterEffectKind.DELETE_LITERAL);
+		testedParameter.setDirection(ParameterDirectionKind.RETURN_LITERAL);
+		Assert.assertEquals("# return p1 : model::type1 {ordered, stream}{effect: delete}", tester.getInitialText(testedParameter));
+	}
+
+	@Test
+	public void testDefaultValues() throws Exception {
+		testedParameter.setIsUnique(false);
+
+		LiteralReal defaultRealValue = UMLFactory.eINSTANCE.createLiteralReal();
+		defaultRealValue.setValue(123.54);
+		testedParameter.setDefaultValue(defaultRealValue);
+
+		Assert.assertEquals("+ in p1 : <Undefined> {effect: create} = 123.54", tester.getInitialText(testedParameter));
+		tester.parseText(testedParameter, "p1 = .2");
+		Assert.assertEquals("The instance of ValueSpecification should not change when compatible types are used", defaultRealValue, testedParameter.getDefaultValue());
+		Assert.assertEquals(.2, defaultRealValue.getValue(), 0.001);
+	}
+
+	@Override
+	public DefaultXtextDirectEditorConfiguration getEditor() {
+		return new ParameterXtextDirectEditorConfiguration();
+	}
+}
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.classpath
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.project b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.project
index 9bb78390a6f..817f4b43fcf 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.project
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.port.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.port.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF
index 21f043d962b..acf0e01bca3 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.textedit.port.xtext.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.uml.textedit.port.tests.suites

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: XText Port Editor Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.port.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.textedit.port.xtext.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.port.tests.suites
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: XText Port Editor Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.port.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/PortGrammarTests.launch b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/PortGrammarTests.launch
index 4597e0ebf47..5dec6da6840 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/PortGrammarTests.launch
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/PortGrammarTests.launch
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.textedit.port.tests.suites.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.textedit.port.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2048m "/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.textedit.port.tests.suites.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.textedit.port.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2048m "/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/about.html b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/about.html
index 35b45e096ae..ee7cad035a4 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/about.html
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/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>September 30, 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>September 30, 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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/build.properties b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/build.properties
index e2306275b30..74d76124156 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/build.properties
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               model/,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               model/,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.di b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.di
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.notation b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.notation
index 6d0d42c3302..86a0195b02b 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.notation
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.notation
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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">

-  <notation:Diagram xmi:id="_ARn8UFn0EeS6Qb3CQxLHEQ" type="CompositeStructure" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_Jc1usFn0EeS6Qb3CQxLHEQ" type="2069">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Jc1usln0EeS6Qb3CQxLHEQ" type="5121"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Jc1us1n0EeS6Qb3CQxLHEQ" type="7069">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Jc1utFn0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jc1utVn0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_JdSaoFn0EeS6Qb3CQxLHEQ" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_JdSaoVn0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JdSaoln0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <element xmi:type="uml:Component" href="xtextPortModel.uml#_EN8n8Fn0EeS6Qb3CQxLHEQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jc1usVn0EeS6Qb3CQxLHEQ" x="181" y="96" width="438" height="284"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_ARn8UVn0EeS6Qb3CQxLHEQ" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_ARn8Uln0EeS6Qb3CQxLHEQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ARn8U1n0EeS6Qb3CQxLHEQ">

-      <owner xmi:type="uml:Model" href="xtextPortModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="xtextPortModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_D5aiYFn0EeS6Qb3CQxLHEQ" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_EOGY8Fn0EeS6Qb3CQxLHEQ" type="2002">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EOGY8ln0EeS6Qb3CQxLHEQ" type="5005"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY81n0EeS6Qb3CQxLHEQ" type="7002">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY9Fn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY9Vn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGY9ln0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY91n0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY-Fn0EeS6Qb3CQxLHEQ" type="7003">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY-Vn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY-ln0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGY-1n0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY_Fn0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY_Vn0EeS6Qb3CQxLHEQ" type="7004">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY_ln0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY_1n0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGZAFn0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGZAVn0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <element xmi:type="uml:Component" href="xtextPortModel.uml#_EN8n8Fn0EeS6Qb3CQxLHEQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY8Vn0EeS6Qb3CQxLHEQ" x="82" y="94" width="593" height="229"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Expx8Fn0EeS6Qb3CQxLHEQ" type="2010">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Expx8ln0EeS6Qb3CQxLHEQ" type="5035"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Expx81n0EeS6Qb3CQxLHEQ" type="7020">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Expx9Fn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Expx9Vn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Expx9ln0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx91n0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Expx-Fn0EeS6Qb3CQxLHEQ" type="7021">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Expx-Vn0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Expx-ln0EeS6Qb3CQxLHEQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Expx-1n0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx_Fn0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <element xmi:type="uml:DataType" href="xtextPortModel.uml#_ExgA8Fn0EeS6Qb3CQxLHEQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx8Vn0EeS6Qb3CQxLHEQ" x="781" y="99"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Fe4EUVn0EeS6Qb3CQxLHEQ" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fe4EU1n0EeS6Qb3CQxLHEQ" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_FfB1UFn0EeS6Qb3CQxLHEQ" type="7016">

-        <children xmi:type="notation:Shape" xmi:id="_F6__oVn0EeS6Qb3CQxLHEQ" type="3026">

-          <children xmi:type="notation:DecorationNode" xmi:id="_F6__o1n0EeS6Qb3CQxLHEQ" type="5058"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_F6__pFn0EeS6Qb3CQxLHEQ" type="7041">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_F6__pVn0EeS6Qb3CQxLHEQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_F6__pln0EeS6Qb3CQxLHEQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_F6__p1n0EeS6Qb3CQxLHEQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__qFn0EeS6Qb3CQxLHEQ"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_F6__qVn0EeS6Qb3CQxLHEQ" type="7042">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_F6__qln0EeS6Qb3CQxLHEQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_F6__q1n0EeS6Qb3CQxLHEQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_F6__rFn0EeS6Qb3CQxLHEQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__rVn0EeS6Qb3CQxLHEQ"/>

-          </children>

-          <element xmi:type="uml:PrimitiveType" href="xtextPortModel.uml#_F6__oFn0EeS6Qb3CQxLHEQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__oln0EeS6Qb3CQxLHEQ" x="61" y="14"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_FfB1UVn0EeS6Qb3CQxLHEQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FfB1Uln0EeS6Qb3CQxLHEQ"/>

-      </children>

-      <element xmi:type="uml:Package" href="xtextPortModel.uml#_Fe4EUFn0EeS6Qb3CQxLHEQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fe4EUln0EeS6Qb3CQxLHEQ" x="747" y="261" width="314" height="173"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_D5aiYVn0EeS6Qb3CQxLHEQ" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_D5aiYln0EeS6Qb3CQxLHEQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_D5aiY1n0EeS6Qb3CQxLHEQ">

-      <owner xmi:type="uml:Model" href="xtextPortModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="xtextPortModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>

-  </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: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">
+  <notation:Diagram xmi:id="_ARn8UFn0EeS6Qb3CQxLHEQ" type="CompositeStructure" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Jc1usFn0EeS6Qb3CQxLHEQ" type="2069">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Jc1usln0EeS6Qb3CQxLHEQ" type="5121"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Jc1us1n0EeS6Qb3CQxLHEQ" type="7069">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Jc1utFn0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jc1utVn0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JdSaoFn0EeS6Qb3CQxLHEQ" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JdSaoVn0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JdSaoln0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <element xmi:type="uml:Component" href="xtextPortModel.uml#_EN8n8Fn0EeS6Qb3CQxLHEQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jc1usVn0EeS6Qb3CQxLHEQ" x="181" y="96" width="438" height="284"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_ARn8UVn0EeS6Qb3CQxLHEQ" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_ARn8Uln0EeS6Qb3CQxLHEQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ARn8U1n0EeS6Qb3CQxLHEQ">
+      <owner xmi:type="uml:Model" href="xtextPortModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="xtextPortModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_D5aiYFn0EeS6Qb3CQxLHEQ" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_EOGY8Fn0EeS6Qb3CQxLHEQ" type="2002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EOGY8ln0EeS6Qb3CQxLHEQ" type="5005"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY81n0EeS6Qb3CQxLHEQ" type="7002">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY9Fn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY9Vn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGY9ln0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY91n0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY-Fn0EeS6Qb3CQxLHEQ" type="7003">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY-Vn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY-ln0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGY-1n0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY_Fn0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EOGY_Vn0EeS6Qb3CQxLHEQ" type="7004">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EOGY_ln0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EOGY_1n0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EOGZAFn0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGZAVn0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <element xmi:type="uml:Component" href="xtextPortModel.uml#_EN8n8Fn0EeS6Qb3CQxLHEQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOGY8Vn0EeS6Qb3CQxLHEQ" x="82" y="94" width="593" height="229"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Expx8Fn0EeS6Qb3CQxLHEQ" type="2010">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Expx8ln0EeS6Qb3CQxLHEQ" type="5035"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Expx81n0EeS6Qb3CQxLHEQ" type="7020">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Expx9Fn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Expx9Vn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Expx9ln0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx91n0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Expx-Fn0EeS6Qb3CQxLHEQ" type="7021">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Expx-Vn0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Expx-ln0EeS6Qb3CQxLHEQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Expx-1n0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx_Fn0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <element xmi:type="uml:DataType" href="xtextPortModel.uml#_ExgA8Fn0EeS6Qb3CQxLHEQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Expx8Vn0EeS6Qb3CQxLHEQ" x="781" y="99"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Fe4EUVn0EeS6Qb3CQxLHEQ" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fe4EU1n0EeS6Qb3CQxLHEQ" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FfB1UFn0EeS6Qb3CQxLHEQ" type="7016">
+        <children xmi:type="notation:Shape" xmi:id="_F6__oVn0EeS6Qb3CQxLHEQ" type="3026">
+          <children xmi:type="notation:DecorationNode" xmi:id="_F6__o1n0EeS6Qb3CQxLHEQ" type="5058"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_F6__pFn0EeS6Qb3CQxLHEQ" type="7041">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_F6__pVn0EeS6Qb3CQxLHEQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_F6__pln0EeS6Qb3CQxLHEQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_F6__p1n0EeS6Qb3CQxLHEQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__qFn0EeS6Qb3CQxLHEQ"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_F6__qVn0EeS6Qb3CQxLHEQ" type="7042">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_F6__qln0EeS6Qb3CQxLHEQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_F6__q1n0EeS6Qb3CQxLHEQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_F6__rFn0EeS6Qb3CQxLHEQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__rVn0EeS6Qb3CQxLHEQ"/>
+          </children>
+          <element xmi:type="uml:PrimitiveType" href="xtextPortModel.uml#_F6__oFn0EeS6Qb3CQxLHEQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F6__oln0EeS6Qb3CQxLHEQ" x="61" y="14"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_FfB1UVn0EeS6Qb3CQxLHEQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FfB1Uln0EeS6Qb3CQxLHEQ"/>
+      </children>
+      <element xmi:type="uml:Package" href="xtextPortModel.uml#_Fe4EUFn0EeS6Qb3CQxLHEQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fe4EUln0EeS6Qb3CQxLHEQ" x="747" y="261" width="314" height="173"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_D5aiYVn0EeS6Qb3CQxLHEQ" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_D5aiYln0EeS6Qb3CQxLHEQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_D5aiY1n0EeS6Qb3CQxLHEQ">
+      <owner xmi:type="uml:Model" href="xtextPortModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="xtextPortModel.uml#_AP_koFn0EeS6Qb3CQxLHEQ"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.uml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.uml
index b7d6eb917a9..111bdfe3d2c 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.uml
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/model/xtextPortModel.uml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AP_koFn0EeS6Qb3CQxLHEQ" name="model">

-  <packagedElement xmi:type="uml:Component" xmi:id="_EN8n8Fn0EeS6Qb3CQxLHEQ" name="Component1"/>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_ExgA8Fn0EeS6Qb3CQxLHEQ" name="type1"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_Fe4EUFn0EeS6Qb3CQxLHEQ" name="Package1">

-    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_F6__oFn0EeS6Qb3CQxLHEQ" name="type2"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AP_koFn0EeS6Qb3CQxLHEQ" name="model">
+  <packagedElement xmi:type="uml:Component" xmi:id="_EN8n8Fn0EeS6Qb3CQxLHEQ" name="Component1"/>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_ExgA8Fn0EeS6Qb3CQxLHEQ" name="type1"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_Fe4EUFn0EeS6Qb3CQxLHEQ" name="Package1">
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_F6__oFn0EeS6Qb3CQxLHEQ" name="type2"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/Activator.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/Activator.java
index 7bbe8d3d406..b03ffea3abf 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/Activator.java
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/Activator.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.textedit.port.tests;

-

-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) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.textedit.port.tests;
+
+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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java
index 35c40dc2a9d..ee354a3d03f 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.textedit.port.tests.suites;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		PortGrammarTests.class

-})

-public class AllTests {

-	// JUnit 4 Test Suite

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.textedit.port.tests.suites;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		PortGrammarTests.class
+})
+public class AllTests {
+	// JUnit 4 Test Suite
+}
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.classpath
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.project b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.project
index 4dfa43f8cc2..70b718677ee 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.project
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.property.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.property.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF
index 252e75e0e00..d344f9d1c53 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.textedit.property.xtext.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.uml.textedit.property.tests.suites

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: XText Property editor Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.property.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.property.tests.suites
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: XText Property editor Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.property.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/about.html b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/about.html
index 35b45e096ae..ee7cad035a4 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/about.html
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/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>September 30, 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>September 30, 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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/build.properties b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/build.properties
index e2306275b30..74d76124156 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/build.properties
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               model/,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               model/,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.di b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.di
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.notation b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.notation
index b98e02d1a47..75c9137caf6 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.notation
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.notation
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_7DtpoFnKEeSPTqnSxdYcgw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_7wWGIFnKEeSPTqnSxdYcgw" type="2010">

-    <children xmi:type="notation:DecorationNode" xmi:id="_7wWGIlnKEeSPTqnSxdYcgw" type="5035"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_7wWGI1nKEeSPTqnSxdYcgw" type="7020">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_7wWGJFnKEeSPTqnSxdYcgw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_7wWGJVnKEeSPTqnSxdYcgw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7wWGJlnKEeSPTqnSxdYcgw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wWGJ1nKEeSPTqnSxdYcgw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_7wWGKFnKEeSPTqnSxdYcgw" type="7021">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_7wWGKVnKEeSPTqnSxdYcgw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_7wWGKlnKEeSPTqnSxdYcgw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7wWGK1nKEeSPTqnSxdYcgw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wWGLFnKEeSPTqnSxdYcgw"/>

-    </children>

-    <element xmi:type="uml:DataType" href="xtextPropertyModel.uml#_7wM8MFnKEeSPTqnSxdYcgw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wWGIVnKEeSPTqnSxdYcgw" x="599" y="149"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_PSM8MVnLEeSPTqnSxdYcgw" type="2007">

-    <children xmi:type="notation:DecorationNode" xmi:id="_PSM8M1nLEeSPTqnSxdYcgw" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_PSWGIFnLEeSPTqnSxdYcgw" type="7016">

-      <children xmi:type="notation:Shape" xmi:id="_PtkpkVnLEeSPTqnSxdYcgw" type="3026">

-        <children xmi:type="notation:DecorationNode" xmi:id="_Ptkpk1nLEeSPTqnSxdYcgw" type="5058"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_PtkplFnLEeSPTqnSxdYcgw" type="7041">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_PtkplVnLEeSPTqnSxdYcgw"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_PtkpllnLEeSPTqnSxdYcgw"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_Ptkpl1nLEeSPTqnSxdYcgw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PtkpmFnLEeSPTqnSxdYcgw"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_PtkpmVnLEeSPTqnSxdYcgw" type="7042">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_PtkpmlnLEeSPTqnSxdYcgw"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_Ptkpm1nLEeSPTqnSxdYcgw"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_PtkpnFnLEeSPTqnSxdYcgw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PtkpnVnLEeSPTqnSxdYcgw"/>

-        </children>

-        <element xmi:type="uml:PrimitiveType" href="xtextPropertyModel.uml#_PtkpkFnLEeSPTqnSxdYcgw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PtkpklnLEeSPTqnSxdYcgw" x="54" y="31"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_PSWGIVnLEeSPTqnSxdYcgw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSWGIlnLEeSPTqnSxdYcgw"/>

-    </children>

-    <element xmi:type="uml:Package" href="xtextPropertyModel.uml#_PSM8MFnLEeSPTqnSxdYcgw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSM8MlnLEeSPTqnSxdYcgw" x="217" y="260" width="308" height="165"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_7DtpoVnKEeSPTqnSxdYcgw" name="diagram_compatibility_version" stringValue="1.0.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_7DtpolnKEeSPTqnSxdYcgw"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_7Dtpo1nKEeSPTqnSxdYcgw">

-    <owner xmi:type="uml:Model" href="xtextPropertyModel.uml#_7DausFnKEeSPTqnSxdYcgw"/>

-  </styles>

-  <element xmi:type="uml:Model" href="xtextPropertyModel.uml#_7DausFnKEeSPTqnSxdYcgw"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_7DtpoFnKEeSPTqnSxdYcgw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_7wWGIFnKEeSPTqnSxdYcgw" type="2010">
+    <children xmi:type="notation:DecorationNode" xmi:id="_7wWGIlnKEeSPTqnSxdYcgw" type="5035"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_7wWGI1nKEeSPTqnSxdYcgw" type="7020">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7wWGJFnKEeSPTqnSxdYcgw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_7wWGJVnKEeSPTqnSxdYcgw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_7wWGJlnKEeSPTqnSxdYcgw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wWGJ1nKEeSPTqnSxdYcgw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_7wWGKFnKEeSPTqnSxdYcgw" type="7021">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7wWGKVnKEeSPTqnSxdYcgw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_7wWGKlnKEeSPTqnSxdYcgw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_7wWGK1nKEeSPTqnSxdYcgw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wWGLFnKEeSPTqnSxdYcgw"/>
+    </children>
+    <element xmi:type="uml:DataType" href="xtextPropertyModel.uml#_7wM8MFnKEeSPTqnSxdYcgw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wWGIVnKEeSPTqnSxdYcgw" x="599" y="149"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_PSM8MVnLEeSPTqnSxdYcgw" type="2007">
+    <children xmi:type="notation:DecorationNode" xmi:id="_PSM8M1nLEeSPTqnSxdYcgw" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_PSWGIFnLEeSPTqnSxdYcgw" type="7016">
+      <children xmi:type="notation:Shape" xmi:id="_PtkpkVnLEeSPTqnSxdYcgw" type="3026">
+        <children xmi:type="notation:DecorationNode" xmi:id="_Ptkpk1nLEeSPTqnSxdYcgw" type="5058"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_PtkplFnLEeSPTqnSxdYcgw" type="7041">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_PtkplVnLEeSPTqnSxdYcgw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_PtkpllnLEeSPTqnSxdYcgw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Ptkpl1nLEeSPTqnSxdYcgw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PtkpmFnLEeSPTqnSxdYcgw"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_PtkpmVnLEeSPTqnSxdYcgw" type="7042">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_PtkpmlnLEeSPTqnSxdYcgw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Ptkpm1nLEeSPTqnSxdYcgw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_PtkpnFnLEeSPTqnSxdYcgw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PtkpnVnLEeSPTqnSxdYcgw"/>
+        </children>
+        <element xmi:type="uml:PrimitiveType" href="xtextPropertyModel.uml#_PtkpkFnLEeSPTqnSxdYcgw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PtkpklnLEeSPTqnSxdYcgw" x="54" y="31"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_PSWGIVnLEeSPTqnSxdYcgw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSWGIlnLEeSPTqnSxdYcgw"/>
+    </children>
+    <element xmi:type="uml:Package" href="xtextPropertyModel.uml#_PSM8MFnLEeSPTqnSxdYcgw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSM8MlnLEeSPTqnSxdYcgw" x="217" y="260" width="308" height="165"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_7DtpoVnKEeSPTqnSxdYcgw" name="diagram_compatibility_version" stringValue="1.0.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_7DtpolnKEeSPTqnSxdYcgw"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_7Dtpo1nKEeSPTqnSxdYcgw">
+    <owner xmi:type="uml:Model" href="xtextPropertyModel.uml#_7DausFnKEeSPTqnSxdYcgw"/>
+  </styles>
+  <element xmi:type="uml:Model" href="xtextPropertyModel.uml#_7DausFnKEeSPTqnSxdYcgw"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.uml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.uml
index 9919327da8d..8043aac6705 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.uml
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/model/xtextPropertyModel.uml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_7DausFnKEeSPTqnSxdYcgw" name="model">

-  <packagedElement xmi:type="uml:DataType" xmi:id="_7wM8MFnKEeSPTqnSxdYcgw" name="type1"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_PSM8MFnLEeSPTqnSxdYcgw" name="Package1">

-    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_PtkpkFnLEeSPTqnSxdYcgw" name="type2"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_7DausFnKEeSPTqnSxdYcgw" name="model">
+  <packagedElement xmi:type="uml:DataType" xmi:id="_7wM8MFnKEeSPTqnSxdYcgw" name="type1"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_PSM8MFnLEeSPTqnSxdYcgw" name="Package1">
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_PtkpkFnLEeSPTqnSxdYcgw" name="type2"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/Activator.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/Activator.java
index 6ef3f698893..ebd1c9d735a 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/Activator.java
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/Activator.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.textedit.property.tests;

-

-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) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.textedit.property.tests;
+
+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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/suites/AllTests.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/suites/AllTests.java
index bbcfa50c7c7..c3e021ef404 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/suites/AllTests.java
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/suites/AllTests.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.textedit.property.tests.suites;

-

-import org.junit.runner.RunWith;

-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(ClassificationSuite.class)

-@SuiteClasses({

-		PropertyGrammarTests.class

-})

-public class AllTests {

-	// JUnit 4 Test Suite

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.textedit.property.tests.suites;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+		PropertyGrammarTests.class
+})
+public class AllTests {
+	// JUnit 4 Test Suite
+}
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF
index 35b2a32aafc..9f0463dd883 100755
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.0.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.suite.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.suite.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.textedit.port.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.textedit.property.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)"

+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 0.0.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.suite.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.suite.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.textedit.port.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.property.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)"
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.classpath
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.project b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.project
index f05bd056458..68c73ddacc0 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.project
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF
index dffc3ca41a4..624065109d6 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.emf.ecore;bundle-version="2.11.0",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.7.0",

- org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.uml.textedit.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Textedit Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="2.11.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Textedit Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/about.html b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/about.html
index 35b45e096ae..ee7cad035a4 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/about.html
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/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>September 30, 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>September 30, 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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/build.properties b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/build.properties
index 785a40c0ec7..9cbab3c135e 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/build.properties
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/build.properties
@@ -1,6 +1,6 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/src/org/eclipse/papyrus/uml/textedit/tests/AbstractGrammarTest.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/src/org/eclipse/papyrus/uml/textedit/tests/AbstractGrammarTest.java
index 7d673eb1184..df4325fb31b 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/src/org/eclipse/papyrus/uml/textedit/tests/AbstractGrammarTest.java
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/src/org/eclipse/papyrus/uml/textedit/tests/AbstractGrammarTest.java
@@ -1,48 +1,48 @@
-package org.eclipse.papyrus.uml.textedit.tests;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.NoTransactionRule;

-import org.eclipse.papyrus.uml.xtext.integration.DefaultXtextDirectEditorConfiguration;

-import org.eclipse.uml2.uml.NamedElement;

-import org.junit.Before;

-import org.junit.Rule;

-

-public abstract class AbstractGrammarTest<T extends EObject> extends AbstractPapyrusTest {

-

-	protected DefaultXtextDirectEditorConfiguration editor;

-

-	protected XTextEditorTester<T> tester;

-

-	@Rule

-	public NoTransactionRule noTransaction = new NoTransactionRule();

-

-	@Before

-	public void initEditor() {

-		editor = getEditor();

-		tester = new XTextEditorTester<T>(editor);

-	}

-

-	public <E extends NamedElement> E findElement(Class<E> type, String name) {

-		for (E element : EMFHelper.allInstances(getModelResource(), type)) {

-			if (element.getName().equals(name)) {

-				return element;

-			}

-		}

-		return null;

-	}

-

-	protected ResourceSet getResourceSet() {

-		return noTransaction.getResourceSet();

-	}

-

-	protected Resource getModelResource() {

-		return noTransaction.getModelResource();

-	}

-

-	public abstract DefaultXtextDirectEditorConfiguration getEditor();

-

-}

+package org.eclipse.papyrus.uml.textedit.tests;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.NoTransactionRule;
+import org.eclipse.papyrus.uml.xtext.integration.DefaultXtextDirectEditorConfiguration;
+import org.eclipse.uml2.uml.NamedElement;
+import org.junit.Before;
+import org.junit.Rule;
+
+public abstract class AbstractGrammarTest<T extends EObject> extends AbstractPapyrusTest {
+
+	protected DefaultXtextDirectEditorConfiguration editor;
+
+	protected XTextEditorTester<T> tester;
+
+	@Rule
+	public NoTransactionRule noTransaction = new NoTransactionRule();
+
+	@Before
+	public void initEditor() {
+		editor = getEditor();
+		tester = new XTextEditorTester<T>(editor);
+	}
+
+	public <E extends NamedElement> E findElement(Class<E> type, String name) {
+		for (E element : EMFHelper.allInstances(getModelResource(), type)) {
+			if (element.getName().equals(name)) {
+				return element;
+			}
+		}
+		return null;
+	}
+
+	protected ResourceSet getResourceSet() {
+		return noTransaction.getResourceSet();
+	}
+
+	protected Resource getModelResource() {
+		return noTransaction.getModelResource();
+	}
+
+	public abstract DefaultXtextDirectEditorConfiguration getEditor();
+
+}
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/src/org/eclipse/papyrus/uml/textedit/tests/Activator.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/src/org/eclipse/papyrus/uml/textedit/tests/Activator.java
index 6b9d6d9ee66..1b3180a573f 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/src/org/eclipse/papyrus/uml/textedit/tests/Activator.java
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/src/org/eclipse/papyrus/uml/textedit/tests/Activator.java
@@ -1,30 +1,30 @@
-package org.eclipse.papyrus.uml.textedit.tests;

-

-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;

-	}

-

-}

+package org.eclipse.papyrus.uml.textedit.tests;
+
+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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF
index a6661d95706..291a25d785d 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;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.common.ui.services,

- org.eclipse.gmf.runtime.emf.core,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.tests.suites

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.tests.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;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.common.ui.services,
+ org.eclipse.gmf.runtime.emf.core,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.textedit.tests;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.tests.suites
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.tests.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.project b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.project
index a60017e5360..2bed1b21909 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.project
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.tools.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.tools.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.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/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
index a66dabcb195..f66f289f98a 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.emf.ecore;bundle-version="2.8.0",

- 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.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.jface.text;bundle-version="3.10.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.uml.tools.tests,

- org.eclipse.papyrus.uml.tools.tests.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: UML Tools Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.tools.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.tests;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"

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="2.8.0",
+ 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.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="3.10.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.tools.tests,
+ org.eclipse.papyrus.uml.tools.tests.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: UML Tools Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.tools.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.tests;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/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/about.html b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/about.html
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/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/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/build.properties b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/build.properties
index 5bab51d6786..1ef79297625 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/build.properties
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               resources/,\

-               about.html,\

-               plugin.xml,\

-               icons/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               resources/,\
+               about.html,\
+               plugin.xml,\
+               icons/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/plugin.xml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/plugin.xml
index 697257bf86a..18f3b0cbc6e 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/plugin.xml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/plugin.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.emf.ecore.uri_mapping">

-      <mapping

-            source="pathmap://UML_TEST_LIBRARIES/"

-            target="platform:/plugin/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/">

-      </mapping>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">

-      <library

-            description="Test library for dependency management and library switch"

-            iconpath="icons/debug.gif"

-            name="Registered Library for dependency management tests"

-            path="pathmap://UML_TEST_LIBRARIES/registered-library.uml"

-            provider="Eclipse Modeling Project">

-      </library>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.core.language">

-      <provider>

-         <class

-               class="org.eclipse.papyrus.uml.tools.profile.index.ProfileLanguageProvider">

-            <parameter

-                  name="profile.1"

-                  value="platform:/resource/UMLLanguageProvidersTest/junk.profile.uml#_0">

-            </parameter>

-            <parameter

-                  name="language.1"

-                  value="org.eclipse.papyrus.uml.tools.tests.tests.UMLLanguageProvidersTest$JunkLanguage">

-            </parameter>

-         </class>

-      </provider>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.emf.ecore.uri_mapping">
+      <mapping
+            source="pathmap://UML_TEST_LIBRARIES/"
+            target="platform:/plugin/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/">
+      </mapping>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
+      <library
+            description="Test library for dependency management and library switch"
+            iconpath="icons/debug.gif"
+            name="Registered Library for dependency management tests"
+            path="pathmap://UML_TEST_LIBRARIES/registered-library.uml"
+            provider="Eclipse Modeling Project">
+      </library>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.core.language">
+      <provider>
+         <class
+               class="org.eclipse.papyrus.uml.tools.profile.index.ProfileLanguageProvider">
+            <parameter
+                  name="profile.1"
+                  value="platform:/resource/UMLLanguageProvidersTest/junk.profile.uml#_0">
+            </parameter>
+            <parameter
+                  name="language.1"
+                  value="org.eclipse.papyrus.uml.tools.tests.tests.UMLLanguageProvidersTest$JunkLanguage">
+            </parameter>
+         </class>
+      </provider>
+   </extension>
+
+</plugin>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.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/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.notation
index 81dfe705180..9a69c2a6e6e 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.notation
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_LgNjAJnQEea7EO1JCZQceQ" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_LgNjAZnQEea7EO1JCZQceQ" name="diagram_compatibility_version" stringValue="1.2.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_LgNjApnQEea7EO1JCZQceQ"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_LgNjA5nQEea7EO1JCZQceQ">

-    <owner xmi:type="uml:Model" href="model.uml#_KmXb0JnOEea7EO1JCZQceQ"/>

-  </styles>

-  <element xmi:type="uml:Model" href="model.uml#_KmXb0JnOEea7EO1JCZQceQ"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_LgNjAJnQEea7EO1JCZQceQ" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_LgNjAZnQEea7EO1JCZQceQ" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_LgNjApnQEea7EO1JCZQceQ"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_LgNjA5nQEea7EO1JCZQceQ">
+    <owner xmi:type="uml:Model" href="model.uml#_KmXb0JnOEea7EO1JCZQceQ"/>
+  </styles>
+  <element xmi:type="uml:Model" href="model.uml#_KmXb0JnOEea7EO1JCZQceQ"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.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/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.notation
index 11a075cd741..a9fc2ac36bb 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.notation
@@ -1,63 +1,63 @@
-<?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" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_I3m-gJnPEea7EO1JCZQceQ" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_Qulh0JnPEea7EO1JCZQceQ" type="Class_MetaclassShape">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qun-EJnPEea7EO1JCZQceQ" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolIJnPEea7EO1JCZQceQ" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolIZnPEea7EO1JCZQceQ" key="StereotypeList" value="StandardProfile::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolIpnPEea7EO1JCZQceQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolI5nPEea7EO1JCZQceQ" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolJJnPEea7EO1JCZQceQ" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Qumv8JnPEea7EO1JCZQceQ" type="Class_MetaclassNameLabel"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qumv8ZnPEea7EO1JCZQceQ" x="532" y="128"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_QwaGwJnPEea7EO1JCZQceQ" type="StereotypeComment">

-    <styles xmi:type="notation:TitleStyle" xmi:id="_QwaGwZnPEea7EO1JCZQceQ"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_QwaGw5nPEea7EO1JCZQceQ" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QwaGwpnPEea7EO1JCZQceQ" x="889" y="119"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_SXkR0JnPEea7EO1JCZQceQ" type="Stereotype_Shape">

-    <children xmi:type="notation:DecorationNode" xmi:id="_SXk44JnPEea7EO1JCZQceQ" type="Stereotype_NameLabel"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_SXk44ZnPEea7EO1JCZQceQ" type="Stereotype_AttributeCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_SXk44pnPEea7EO1JCZQceQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_SXk445nPEea7EO1JCZQceQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SXk45JnPEea7EO1JCZQceQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SXk45ZnPEea7EO1JCZQceQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_SXk45pnPEea7EO1JCZQceQ" type="Stereotype_OperationCompartment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_SXk455nPEea7EO1JCZQceQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_SXk46JnPEea7EO1JCZQceQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SXk46ZnPEea7EO1JCZQceQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SXk46pnPEea7EO1JCZQceQ"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="model.profile.uml#_SXjDsJnPEea7EO1JCZQceQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SXkR0ZnPEea7EO1JCZQceQ" x="533" y="271"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_I3m-gZnPEea7EO1JCZQceQ" name="diagram_compatibility_version" stringValue="1.2.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_I3m-gpnPEea7EO1JCZQceQ"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_I3m-g5nPEea7EO1JCZQceQ">

-    <owner xmi:type="uml:Profile" href="model.profile.uml#_I22JgJnPEea7EO1JCZQceQ"/>

-  </styles>

-  <element xmi:type="uml:Profile" href="model.profile.uml#_I22JgJnPEea7EO1JCZQceQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_QwbU4JnPEea7EO1JCZQceQ" type="StereotypeCommentLink" source="_Qulh0JnPEea7EO1JCZQceQ" target="_QwaGwJnPEea7EO1JCZQceQ">

-    <styles xmi:type="notation:FontStyle" xmi:id="_QwbU4ZnPEea7EO1JCZQceQ"/>

-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Qwb78pnPEea7EO1JCZQceQ" name="BASE_ELEMENT">

-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </styles>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QwbU4pnPEea7EO1JCZQceQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qwb78JnPEea7EO1JCZQceQ"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qwb78ZnPEea7EO1JCZQceQ"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_TcKiYJnPEea7EO1JCZQceQ" type="Extension_Edge" source="_SXkR0JnPEea7EO1JCZQceQ" target="_Qulh0JnPEea7EO1JCZQceQ">

-    <styles xmi:type="notation:FontStyle" xmi:id="_TcKiYZnPEea7EO1JCZQceQ"/>

-    <element xmi:type="uml:Extension" href="model.profile.uml#_Tb6qwJnPEea7EO1JCZQceQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TcKiYpnPEea7EO1JCZQceQ" points="[582, 271, -643984, -643984]$[582, 178, -643984, -643984]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TcfSgJnPEea7EO1JCZQceQ" id="(0.49,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TcfSgZnPEea7EO1JCZQceQ" id="(0.5,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" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_I3m-gJnPEea7EO1JCZQceQ" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_Qulh0JnPEea7EO1JCZQceQ" type="Class_MetaclassShape">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qun-EJnPEea7EO1JCZQceQ" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolIJnPEea7EO1JCZQceQ" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolIZnPEea7EO1JCZQceQ" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolIpnPEea7EO1JCZQceQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolI5nPEea7EO1JCZQceQ" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QuolJJnPEea7EO1JCZQceQ" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Qumv8JnPEea7EO1JCZQceQ" type="Class_MetaclassNameLabel"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qumv8ZnPEea7EO1JCZQceQ" x="532" y="128"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QwaGwJnPEea7EO1JCZQceQ" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_QwaGwZnPEea7EO1JCZQceQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_QwaGw5nPEea7EO1JCZQceQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QwaGwpnPEea7EO1JCZQceQ" x="889" y="119"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_SXkR0JnPEea7EO1JCZQceQ" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_SXk44JnPEea7EO1JCZQceQ" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SXk44ZnPEea7EO1JCZQceQ" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SXk44pnPEea7EO1JCZQceQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SXk445nPEea7EO1JCZQceQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SXk45JnPEea7EO1JCZQceQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SXk45ZnPEea7EO1JCZQceQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SXk45pnPEea7EO1JCZQceQ" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SXk455nPEea7EO1JCZQceQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SXk46JnPEea7EO1JCZQceQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SXk46ZnPEea7EO1JCZQceQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SXk46pnPEea7EO1JCZQceQ"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="model.profile.uml#_SXjDsJnPEea7EO1JCZQceQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SXkR0ZnPEea7EO1JCZQceQ" x="533" y="271"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_I3m-gZnPEea7EO1JCZQceQ" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_I3m-gpnPEea7EO1JCZQceQ"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_I3m-g5nPEea7EO1JCZQceQ">
+    <owner xmi:type="uml:Profile" href="model.profile.uml#_I22JgJnPEea7EO1JCZQceQ"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="model.profile.uml#_I22JgJnPEea7EO1JCZQceQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_QwbU4JnPEea7EO1JCZQceQ" type="StereotypeCommentLink" source="_Qulh0JnPEea7EO1JCZQceQ" target="_QwaGwJnPEea7EO1JCZQceQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_QwbU4ZnPEea7EO1JCZQceQ"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Qwb78pnPEea7EO1JCZQceQ" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QwbU4pnPEea7EO1JCZQceQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qwb78JnPEea7EO1JCZQceQ"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qwb78ZnPEea7EO1JCZQceQ"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_TcKiYJnPEea7EO1JCZQceQ" type="Extension_Edge" source="_SXkR0JnPEea7EO1JCZQceQ" target="_Qulh0JnPEea7EO1JCZQceQ">
+    <styles xmi:type="notation:FontStyle" xmi:id="_TcKiYZnPEea7EO1JCZQceQ"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_Tb6qwJnPEea7EO1JCZQceQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TcKiYpnPEea7EO1JCZQceQ" points="[582, 271, -643984, -643984]$[582, 178, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TcfSgJnPEea7EO1JCZQceQ" id="(0.49,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TcfSgZnPEea7EO1JCZQceQ" id="(0.5,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.uml
index 7c8b12a9db7..04d2328e864 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.profile.uml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_I22JgJnPEea7EO1JCZQceQ" name="ProfileTest" metaclassReference="_QuiegJnPEea7EO1JCZQceQ">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Uzqg0JnPEea7EO1JCZQceQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_XrxWYJnPEea7EO1JCZQceQ" name="ProfileTest" nsURI="http:///schemas/ProfileTest/_XrwvUJnPEea7EO1JCZQceQ/1" nsPrefix="ProfileTest">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xrx9cJnPEea7EO1JCZQceQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9cZnPEea7EO1JCZQceQ" key="Version" value="0.0.2"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9cpnPEea7EO1JCZQceQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9c5nPEea7EO1JCZQceQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9dJnPEea7EO1JCZQceQ" key="Date" value="2016-10-24"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9dZnPEea7EO1JCZQceQ" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_XrxWYZnPEea7EO1JCZQceQ" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XrxWYpnPEea7EO1JCZQceQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_SXjDsJnPEea7EO1JCZQceQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_XrxWY5nPEea7EO1JCZQceQ" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_UzrH4JnPEea7EO1JCZQceQ" name="RootElement" nsURI="http:///schemas/RootElement/_UzpSsJnPEea7EO1JCZQceQ/0" nsPrefix="RootElement">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UzwncJnPEea7EO1JCZQceQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzwncZnPEea7EO1JCZQceQ" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzwncpnPEea7EO1JCZQceQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Uzwnc5nPEea7EO1JCZQceQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzwndJnPEea7EO1JCZQceQ" key="Date" value="2016-10-24"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzwndZnPEea7EO1JCZQceQ" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_UzrH4ZnPEea7EO1JCZQceQ" name="Stereotype1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UzrH4pnPEea7EO1JCZQceQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_SXjDsJnPEea7EO1JCZQceQ"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UzrH45nPEea7EO1JCZQceQ" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_QuiegJnPEea7EO1JCZQceQ" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_SXjDsJnPEea7EO1JCZQceQ" name="Stereotype1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Tb9HAJnPEea7EO1JCZQceQ" name="base_Class" association="_Tb6qwJnPEea7EO1JCZQceQ">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_Tb6qwJnPEea7EO1JCZQceQ" name="E_Stereotype1_Class1" memberEnd="_Tb8f8JnPEea7EO1JCZQceQ _Tb9HAJnPEea7EO1JCZQceQ">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Tb8f8JnPEea7EO1JCZQceQ" name="extension_Stereotype1" type="_SXjDsJnPEea7EO1JCZQceQ" aggregation="composite" association="_Tb6qwJnPEea7EO1JCZQceQ"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_I22JgJnPEea7EO1JCZQceQ" name="ProfileTest" metaclassReference="_QuiegJnPEea7EO1JCZQceQ">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Uzqg0JnPEea7EO1JCZQceQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_XrxWYJnPEea7EO1JCZQceQ" name="ProfileTest" nsURI="http:///schemas/ProfileTest/_XrwvUJnPEea7EO1JCZQceQ/1" nsPrefix="ProfileTest">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xrx9cJnPEea7EO1JCZQceQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9cZnPEea7EO1JCZQceQ" key="Version" value="0.0.2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9cpnPEea7EO1JCZQceQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9c5nPEea7EO1JCZQceQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9dJnPEea7EO1JCZQceQ" key="Date" value="2016-10-24"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xrx9dZnPEea7EO1JCZQceQ" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_XrxWYZnPEea7EO1JCZQceQ" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XrxWYpnPEea7EO1JCZQceQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_SXjDsJnPEea7EO1JCZQceQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_XrxWY5nPEea7EO1JCZQceQ" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_UzrH4JnPEea7EO1JCZQceQ" name="RootElement" nsURI="http:///schemas/RootElement/_UzpSsJnPEea7EO1JCZQceQ/0" nsPrefix="RootElement">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UzwncJnPEea7EO1JCZQceQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzwncZnPEea7EO1JCZQceQ" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzwncpnPEea7EO1JCZQceQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Uzwnc5nPEea7EO1JCZQceQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzwndJnPEea7EO1JCZQceQ" key="Date" value="2016-10-24"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzwndZnPEea7EO1JCZQceQ" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_UzrH4ZnPEea7EO1JCZQceQ" name="Stereotype1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UzrH4pnPEea7EO1JCZQceQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_SXjDsJnPEea7EO1JCZQceQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_UzrH45nPEea7EO1JCZQceQ" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_QuiegJnPEea7EO1JCZQceQ" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_SXjDsJnPEea7EO1JCZQceQ" name="Stereotype1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Tb9HAJnPEea7EO1JCZQceQ" name="base_Class" association="_Tb6qwJnPEea7EO1JCZQceQ">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_Tb6qwJnPEea7EO1JCZQceQ" name="E_Stereotype1_Class1" memberEnd="_Tb8f8JnPEea7EO1JCZQceQ _Tb9HAJnPEea7EO1JCZQceQ">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Tb8f8JnPEea7EO1JCZQceQ" name="extension_Stereotype1" type="_SXjDsJnPEea7EO1JCZQceQ" aggregation="composite" association="_Tb6qwJnPEea7EO1JCZQceQ"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.uml
index c6af12a7ec5..1a34b68ac4c 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/CustomizableLabelProvider/model.uml
@@ -1,28 +1,28 @@
-<?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:ProfileTest="http:///schemas/ProfileTest/_XrwvUJnPEea7EO1JCZQceQ/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ProfileTest/_XrwvUJnPEea7EO1JCZQceQ/1 model.profile.uml#_XrxWYJnPEea7EO1JCZQceQ">

-  <uml:Model xmi:id="_KmXb0JnOEea7EO1JCZQceQ" name="RootElement">

-    <ownedComment xmi:type="uml:Comment" xmi:id="_P2VgoJnOEea7EO1JCZQceQ"/>

-    <ownedComment xmi:type="uml:Comment" xmi:id="_RVipkJnOEea7EO1JCZQceQ">

-      <body>body comment</body>

-    </ownedComment>

-    <ownedTemplateSignature xmi:type="uml:TemplateSignature" xmi:id="_MI_DEJqoEea7EO1JCZQceQ" parameter="_P8DFAJqoEea7EO1JCZQceQ">

-      <ownedParameter xmi:type="uml:TemplateParameter" xmi:id="_P8DFAJqoEea7EO1JCZQceQ"/>

-    </ownedTemplateSignature>

-    <packagedElement xmi:type="uml:Class" xmi:id="_OGGSEJnOEea7EO1JCZQceQ" name="SimpleClass"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_WbJ4gJnOEea7EO1JCZQceQ" name="StereotypedClass"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_1Y0OEJnPEea7EO1JCZQceQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1Y2DQJnPEea7EO1JCZQceQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DQZnPEea7EO1JCZQceQ" key="Version" value="0.0.2"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DQpnPEea7EO1JCZQceQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DQ5nPEea7EO1JCZQceQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DRJnPEea7EO1JCZQceQ" key="Date" value="2016-10-24"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DRZnPEea7EO1JCZQceQ" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1Y1cMJnPEea7EO1JCZQceQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="model.profile.uml#_XrxWYJnPEea7EO1JCZQceQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_I22JgJnPEea7EO1JCZQceQ"/>

-    </profileApplication>

-  </uml:Model>

-  <ProfileTest:Stereotype1 xmi:id="_20jMQJnPEea7EO1JCZQceQ" base_Class="_WbJ4gJnOEea7EO1JCZQceQ"/>

-</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:ProfileTest="http:///schemas/ProfileTest/_XrwvUJnPEea7EO1JCZQceQ/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ProfileTest/_XrwvUJnPEea7EO1JCZQceQ/1 model.profile.uml#_XrxWYJnPEea7EO1JCZQceQ">
+  <uml:Model xmi:id="_KmXb0JnOEea7EO1JCZQceQ" name="RootElement">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_P2VgoJnOEea7EO1JCZQceQ"/>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_RVipkJnOEea7EO1JCZQceQ">
+      <body>body comment</body>
+    </ownedComment>
+    <ownedTemplateSignature xmi:type="uml:TemplateSignature" xmi:id="_MI_DEJqoEea7EO1JCZQceQ" parameter="_P8DFAJqoEea7EO1JCZQceQ">
+      <ownedParameter xmi:type="uml:TemplateParameter" xmi:id="_P8DFAJqoEea7EO1JCZQceQ"/>
+    </ownedTemplateSignature>
+    <packagedElement xmi:type="uml:Class" xmi:id="_OGGSEJnOEea7EO1JCZQceQ" name="SimpleClass"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_WbJ4gJnOEea7EO1JCZQceQ" name="StereotypedClass"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_1Y0OEJnPEea7EO1JCZQceQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1Y2DQJnPEea7EO1JCZQceQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DQZnPEea7EO1JCZQceQ" key="Version" value="0.0.2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DQpnPEea7EO1JCZQceQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DQ5nPEea7EO1JCZQceQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DRJnPEea7EO1JCZQceQ" key="Date" value="2016-10-24"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Y2DRZnPEea7EO1JCZQceQ" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1Y1cMJnPEea7EO1JCZQceQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_XrxWYJnPEea7EO1JCZQceQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_I22JgJnPEea7EO1JCZQceQ"/>
+    </profileApplication>
+  </uml:Model>
+  <ProfileTest:Stereotype1 xmi:id="_20jMQJnPEea7EO1JCZQceQ" base_Class="_WbJ4gJnOEea7EO1JCZQceQ"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.di
index 98dd12539fd..5b67986e092 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="copy-of-library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="copy-of-library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>

-        </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="copy-of-library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="copy-of-library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.notation
index d9b152bde1a..75a80f94b93 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.notation
@@ -1,272 +1,272 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_gvvLwvQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_iLO5YfQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iLO5Y_Q1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5ZPQ1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5ZfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5ZvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5Z_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5aPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5afQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5avQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5a_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5bPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5bfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5bvQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLh0UPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLh0UfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5b_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5cPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5cfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5cvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iMHqMPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iMHqM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iMHqNPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iMHqMfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iMHqMvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="copy-of-library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5YvQ1EeK9gKrxk10euQ" x="305" y="210"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_iQ41cfQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iQ41c_Q1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41dPQ1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41g_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41dfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41dvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41d_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ePQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41efQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41hfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41evQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41e_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41fPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ffQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41fvQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41h_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41iPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41f_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41gPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41gfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41gvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iRB_YPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iRB_Y_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iRB_ZPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iRB_YfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iRB_YvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="copy-of-library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41cvQ1EeK9gKrxk10euQ" x="665" y="210"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_iVyjkfQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iVyjk_Q1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjlPQ1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjo_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjlfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjlvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjl_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjmPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjmfQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjpfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjmvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjm_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjnPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjnfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjnvQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjp_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjqPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjn_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjoPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjofQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjovQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iWGFkPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iWGFk_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iWGFlPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iWGFkfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iWGFkvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="copy-of-library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjkvQ1EeK9gKrxk10euQ" x="990" y="215"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_irEQAfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_irEQA_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQBPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQBfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQBvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQB_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQCPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQCfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQFfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQCvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQC_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQDPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQDfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQDvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQF_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQGPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQD_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQEPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQEfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQEvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irXK8PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irXK8_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irXK9PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irXK8fQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irXK8vQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="copy-of-library.uml#_irEQAPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQAvQ1EeK9gKrxk10euQ" x="305" y="493"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_iwbRIfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iwbRI_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRJPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRJfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRJvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRJ_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRKPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRKfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRNfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRKvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRK_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRLPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRLfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRLvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRN_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbROPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRL_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRMPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRMfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRMvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwkbEPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwkbE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwkbFPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwkbEfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwkbEvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="copy-of-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRIvQ1EeK9gKrxk10euQ" x="675" y="485"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_i1ewQfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_i1ewQ_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewRPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewU_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewRfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewRvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewR_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewSPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewSfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewVfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewSvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewS_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewTPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewTfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewTvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewV_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewWPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewT_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewUPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewUfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewUvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ohQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ohQ_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ohRPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ohQfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ohQvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="copy-of-library.uml#_i1ewQPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewQvQ1EeK9gKrxk10euQ" x="997" y="491"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_gvvLw_Q1EeK9gKrxk10euQ"/>

-  <element xmi:type="uml:Model" href="copy-of-library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_lWc4WvQ1EeK9gKrxk10euQ" type="4003" source="_irEQAfQ1EeK9gKrxk10euQ" target="_iLO5YfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4ZPQ1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4ZvQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4afQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4a_Q1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lWc4W_Q1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="copy-of-library.uml#_lWJ-R_Q1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lWc4XPQ1EeK9gKrxk10euQ" points="[-4, -50, 12, 232]$[34, -232, 50, 50]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_lgRikfQ1EeK9gKrxk10euQ" type="4003" source="_iwbRIfQ1EeK9gKrxk10euQ" target="_iQ41cfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilPQ1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRilfQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilvQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRil_Q1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lgRikvQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="copy-of-library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lgRik_Q1EeK9gKrxk10euQ" points="[-8, -50, 23, 209]$[-36, -207, -5, 52]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_lqPW4fQ1EeK9gKrxk10euQ" type="4003" source="_i1ewQfQ1EeK9gKrxk10euQ" target="_iVyjkfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5PQ1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5fQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5vQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5_Q1EeK9gKrxk10euQ" x="8" y="65"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lqPW4vQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="copy-of-library.uml#_lqPW4PQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lqPW4_Q1EeK9gKrxk10euQ" points="[-16, -50, 49, 223]$[-115, -266, -50, 7]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_gvvLwvQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_iLO5YfQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iLO5Y_Q1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5ZPQ1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5ZfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5ZvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5Z_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5aPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5afQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5avQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5a_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5bPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5bfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5bvQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLh0UPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLh0UfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5b_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5cPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5cfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5cvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iMHqMPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iMHqM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iMHqNPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iMHqMfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iMHqMvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="copy-of-library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5YvQ1EeK9gKrxk10euQ" x="305" y="210"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_iQ41cfQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iQ41c_Q1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41dPQ1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41g_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41dfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41dvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41d_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ePQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41efQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41hfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41evQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41e_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41fPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ffQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41fvQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41h_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41iPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41f_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41gPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41gfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41gvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iRB_YPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iRB_Y_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iRB_ZPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iRB_YfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iRB_YvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="copy-of-library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41cvQ1EeK9gKrxk10euQ" x="665" y="210"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_iVyjkfQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iVyjk_Q1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjlPQ1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjo_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjlfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjlvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjl_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjmPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjmfQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjpfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjmvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjm_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjnPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjnfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjnvQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjp_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjqPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjn_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjoPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjofQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjovQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iWGFkPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iWGFk_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iWGFlPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iWGFkfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iWGFkvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="copy-of-library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjkvQ1EeK9gKrxk10euQ" x="990" y="215"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_irEQAfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_irEQA_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQBPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQBfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQBvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQB_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQCPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQCfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQFfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQCvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQC_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQDPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQDfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQDvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQF_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQGPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQD_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQEPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQEfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQEvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irXK8PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irXK8_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irXK9PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irXK8fQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irXK8vQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="copy-of-library.uml#_irEQAPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQAvQ1EeK9gKrxk10euQ" x="305" y="493"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_iwbRIfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iwbRI_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRJPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRJfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRJvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRJ_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRKPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRKfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRNfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRKvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRK_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRLPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRLfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRLvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRN_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbROPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRL_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRMPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRMfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRMvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwkbEPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwkbE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwkbFPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwkbEfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwkbEvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="copy-of-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRIvQ1EeK9gKrxk10euQ" x="675" y="485"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_i1ewQfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_i1ewQ_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewRPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewU_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewRfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewRvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewR_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewSPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewSfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewVfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewSvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewS_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewTPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewTfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewTvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewV_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewWPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewT_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewUPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewUfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewUvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ohQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ohQ_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ohRPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ohQfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ohQvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="copy-of-library.uml#_i1ewQPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewQvQ1EeK9gKrxk10euQ" x="997" y="491"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_gvvLw_Q1EeK9gKrxk10euQ"/>
+  <element xmi:type="uml:Model" href="copy-of-library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_lWc4WvQ1EeK9gKrxk10euQ" type="4003" source="_irEQAfQ1EeK9gKrxk10euQ" target="_iLO5YfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4ZPQ1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4ZvQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4afQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4a_Q1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lWc4W_Q1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="copy-of-library.uml#_lWJ-R_Q1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lWc4XPQ1EeK9gKrxk10euQ" points="[-4, -50, 12, 232]$[34, -232, 50, 50]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_lgRikfQ1EeK9gKrxk10euQ" type="4003" source="_iwbRIfQ1EeK9gKrxk10euQ" target="_iQ41cfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilPQ1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRilfQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilvQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRil_Q1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lgRikvQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="copy-of-library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lgRik_Q1EeK9gKrxk10euQ" points="[-8, -50, 23, 209]$[-36, -207, -5, 52]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_lqPW4fQ1EeK9gKrxk10euQ" type="4003" source="_i1ewQfQ1EeK9gKrxk10euQ" target="_iVyjkfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5PQ1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5fQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5vQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5_Q1EeK9gKrxk10euQ" x="8" y="65"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lqPW4vQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="copy-of-library.uml#_lqPW4PQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lqPW4_Q1EeK9gKrxk10euQ" points="[-16, -50, 49, 223]$[-115, -266, -50, 7]"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.uml
index bdfc49671cd..64482f55acd 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/copy-of-library.uml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_gvvLwPQ1EeK9gKrxk10euQ" name="Library">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_gvvLwfQ1EeK9gKrxk10euQ">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_iLO5YPQ1EeK9gKrxk10euQ" name="Interface1"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_iQ41cPQ1EeK9gKrxk10euQ" name="Interface2"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_iVyjkPQ1EeK9gKrxk10euQ" name="Interface3"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_irEQAPQ1EeK9gKrxk10euQ" clientDependency="_lWJ-R_Q1EeK9gKrxk10euQ" name="Class1" isAbstract="true">

-    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lWJ-R_Q1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_irEQAPQ1EeK9gKrxk10euQ" supplier="_iLO5YPQ1EeK9gKrxk10euQ" contract="_iLO5YPQ1EeK9gKrxk10euQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_iwbRIPQ1EeK9gKrxk10euQ" clientDependency="_lgRikPQ1EeK9gKrxk10euQ" name="Class2" isAbstract="true">

-    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lgRikPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_iwbRIPQ1EeK9gKrxk10euQ" supplier="_iQ41cPQ1EeK9gKrxk10euQ" contract="_iQ41cPQ1EeK9gKrxk10euQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_i1ewQPQ1EeK9gKrxk10euQ" clientDependency="_lqPW4PQ1EeK9gKrxk10euQ" name="Class3" isAbstract="true">

-    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lqPW4PQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_i1ewQPQ1EeK9gKrxk10euQ" supplier="_iVyjkPQ1EeK9gKrxk10euQ" contract="_iVyjkPQ1EeK9gKrxk10euQ"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_gvvLwPQ1EeK9gKrxk10euQ" name="Library">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_gvvLwfQ1EeK9gKrxk10euQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_iLO5YPQ1EeK9gKrxk10euQ" name="Interface1"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_iQ41cPQ1EeK9gKrxk10euQ" name="Interface2"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_iVyjkPQ1EeK9gKrxk10euQ" name="Interface3"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_irEQAPQ1EeK9gKrxk10euQ" clientDependency="_lWJ-R_Q1EeK9gKrxk10euQ" name="Class1" isAbstract="true">
+    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lWJ-R_Q1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_irEQAPQ1EeK9gKrxk10euQ" supplier="_iLO5YPQ1EeK9gKrxk10euQ" contract="_iLO5YPQ1EeK9gKrxk10euQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_iwbRIPQ1EeK9gKrxk10euQ" clientDependency="_lgRikPQ1EeK9gKrxk10euQ" name="Class2" isAbstract="true">
+    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lgRikPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_iwbRIPQ1EeK9gKrxk10euQ" supplier="_iQ41cPQ1EeK9gKrxk10euQ" contract="_iQ41cPQ1EeK9gKrxk10euQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_i1ewQPQ1EeK9gKrxk10euQ" clientDependency="_lqPW4PQ1EeK9gKrxk10euQ" name="Class3" isAbstract="true">
+    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lqPW4PQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_i1ewQPQ1EeK9gKrxk10euQ" supplier="_iVyjkPQ1EeK9gKrxk10euQ" contract="_iVyjkPQ1EeK9gKrxk10euQ"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.di
index 732cbeedc0d..70f018ff8f2 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="registered-library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="registered-library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>

-        </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="registered-library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="registered-library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.notation
index f683619e2ee..4de9ac73ac8 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.notation
@@ -1,278 +1,278 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_gvvLwvQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_iLO5YfQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iLO5Y_Q1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5ZPQ1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5ZfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5ZvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5Z_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5aPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5afQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5avQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5a_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5bPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5bfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5bvQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLh0UPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLh0UfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5b_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5cPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5cfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5cvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iMHqMPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iMHqM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iMHqNPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iMHqMfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iMHqMvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="registered-library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5YvQ1EeK9gKrxk10euQ" x="305" y="209"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_iQ41cfQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iQ41c_Q1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41dPQ1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41g_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41dfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41dvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41d_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ePQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41efQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41hfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41evQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41e_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41fPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ffQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41fvQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41h_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41iPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41f_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41gPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41gfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41gvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iRB_YPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iRB_Y_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iRB_ZPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iRB_YfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iRB_YvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="registered-library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41cvQ1EeK9gKrxk10euQ" x="662" y="210"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_iVyjkfQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iVyjk_Q1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjlPQ1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjo_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjlfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjlvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjl_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjmPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjmfQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjpfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjmvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjm_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjnPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjnfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjnvQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjp_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjqPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjn_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjoPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjofQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjovQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iWGFkPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iWGFk_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iWGFlPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iWGFkfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iWGFkvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="registered-library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjkvQ1EeK9gKrxk10euQ" x="995" y="221"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_irEQAfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_irEQA_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQBPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQBfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQBvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQB_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQCPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQCfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQFfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQCvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQC_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQDPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQDfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQDvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQF_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQGPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQD_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQEPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQEfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQEvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irXK8PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irXK8_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irXK9PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irXK8fQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irXK8vQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="registered-library.uml#_irEQAPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQAvQ1EeK9gKrxk10euQ" x="305" y="493"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_iwbRIfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iwbRI_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRJPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRJfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRJvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRJ_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRKPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRKfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRNfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRKvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRK_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRLPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRLfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRLvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRN_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbROPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRL_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRMPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRMfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRMvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwkbEPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwkbE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwkbFPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwkbEfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwkbEvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="registered-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRIvQ1EeK9gKrxk10euQ" x="670" y="472"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_i1ewQfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_i1ewQ_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewRPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewU_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewRfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewRvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewR_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewSPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewSfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewVfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewSvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewS_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewTPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewTfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewTvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewV_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewWPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewT_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewUPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewUfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewUvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ohQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ohQ_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ohRPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ohQfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ohQvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="registered-library.uml#_i1ewQPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewQvQ1EeK9gKrxk10euQ" x="997" y="491"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_gvvLw_Q1EeK9gKrxk10euQ"/>

-  <element xmi:type="uml:Model" href="registered-library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_lWc4WvQ1EeK9gKrxk10euQ" type="4003" source="_irEQAfQ1EeK9gKrxk10euQ" target="_iLO5YfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4ZPQ1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4ZvQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4afQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4a_Q1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lWc4W_Q1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="registered-library.uml#_lWJ-R_Q1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lWc4XPQ1EeK9gKrxk10euQ" points="[-4, -50, 12, 232]$[34, -232, 50, 50]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sY_sQL84EeOR564LzLpryg" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sZBhcL84EeOR564LzLpryg" id="(0.5,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_lgRikfQ1EeK9gKrxk10euQ" type="4003" source="_iwbRIfQ1EeK9gKrxk10euQ" target="_iQ41cfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilPQ1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRilfQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilvQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRil_Q1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lgRikvQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="registered-library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lgRik_Q1EeK9gKrxk10euQ" points="[-8, -50, 23, 209]$[-36, -207, -5, 52]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_snbw4L84EeOR564LzLpryg" id="(0.42,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sncX8L84EeOR564LzLpryg" id="(0.5,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_lqPW4fQ1EeK9gKrxk10euQ" type="4003" source="_i1ewQfQ1EeK9gKrxk10euQ" target="_iVyjkfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5PQ1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5fQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5vQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5_Q1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lqPW4vQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="registered-library.uml#_lqPW4PQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lqPW4_Q1EeK9gKrxk10euQ" points="[-16, -50, 49, 223]$[-115, -266, -50, 7]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s2oqgL84EeOR564LzLpryg" id="(0.48,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s2pRkL84EeOR564LzLpryg" id="(0.5,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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_gvvLwvQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_iLO5YfQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iLO5Y_Q1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5ZPQ1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5ZfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5ZvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5Z_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5aPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5afQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5avQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5a_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5bPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5bfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5bvQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLh0UPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLh0UfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5b_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5cPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5cfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5cvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iMHqMPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iMHqM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iMHqNPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iMHqMfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iMHqMvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="registered-library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5YvQ1EeK9gKrxk10euQ" x="305" y="209"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_iQ41cfQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iQ41c_Q1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41dPQ1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41g_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41dfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41dvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41d_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ePQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41efQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41hfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41evQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41e_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41fPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ffQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41fvQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41h_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41iPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41f_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41gPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41gfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41gvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iRB_YPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iRB_Y_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iRB_ZPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iRB_YfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iRB_YvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="registered-library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41cvQ1EeK9gKrxk10euQ" x="662" y="210"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_iVyjkfQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iVyjk_Q1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjlPQ1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjo_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjlfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjlvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjl_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjmPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjmfQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjpfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjmvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjm_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjnPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjnfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjnvQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjp_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjqPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjn_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjoPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjofQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjovQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iWGFkPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iWGFk_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iWGFlPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iWGFkfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iWGFkvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="registered-library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjkvQ1EeK9gKrxk10euQ" x="995" y="221"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_irEQAfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_irEQA_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQBPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQBfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQBvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQB_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQCPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQCfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQFfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQCvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQC_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQDPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQDfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQDvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQF_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQGPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQD_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQEPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQEfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQEvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irXK8PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irXK8_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irXK9PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irXK8fQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irXK8vQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="registered-library.uml#_irEQAPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQAvQ1EeK9gKrxk10euQ" x="305" y="493"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_iwbRIfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iwbRI_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRJPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRJfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRJvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRJ_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRKPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRKfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRNfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRKvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRK_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRLPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRLfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRLvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRN_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbROPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRL_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRMPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRMfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRMvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwkbEPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwkbE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwkbFPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwkbEfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwkbEvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="registered-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRIvQ1EeK9gKrxk10euQ" x="670" y="472"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_i1ewQfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_i1ewQ_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewRPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewU_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewRfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewRvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewR_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewSPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewSfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewVfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewSvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewS_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewTPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewTfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewTvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewV_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewWPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewT_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewUPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewUfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewUvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ohQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ohQ_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ohRPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ohQfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ohQvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="registered-library.uml#_i1ewQPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewQvQ1EeK9gKrxk10euQ" x="997" y="491"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_gvvLw_Q1EeK9gKrxk10euQ"/>
+  <element xmi:type="uml:Model" href="registered-library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_lWc4WvQ1EeK9gKrxk10euQ" type="4003" source="_irEQAfQ1EeK9gKrxk10euQ" target="_iLO5YfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4ZPQ1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4ZvQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4afQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4a_Q1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lWc4W_Q1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="registered-library.uml#_lWJ-R_Q1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lWc4XPQ1EeK9gKrxk10euQ" points="[-4, -50, 12, 232]$[34, -232, 50, 50]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sY_sQL84EeOR564LzLpryg" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sZBhcL84EeOR564LzLpryg" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_lgRikfQ1EeK9gKrxk10euQ" type="4003" source="_iwbRIfQ1EeK9gKrxk10euQ" target="_iQ41cfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilPQ1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRilfQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilvQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRil_Q1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lgRikvQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="registered-library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lgRik_Q1EeK9gKrxk10euQ" points="[-8, -50, 23, 209]$[-36, -207, -5, 52]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_snbw4L84EeOR564LzLpryg" id="(0.42,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sncX8L84EeOR564LzLpryg" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_lqPW4fQ1EeK9gKrxk10euQ" type="4003" source="_i1ewQfQ1EeK9gKrxk10euQ" target="_iVyjkfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5PQ1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5fQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5vQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5_Q1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lqPW4vQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="registered-library.uml#_lqPW4PQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lqPW4_Q1EeK9gKrxk10euQ" points="[-16, -50, 49, 223]$[-115, -266, -50, 7]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s2oqgL84EeOR564LzLpryg" id="(0.48,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s2pRkL84EeOR564LzLpryg" id="(0.5,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.uml
index bb8548fb5b7..099bfda326c 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/libraries/registered/registered-library.uml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_gvvLwPQ1EeK9gKrxk10euQ" name="Library">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_gvvLwfQ1EeK9gKrxk10euQ">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_iLO5YPQ1EeK9gKrxk10euQ" name="Interface1"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_iQ41cPQ1EeK9gKrxk10euQ" name="Interface2"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_iVyjkPQ1EeK9gKrxk10euQ" name="Interface3"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_irEQAPQ1EeK9gKrxk10euQ" name="Class1" isAbstract="true">

-    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lWJ-R_Q1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_irEQAPQ1EeK9gKrxk10euQ" supplier="_iLO5YPQ1EeK9gKrxk10euQ" contract="_iLO5YPQ1EeK9gKrxk10euQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_iwbRIPQ1EeK9gKrxk10euQ" name="Class2" isAbstract="true">

-    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lgRikPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_iwbRIPQ1EeK9gKrxk10euQ" supplier="_iQ41cPQ1EeK9gKrxk10euQ" contract="_iQ41cPQ1EeK9gKrxk10euQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_i1ewQPQ1EeK9gKrxk10euQ" name="Class3" isAbstract="true">

-    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lqPW4PQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_i1ewQPQ1EeK9gKrxk10euQ" supplier="_iVyjkPQ1EeK9gKrxk10euQ" contract="_iVyjkPQ1EeK9gKrxk10euQ"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_gvvLwPQ1EeK9gKrxk10euQ" name="Library">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_gvvLwfQ1EeK9gKrxk10euQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_iLO5YPQ1EeK9gKrxk10euQ" name="Interface1"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_iQ41cPQ1EeK9gKrxk10euQ" name="Interface2"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_iVyjkPQ1EeK9gKrxk10euQ" name="Interface3"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_irEQAPQ1EeK9gKrxk10euQ" name="Class1" isAbstract="true">
+    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lWJ-R_Q1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_irEQAPQ1EeK9gKrxk10euQ" supplier="_iLO5YPQ1EeK9gKrxk10euQ" contract="_iLO5YPQ1EeK9gKrxk10euQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_iwbRIPQ1EeK9gKrxk10euQ" name="Class2" isAbstract="true">
+    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lgRikPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_iwbRIPQ1EeK9gKrxk10euQ" supplier="_iQ41cPQ1EeK9gKrxk10euQ" contract="_iQ41cPQ1EeK9gKrxk10euQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_i1ewQPQ1EeK9gKrxk10euQ" name="Class3" isAbstract="true">
+    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lqPW4PQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_i1ewQPQ1EeK9gKrxk10euQ" supplier="_iVyjkPQ1EeK9gKrxk10euQ" contract="_iVyjkPQ1EeK9gKrxk10euQ"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.di
index 256f0d0e402..583924ebbcd 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>

-        </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="library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="library.notation#_gvvLwvQ1EeK9gKrxk10euQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.notation
index a7cc7dadee8..2f8e4953789 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.notation
@@ -1,272 +1,272 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_gvvLwvQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_iLO5YfQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iLO5Y_Q1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5ZPQ1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5ZfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5ZvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5Z_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5aPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5afQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5avQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5a_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5bPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5bfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5bvQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLh0UPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLh0UfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5b_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5cPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5cfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5cvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iMHqMPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iMHqM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iMHqNPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iMHqMfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iMHqMvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5YvQ1EeK9gKrxk10euQ" x="289" y="209"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_iQ41cfQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iQ41c_Q1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41dPQ1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41g_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41dfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41dvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41d_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ePQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41efQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41hfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41evQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41e_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41fPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ffQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41fvQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41h_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41iPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41f_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41gPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41gfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41gvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iRB_YPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iRB_Y_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iRB_ZPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iRB_YfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iRB_YvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41cvQ1EeK9gKrxk10euQ" x="639" y="211"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_iVyjkfQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iVyjk_Q1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjlPQ1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjo_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjlfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjlvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjl_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjmPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjmfQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjpfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjmvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjm_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjnPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjnfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjnvQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjp_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjqPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjn_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjoPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjofQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjovQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iWGFkPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iWGFk_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iWGFlPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iWGFkfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iWGFkvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjkvQ1EeK9gKrxk10euQ" x="932" y="216"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_irEQAfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_irEQA_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQBPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQBfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQBvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQB_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQCPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQCfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQFfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQCvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQC_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQDPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQDfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQDvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQF_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQGPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQD_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQEPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQEfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQEvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_irXK8PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irXK8_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irXK9PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_irXK8fQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irXK8vQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="library.uml#_irEQAPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQAvQ1EeK9gKrxk10euQ" x="305" y="493"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_iwbRIfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iwbRI_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRJPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRJfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRJvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRJ_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRKPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRKfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRNfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRKvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRK_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRLPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRLfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRLvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRN_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbROPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRL_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRMPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRMfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRMvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_iwkbEPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwkbE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwkbFPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iwkbEfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwkbEvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRIvQ1EeK9gKrxk10euQ" x="670" y="472"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_i1ewQfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_i1ewQ_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewRPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewU_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewRfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewRvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewR_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewSPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewSfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewVfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewSvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewS_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewTPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewTfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewTvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewV_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewWPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewT_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewUPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewUfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewUvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ohQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ohQ_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ohRPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ohQfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ohQvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="library.uml#_i1ewQPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewQvQ1EeK9gKrxk10euQ" x="997" y="491"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_gvvLw_Q1EeK9gKrxk10euQ"/>

-  <element xmi:type="uml:Model" href="library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_lWc4WvQ1EeK9gKrxk10euQ" type="4003" source="_irEQAfQ1EeK9gKrxk10euQ" target="_iLO5YfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4ZPQ1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4ZvQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4afQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4a_Q1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lWc4W_Q1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="library.uml#_lWJ-R_Q1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lWc4XPQ1EeK9gKrxk10euQ" points="[-4, -50, 12, 232]$[34, -232, 50, 50]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_lgRikfQ1EeK9gKrxk10euQ" type="4003" source="_iwbRIfQ1EeK9gKrxk10euQ" target="_iQ41cfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilPQ1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRilfQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilvQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRil_Q1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lgRikvQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lgRik_Q1EeK9gKrxk10euQ" points="[-8, -50, 23, 209]$[-36, -207, -5, 52]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_lqPW4fQ1EeK9gKrxk10euQ" type="4003" source="_i1ewQfQ1EeK9gKrxk10euQ" target="_iVyjkfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5PQ1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5fQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5vQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5_Q1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lqPW4vQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="library.uml#_lqPW4PQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lqPW4_Q1EeK9gKrxk10euQ" points="[-16, -50, 49, 223]$[-115, -266, -50, 7]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_gvvLwvQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_iLO5YfQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iLO5Y_Q1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5ZPQ1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5ZfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5ZvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5Z_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5aPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5afQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLYDUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLYDU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5avQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5a_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5bPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5bfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iLO5bvQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iLh0UPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iLh0UfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iLO5b_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iLO5cPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iLO5cfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5cvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iMHqMPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iMHqM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iMHqNPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iMHqMfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iMHqMvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLO5YvQ1EeK9gKrxk10euQ" x="289" y="209"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_iQ41cfQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iQ41c_Q1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41dPQ1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41g_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41dfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41dvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41d_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ePQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41efQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41hfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41hvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41evQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41e_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41fPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41ffQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iQ41fvQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iQ41h_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iQ41iPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iQ41f_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iQ41gPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQ41gfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41gvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iRB_YPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iRB_Y_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iRB_ZPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iRB_YfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iRB_YvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQ41cvQ1EeK9gKrxk10euQ" x="639" y="211"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_iVyjkfQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iVyjk_Q1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjlPQ1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjo_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjlfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjlvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjl_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjmPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjmfQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjpfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjpvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjmvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjm_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjnPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjnfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iVyjnvQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iVyjp_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iVyjqPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iVyjn_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iVyjoPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iVyjofQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjovQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iWGFkPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iWGFk_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iWGFlPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iWGFkfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iWGFkvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVyjkvQ1EeK9gKrxk10euQ" x="932" y="216"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_irEQAfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_irEQA_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQBPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQBfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQBvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQB_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQCPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQCfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQFfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQFvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQCvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQC_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQDPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQDfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irEQDvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irEQF_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irEQGPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irEQD_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_irEQEPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_irEQEfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQEvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_irXK8PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_irXK8_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_irXK9PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_irXK8fQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irXK8vQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="library.uml#_irEQAPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irEQAvQ1EeK9gKrxk10euQ" x="305" y="493"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_iwbRIfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iwbRI_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRJPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRM_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRJfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRJvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRJ_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRKPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRKfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRNfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbRNvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRKvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRK_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRLPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRLfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwbRLvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwbRN_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwbROPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwbRL_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_iwbRMPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iwbRMfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRMvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_iwkbEPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iwkbE_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iwkbFPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iwkbEfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwkbEvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iwbRIvQ1EeK9gKrxk10euQ" x="670" y="472"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_i1ewQfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_i1ewQ_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewRPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewU_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewRfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewRvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewR_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewSPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewSfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewVfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewVvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewSvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewS_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewTPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewTfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ewTvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ewV_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ewWPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ewT_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i1ewUPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i1ewUfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewUvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i1ohQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i1ohQ_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i1ohRPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i1ohQfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ohQvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="library.uml#_i1ewQPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i1ewQvQ1EeK9gKrxk10euQ" x="997" y="491"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_gvvLw_Q1EeK9gKrxk10euQ"/>
+  <element xmi:type="uml:Model" href="library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_lWc4WvQ1EeK9gKrxk10euQ" type="4003" source="_irEQAfQ1EeK9gKrxk10euQ" target="_iLO5YfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4ZPQ1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4ZvQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lWc4afQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lWc4a_Q1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lWc4W_Q1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="library.uml#_lWJ-R_Q1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lWc4XPQ1EeK9gKrxk10euQ" points="[-4, -50, 12, 232]$[34, -232, 50, 50]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_lgRikfQ1EeK9gKrxk10euQ" type="4003" source="_iwbRIfQ1EeK9gKrxk10euQ" target="_iQ41cfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilPQ1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRilfQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lgRilvQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lgRil_Q1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lgRikvQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lgRik_Q1EeK9gKrxk10euQ" points="[-8, -50, 23, 209]$[-36, -207, -5, 52]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_lqPW4fQ1EeK9gKrxk10euQ" type="4003" source="_i1ewQfQ1EeK9gKrxk10euQ" target="_iVyjkfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5PQ1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5fQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lqPW5vQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lqPW5_Q1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lqPW4vQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="library.uml#_lqPW4PQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lqPW4_Q1EeK9gKrxk10euQ" points="[-16, -50, 49, 223]$[-115, -266, -50, 7]"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.uml
index daaf1758445..bf4245e2f83 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/library.uml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_gvvLwPQ1EeK9gKrxk10euQ" name="Library">

-  <packageImport xmi:id="_gvvLwfQ1EeK9gKrxk10euQ">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_iLO5YPQ1EeK9gKrxk10euQ" name="Interface1"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_iQ41cPQ1EeK9gKrxk10euQ" name="Interface2"/>

-  <packagedElement xmi:type="uml:Interface" xmi:id="_iVyjkPQ1EeK9gKrxk10euQ" name="Interface3"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_irEQAPQ1EeK9gKrxk10euQ" clientDependency="_lWJ-R_Q1EeK9gKrxk10euQ" name="Class1" isAbstract="true">

-    <interfaceRealization xmi:id="_lWJ-R_Q1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_irEQAPQ1EeK9gKrxk10euQ" supplier="_iLO5YPQ1EeK9gKrxk10euQ" contract="_iLO5YPQ1EeK9gKrxk10euQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_iwbRIPQ1EeK9gKrxk10euQ" clientDependency="_lgRikPQ1EeK9gKrxk10euQ" name="Class2" isAbstract="true">

-    <interfaceRealization xmi:id="_lgRikPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_iwbRIPQ1EeK9gKrxk10euQ" supplier="_iQ41cPQ1EeK9gKrxk10euQ" contract="_iQ41cPQ1EeK9gKrxk10euQ"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_i1ewQPQ1EeK9gKrxk10euQ" clientDependency="_lqPW4PQ1EeK9gKrxk10euQ" name="Class3" isAbstract="true">

-    <interfaceRealization xmi:id="_lqPW4PQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_i1ewQPQ1EeK9gKrxk10euQ" supplier="_iVyjkPQ1EeK9gKrxk10euQ" contract="_iVyjkPQ1EeK9gKrxk10euQ"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_gvvLwPQ1EeK9gKrxk10euQ" name="Library">
+  <packageImport xmi:id="_gvvLwfQ1EeK9gKrxk10euQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_iLO5YPQ1EeK9gKrxk10euQ" name="Interface1"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_iQ41cPQ1EeK9gKrxk10euQ" name="Interface2"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_iVyjkPQ1EeK9gKrxk10euQ" name="Interface3"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_irEQAPQ1EeK9gKrxk10euQ" clientDependency="_lWJ-R_Q1EeK9gKrxk10euQ" name="Class1" isAbstract="true">
+    <interfaceRealization xmi:id="_lWJ-R_Q1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_irEQAPQ1EeK9gKrxk10euQ" supplier="_iLO5YPQ1EeK9gKrxk10euQ" contract="_iLO5YPQ1EeK9gKrxk10euQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_iwbRIPQ1EeK9gKrxk10euQ" clientDependency="_lgRikPQ1EeK9gKrxk10euQ" name="Class2" isAbstract="true">
+    <interfaceRealization xmi:id="_lgRikPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_iwbRIPQ1EeK9gKrxk10euQ" supplier="_iQ41cPQ1EeK9gKrxk10euQ" contract="_iQ41cPQ1EeK9gKrxk10euQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_i1ewQPQ1EeK9gKrxk10euQ" clientDependency="_lqPW4PQ1EeK9gKrxk10euQ" name="Class3" isAbstract="true">
+    <interfaceRealization xmi:id="_lqPW4PQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_i1ewQPQ1EeK9gKrxk10euQ" supplier="_iVyjkPQ1EeK9gKrxk10euQ" contract="_iVyjkPQ1EeK9gKrxk10euQ"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.di
index 659b345eb99..3c63225aad2 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="model-with-registered.notation#_Zt12UPQ1EeK9gKrxk10euQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model-with-registered.notation#_Zt12UPQ1EeK9gKrxk10euQ"/>

-        </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="model-with-registered.notation#_Zt12UPQ1EeK9gKrxk10euQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model-with-registered.notation#_Zt12UPQ1EeK9gKrxk10euQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.notation
index 109e6aa5e00..b9cc7470158 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.notation
@@ -1,349 +1,349 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Zt12UPQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_adcuUPQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_admfUPQ1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_admfUfQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_cPkMMPQ1EeK9gKrxk10euQ" type="3012">

-        <element xmi:type="uml:Property" href="model-with-registered.uml#_cPQqMPQ1EeK9gKrxk10euQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cPkMMfQ1EeK9gKrxk10euQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_cugK8PQ1EeK9gKrxk10euQ" type="3012">

-        <element xmi:type="uml:Property" href="model-with-registered.uml#_cuXBAPQ1EeK9gKrxk10euQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cugK8fQ1EeK9gKrxk10euQ"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_admfUvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_admfU_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfVPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfVfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_admfVvQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_admfV_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_admfWPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfWfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfWvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_admfW_Q1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQVPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQVfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_admfXPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_admfXfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfXvQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfX_Q1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_aeDLQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aeMVMPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aeMVMfQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_aeDLQfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aeDLQvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="model-with-registered.uml#_aa6-wPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_adcuUfQ1EeK9gKrxk10euQ" x="265" y="360"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_anHnsfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_anHns_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_anHntPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnw_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnxPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_anHntfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_anHntvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnt_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnuPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_anHnufQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnxfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnxvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_anHnuvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_anHnu_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnvPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnvfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_anHnvvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnx_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnyPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_anHnv_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_anHnwPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnwfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnwvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_anRYsPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anRYs_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anRYtPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_anRYsfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anRYsvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="model-with-registered.uml#_anHnsPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnsvQ1EeK9gKrxk10euQ" x="810" y="390"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_ar4y8fQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_ar4y8_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y9PQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zA_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zBPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y9fQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4y9vQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4y9_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y-PQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y-fQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zBfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zBvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y-vQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4y-_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4y_PQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y_fQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y_vQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zB_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zCPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y__Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4zAPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4zAfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4zAvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_asLt4PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_asLt4_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_asLt5PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_asLt4fQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_asLt4vQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="model-with-registered.uml#_ar4y8PQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y8vQ1EeK9gKrxk10euQ" x="540" y="590"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_s63E0PQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_s63E0vQ1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E0_Q1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E4vQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E4_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E1PQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E1fQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E1vQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E1_Q1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E2PQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E5PQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E5fQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E2fQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E2vQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E2_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E3PQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E3fQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E5vQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E5_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E3vQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E3_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E4PQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E4fQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_wPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_w_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_xPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_wfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_wvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E0fQ1EeK9gKrxk10euQ" x="290" y="135"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_s7J_xfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_s7J_x_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_yPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_1_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_2PQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_yfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_yvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_y_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_zPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_zfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_2fQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_2vQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_zvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_z_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_0PQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_0fQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_0vQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_2_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_3PQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_0_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_1PQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_1fQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_1vQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7TwwPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7Tww_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7TwxPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7TwwfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7TwwvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_xvQ1EeK9gKrxk10euQ" x="810" y="205"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_tuVwMPQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_tuVwMvQ1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwM_Q1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwQvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwQ_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwNPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwNfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwNvQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwN_Q1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwOPQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwRPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwRfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwOfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwOvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwO_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwPPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwPfQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwRvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwR_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwPvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwP_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwQPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwQfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_tue6IPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tue6I_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tue6JPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_tue6IfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tue6IvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwMfQ1EeK9gKrxk10euQ" x="805" y="15"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_Zt12UfQ1EeK9gKrxk10euQ"/>

-  <element xmi:type="uml:Model" href="model-with-registered.uml#_ZtZxs_Q1EeK9gKrxk10euQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_bKYs0PQ1EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_anHnsfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs0_Q1EeK9gKrxk10euQ" type="6001">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs1PQ1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs1fQ1EeK9gKrxk10euQ" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs1vQ1EeK9gKrxk10euQ" x="16" y="42"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs1_Q1EeK9gKrxk10euQ" type="6003">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs2PQ1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs2fQ1EeK9gKrxk10euQ" type="6005">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs2vQ1EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs2_Q1EeK9gKrxk10euQ" type="6033">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs3PQ1EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs3fQ1EeK9gKrxk10euQ" type="6034">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs3vQ1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_bKYs0fQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:Association" href="model-with-registered.uml#_bKO70_Q1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bKYs0vQ1EeK9gKrxk10euQ" points="[50, -25, -352, 174]$[423, -221, 21, -22]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bOi0EPQ1EeK9gKrxk10euQ" id="(0.77,0.22)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_bVGIB_Q1EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_adcuUPQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGICvQ1EeK9gKrxk10euQ" type="6001">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIC_Q1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIDPQ1EeK9gKrxk10euQ" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIDfQ1EeK9gKrxk10euQ" x="-22" y="45"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIDvQ1EeK9gKrxk10euQ" type="6003">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGID_Q1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIEPQ1EeK9gKrxk10euQ" type="6005">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIEfQ1EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIEvQ1EeK9gKrxk10euQ" type="6033">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIE_Q1EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIFPQ1EeK9gKrxk10euQ" type="6034">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIFfQ1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_bVGICPQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:Association" href="model-with-registered.uml#_bVGIA_Q1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bVGICfQ1EeK9gKrxk10euQ" points="[-32, -50, 125, 188]$[-163, -288, -6, -50]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_uGlREPQ1EeK9gKrxk10euQ" type="4003" source="_s7J_xfQ1EeK9gKrxk10euQ" target="_tuVwMPQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_uGlRE_Q1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uGlRFPQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_uGlRFfQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uGlRFvQ1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_uGlREfQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uGlREvQ1EeK9gKrxk10euQ" points="[6, -50, -13, 94]$[12, -92, -7, 52]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_wES68fQ1EeK9gKrxk10euQ" type="4002" source="_anHnsfQ1EeK9gKrxk10euQ" target="_s7J_xfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_wES69PQ1EeK9gKrxk10euQ" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wES69fQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_wES68vQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wES68_Q1EeK9gKrxk10euQ" points="[-7, -50, -7, 135]$[-7, -135, -7, 50]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_yJmakPQ1EeK9gKrxk10euQ" type="4003" source="_adcuUPQ1EeK9gKrxk10euQ" target="_s63E0PQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_yJmak_Q1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_yJmalPQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_yJmalfQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_yJmalvQ1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_yJmakfQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="model-with-registered.uml#_yJcpkPQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yJmakvQ1EeK9gKrxk10euQ" points="[5, -19, 0, 163]$[5, -130, 0, 52]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yJwLkPQ1EeK9gKrxk10euQ" id="(0.4473684210526316,0.16964285714285715)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_lsXWcPQ4EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_tuVwMPQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWc_Q4EeK9gKrxk10euQ" type="6001">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWdPQ4EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWdfQ4EeK9gKrxk10euQ" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWdvQ4EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWd_Q4EeK9gKrxk10euQ" type="6003">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWePQ4EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWefQ4EeK9gKrxk10euQ" type="6005">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWevQ4EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWe_Q4EeK9gKrxk10euQ" type="6033">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWfPQ4EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWffQ4EeK9gKrxk10euQ" type="6034">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWfvQ4EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lsXWcfQ4EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:Association" href="model-with-registered.uml#_lsOMg_Q4EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lsXWcvQ4EeK9gKrxk10euQ" points="[8, -22, -211, 526]$[214, -549, -5, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lsqRYPQ4EeK9gKrxk10euQ" id="(0.51,0.22)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lsqRYfQ4EeK9gKrxk10euQ" id="(0.05,0.47115384615384615)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Zt12UPQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_adcuUPQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_admfUPQ1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_admfUfQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_cPkMMPQ1EeK9gKrxk10euQ" type="3012">
+        <element xmi:type="uml:Property" href="model-with-registered.uml#_cPQqMPQ1EeK9gKrxk10euQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cPkMMfQ1EeK9gKrxk10euQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_cugK8PQ1EeK9gKrxk10euQ" type="3012">
+        <element xmi:type="uml:Property" href="model-with-registered.uml#_cuXBAPQ1EeK9gKrxk10euQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cugK8fQ1EeK9gKrxk10euQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_admfUvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_admfU_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfVPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfVfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_admfVvQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_admfV_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_admfWPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfWfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfWvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_admfW_Q1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQVPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQVfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_admfXPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_admfXfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfXvQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfX_Q1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_aeDLQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aeMVMPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aeMVMfQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aeDLQfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aeDLQvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="model-with-registered.uml#_aa6-wPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_adcuUfQ1EeK9gKrxk10euQ" x="265" y="360"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_anHnsfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_anHns_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_anHntPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnw_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnxPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_anHntfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_anHntvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnt_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnuPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_anHnufQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnxfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnxvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_anHnuvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_anHnu_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnvPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnvfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_anHnvvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnx_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnyPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_anHnv_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_anHnwPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnwfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnwvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_anRYsPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anRYs_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anRYtPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_anRYsfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anRYsvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="model-with-registered.uml#_anHnsPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnsvQ1EeK9gKrxk10euQ" x="810" y="390"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ar4y8fQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ar4y8_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y9PQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zA_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zBPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y9fQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4y9vQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4y9_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y-PQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y-fQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zBfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zBvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y-vQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4y-_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4y_PQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y_fQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y_vQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zB_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zCPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y__Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4zAPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4zAfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4zAvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_asLt4PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_asLt4_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_asLt5PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_asLt4fQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_asLt4vQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="model-with-registered.uml#_ar4y8PQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y8vQ1EeK9gKrxk10euQ" x="540" y="590"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_s63E0PQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_s63E0vQ1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E0_Q1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E4vQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E4_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E1PQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E1fQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E1vQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E1_Q1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E2PQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E5PQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E5fQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E2fQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E2vQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E2_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E3PQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E3fQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E5vQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E5_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E3vQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E3_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E4PQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E4fQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_wPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_w_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_xPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_wfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_wvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E0fQ1EeK9gKrxk10euQ" x="290" y="135"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_s7J_xfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_s7J_x_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_yPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_1_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_2PQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_yfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_yvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_y_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_zPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_zfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_2fQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_2vQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_zvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_z_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_0PQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_0fQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_0vQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_2_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_3PQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_0_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_1PQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_1fQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_1vQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7TwwPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7Tww_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7TwxPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7TwwfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7TwwvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_xvQ1EeK9gKrxk10euQ" x="810" y="205"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_tuVwMPQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_tuVwMvQ1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwM_Q1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwQvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwQ_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwNPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwNfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwNvQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwN_Q1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwOPQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwRPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwRfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwOfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwOvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwO_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwPPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwPfQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwRvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwR_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwPvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwP_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwQPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwQfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_tue6IPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tue6I_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tue6JPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tue6IfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tue6IvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwMfQ1EeK9gKrxk10euQ" x="805" y="15"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_Zt12UfQ1EeK9gKrxk10euQ"/>
+  <element xmi:type="uml:Model" href="model-with-registered.uml#_ZtZxs_Q1EeK9gKrxk10euQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_bKYs0PQ1EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_anHnsfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs0_Q1EeK9gKrxk10euQ" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs1PQ1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs1fQ1EeK9gKrxk10euQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs1vQ1EeK9gKrxk10euQ" x="16" y="42"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs1_Q1EeK9gKrxk10euQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs2PQ1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs2fQ1EeK9gKrxk10euQ" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs2vQ1EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs2_Q1EeK9gKrxk10euQ" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs3PQ1EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs3fQ1EeK9gKrxk10euQ" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs3vQ1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_bKYs0fQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:Association" href="model-with-registered.uml#_bKO70_Q1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bKYs0vQ1EeK9gKrxk10euQ" points="[50, -25, -352, 174]$[423, -221, 21, -22]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bOi0EPQ1EeK9gKrxk10euQ" id="(0.77,0.22)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_bVGIB_Q1EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_adcuUPQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGICvQ1EeK9gKrxk10euQ" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIC_Q1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIDPQ1EeK9gKrxk10euQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIDfQ1EeK9gKrxk10euQ" x="-22" y="45"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIDvQ1EeK9gKrxk10euQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGID_Q1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIEPQ1EeK9gKrxk10euQ" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIEfQ1EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIEvQ1EeK9gKrxk10euQ" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIE_Q1EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIFPQ1EeK9gKrxk10euQ" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIFfQ1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_bVGICPQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:Association" href="model-with-registered.uml#_bVGIA_Q1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bVGICfQ1EeK9gKrxk10euQ" points="[-32, -50, 125, 188]$[-163, -288, -6, -50]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_uGlREPQ1EeK9gKrxk10euQ" type="4003" source="_s7J_xfQ1EeK9gKrxk10euQ" target="_tuVwMPQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_uGlRE_Q1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uGlRFPQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uGlRFfQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uGlRFvQ1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_uGlREfQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uGlREvQ1EeK9gKrxk10euQ" points="[6, -50, -13, 94]$[12, -92, -7, 52]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_wES68fQ1EeK9gKrxk10euQ" type="4002" source="_anHnsfQ1EeK9gKrxk10euQ" target="_s7J_xfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_wES69PQ1EeK9gKrxk10euQ" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_wES69fQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_wES68vQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wES68_Q1EeK9gKrxk10euQ" points="[-7, -50, -7, 135]$[-7, -135, -7, 50]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_yJmakPQ1EeK9gKrxk10euQ" type="4003" source="_adcuUPQ1EeK9gKrxk10euQ" target="_s63E0PQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_yJmak_Q1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_yJmalPQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_yJmalfQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_yJmalvQ1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_yJmakfQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="model-with-registered.uml#_yJcpkPQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yJmakvQ1EeK9gKrxk10euQ" points="[5, -19, 0, 163]$[5, -130, 0, 52]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yJwLkPQ1EeK9gKrxk10euQ" id="(0.4473684210526316,0.16964285714285715)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_lsXWcPQ4EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_tuVwMPQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWc_Q4EeK9gKrxk10euQ" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWdPQ4EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWdfQ4EeK9gKrxk10euQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWdvQ4EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWd_Q4EeK9gKrxk10euQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWePQ4EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWefQ4EeK9gKrxk10euQ" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWevQ4EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWe_Q4EeK9gKrxk10euQ" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWfPQ4EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWffQ4EeK9gKrxk10euQ" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWfvQ4EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lsXWcfQ4EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:Association" href="model-with-registered.uml#_lsOMg_Q4EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lsXWcvQ4EeK9gKrxk10euQ" points="[8, -22, -211, 526]$[214, -549, -5, -1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lsqRYPQ4EeK9gKrxk10euQ" id="(0.51,0.22)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lsqRYfQ4EeK9gKrxk10euQ" id="(0.05,0.47115384615384615)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.uml
index 2b6d39c7df0..20f99ba1bf2 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model-with-registered.uml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ZtZxs_Q1EeK9gKrxk10euQ" name="Model">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_ZtZxtPQ1EeK9gKrxk10euQ">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_oe_9gPQ1EeK9gKrxk10euQ">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Class" xmi:id="_aa6-wPQ1EeK9gKrxk10euQ" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_cPQqMPQ1EeK9gKrxk10euQ" name="Attribute1">

-      <type xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_cuXBAPQ1EeK9gKrxk10euQ" name="Attribute2">

-      <type xmi:type="uml:Class" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>

-    </ownedAttribute>

-    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_yJcpkPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_aa6-wPQ1EeK9gKrxk10euQ">

-      <supplier xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>

-    </interfaceRealization>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_anHnsPQ1EeK9gKrxk10euQ" name="Class2">

-    <generalization xmi:type="uml:Generalization" xmi:id="_bhtwgMDBEeOzc9ROZxsqOw">

-      <general xmi:type="uml:Class" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>

-    </generalization>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_ar4y8PQ1EeK9gKrxk10euQ" name="Class3">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_bKO70PQ1EeK9gKrxk10euQ" name="class2" type="_anHnsPQ1EeK9gKrxk10euQ" association="_bKO70_Q1EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bKO70fQ1EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bKO70vQ1EeK9gKrxk10euQ" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_bVGIAPQ1EeK9gKrxk10euQ" name="class1" type="_aa6-wPQ1EeK9gKrxk10euQ" association="_bVGIA_Q1EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bVGIAfQ1EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVGIAvQ1EeK9gKrxk10euQ" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_lsOMgPQ4EeK9gKrxk10euQ" name="interface2" association="_lsOMg_Q4EeK9gKrxk10euQ">

-      <type xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lsOMgfQ4EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lsOMgvQ4EeK9gKrxk10euQ" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_bKO70_Q1EeK9gKrxk10euQ" name="class3_class2_1" memberEnd="_bKO71PQ1EeK9gKrxk10euQ _bKO70PQ1EeK9gKrxk10euQ">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_bKO71PQ1EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_bKO70_Q1EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bKO71fQ1EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bKO71vQ1EeK9gKrxk10euQ" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_bVGIA_Q1EeK9gKrxk10euQ" name="class3_class1_1" memberEnd="_bVGIBPQ1EeK9gKrxk10euQ _bVGIAPQ1EeK9gKrxk10euQ">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_bVGIBPQ1EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_bVGIA_Q1EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bVGIBfQ1EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVGIBvQ1EeK9gKrxk10euQ" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_lsOMg_Q4EeK9gKrxk10euQ" name="class3_interface2_1" memberEnd="_lsOMhPQ4EeK9gKrxk10euQ _lsOMgPQ4EeK9gKrxk10euQ">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_lsOMhPQ4EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_lsOMg_Q4EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lsOMhfQ4EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lsOMhvQ4EeK9gKrxk10euQ" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ZtZxs_Q1EeK9gKrxk10euQ" name="Model">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_ZtZxtPQ1EeK9gKrxk10euQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_oe_9gPQ1EeK9gKrxk10euQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_aa6-wPQ1EeK9gKrxk10euQ" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_cPQqMPQ1EeK9gKrxk10euQ" name="Attribute1">
+      <type xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_cuXBAPQ1EeK9gKrxk10euQ" name="Attribute2">
+      <type xmi:type="uml:Class" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>
+    </ownedAttribute>
+    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_yJcpkPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_aa6-wPQ1EeK9gKrxk10euQ">
+      <supplier xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>
+    </interfaceRealization>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_anHnsPQ1EeK9gKrxk10euQ" name="Class2">
+    <generalization xmi:type="uml:Generalization" xmi:id="_bhtwgMDBEeOzc9ROZxsqOw">
+      <general xmi:type="uml:Class" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>
+    </generalization>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ar4y8PQ1EeK9gKrxk10euQ" name="Class3">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_bKO70PQ1EeK9gKrxk10euQ" name="class2" type="_anHnsPQ1EeK9gKrxk10euQ" association="_bKO70_Q1EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bKO70fQ1EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bKO70vQ1EeK9gKrxk10euQ" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_bVGIAPQ1EeK9gKrxk10euQ" name="class1" type="_aa6-wPQ1EeK9gKrxk10euQ" association="_bVGIA_Q1EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bVGIAfQ1EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVGIAvQ1EeK9gKrxk10euQ" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_lsOMgPQ4EeK9gKrxk10euQ" name="interface2" association="_lsOMg_Q4EeK9gKrxk10euQ">
+      <type xmi:type="uml:Interface" href="pathmap://UML_TEST_LIBRARIES/registered-library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lsOMgfQ4EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lsOMgvQ4EeK9gKrxk10euQ" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_bKO70_Q1EeK9gKrxk10euQ" name="class3_class2_1" memberEnd="_bKO71PQ1EeK9gKrxk10euQ _bKO70PQ1EeK9gKrxk10euQ">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_bKO71PQ1EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_bKO70_Q1EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bKO71fQ1EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bKO71vQ1EeK9gKrxk10euQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_bVGIA_Q1EeK9gKrxk10euQ" name="class3_class1_1" memberEnd="_bVGIBPQ1EeK9gKrxk10euQ _bVGIAPQ1EeK9gKrxk10euQ">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_bVGIBPQ1EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_bVGIA_Q1EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bVGIBfQ1EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVGIBvQ1EeK9gKrxk10euQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_lsOMg_Q4EeK9gKrxk10euQ" name="class3_interface2_1" memberEnd="_lsOMhPQ4EeK9gKrxk10euQ _lsOMgPQ4EeK9gKrxk10euQ">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_lsOMhPQ4EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_lsOMg_Q4EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lsOMhfQ4EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lsOMhvQ4EeK9gKrxk10euQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.di
index 8c2a79adc65..f53617ba3d6 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_Zt12UPQ1EeK9gKrxk10euQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_Zt12UPQ1EeK9gKrxk10euQ"/>

-        </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="model.notation#_Zt12UPQ1EeK9gKrxk10euQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_Zt12UPQ1EeK9gKrxk10euQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.notation
index 51a1d4eb6dc..63bb5f1d96d 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.notation
@@ -1,349 +1,349 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Zt12UPQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_adcuUPQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_admfUPQ1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_admfUfQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_cPkMMPQ1EeK9gKrxk10euQ" type="3012">

-        <element xmi:type="uml:Property" href="model.uml#_cPQqMPQ1EeK9gKrxk10euQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cPkMMfQ1EeK9gKrxk10euQ"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_cugK8PQ1EeK9gKrxk10euQ" type="3012">

-        <element xmi:type="uml:Property" href="model.uml#_cuXBAPQ1EeK9gKrxk10euQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cugK8fQ1EeK9gKrxk10euQ"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_admfUvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_admfU_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfVPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfVfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_admfVvQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_admfV_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_admfWPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfWfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfWvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_admfW_Q1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQVPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQVfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_admfXPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_admfXfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfXvQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfX_Q1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_aeDLQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aeMVMPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aeMVMfQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_aeDLQfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aeDLQvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="model.uml#_aa6-wPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_adcuUfQ1EeK9gKrxk10euQ" x="265" y="360"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_anHnsfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_anHns_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_anHntPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnw_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnxPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_anHntfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_anHntvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnt_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnuPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_anHnufQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnxfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnxvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_anHnuvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_anHnu_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnvPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnvfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_anHnvvQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnx_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnyPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_anHnv_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_anHnwPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnwfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnwvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_anRYsPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anRYs_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anRYtPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_anRYsfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anRYsvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="model.uml#_anHnsPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnsvQ1EeK9gKrxk10euQ" x="810" y="390"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_ar4y8fQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_ar4y8_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y9PQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zA_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zBPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y9fQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4y9vQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4y9_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y-PQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y-fQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zBfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zBvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y-vQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4y-_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4y_PQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y_fQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y_vQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zB_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zCPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y__Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4zAPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4zAfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4zAvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_asLt4PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_asLt4_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_asLt5PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_asLt4fQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_asLt4vQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="model.uml#_ar4y8PQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y8vQ1EeK9gKrxk10euQ" x="540" y="590"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_s63E0PQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_s63E0vQ1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E0_Q1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E4vQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E4_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E1PQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E1fQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E1vQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E1_Q1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E2PQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E5PQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E5fQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E2fQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E2vQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E2_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E3PQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E3fQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E5vQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E5_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E3vQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E3_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E4PQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E4fQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_wPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_w_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_xPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_wfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_wvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E0fQ1EeK9gKrxk10euQ" x="290" y="135"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_s7J_xfQ1EeK9gKrxk10euQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_s7J_x_Q1EeK9gKrxk10euQ" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_yPQ1EeK9gKrxk10euQ" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_1_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_2PQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_yfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_yvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_y_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_zPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_zfQ1EeK9gKrxk10euQ" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_2fQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_2vQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_zvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_z_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_0PQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_0fQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_0vQ1EeK9gKrxk10euQ" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_2_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_3PQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_0_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_1PQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_1fQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_1vQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_s7TwwPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7Tww_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7TwxPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_s7TwwfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7TwwvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_xvQ1EeK9gKrxk10euQ" x="810" y="205"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_tuVwMPQ1EeK9gKrxk10euQ" type="2004">

-    <children xmi:type="notation:DecorationNode" xmi:id="_tuVwMvQ1EeK9gKrxk10euQ" type="5011"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwM_Q1EeK9gKrxk10euQ" type="7006">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwQvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwQ_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwNPQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwNfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwNvQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwN_Q1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwOPQ1EeK9gKrxk10euQ" type="7007">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwRPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwRfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwOfQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwOvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwO_Q1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwPPQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwPfQ1EeK9gKrxk10euQ" type="7008">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwRvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwR_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwPvQ1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwP_Q1EeK9gKrxk10euQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwQPQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwQfQ1EeK9gKrxk10euQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_tue6IPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tue6I_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tue6JPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_tue6IfQ1EeK9gKrxk10euQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tue6IvQ1EeK9gKrxk10euQ"/>

-    </children>

-    <element xmi:type="uml:Interface" href="library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwMfQ1EeK9gKrxk10euQ" x="805" y="15"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_Zt12UfQ1EeK9gKrxk10euQ"/>

-  <element xmi:type="uml:Model" href="model.uml#_ZtZxs_Q1EeK9gKrxk10euQ"/>

-  <edges xmi:type="notation:Connector" xmi:id="_bKYs0PQ1EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_anHnsfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs0_Q1EeK9gKrxk10euQ" type="6001">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs1PQ1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs1fQ1EeK9gKrxk10euQ" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs1vQ1EeK9gKrxk10euQ" x="16" y="42"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs1_Q1EeK9gKrxk10euQ" type="6003">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs2PQ1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs2fQ1EeK9gKrxk10euQ" type="6005">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs2vQ1EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs2_Q1EeK9gKrxk10euQ" type="6033">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs3PQ1EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs3fQ1EeK9gKrxk10euQ" type="6034">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs3vQ1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_bKYs0fQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:Association" href="model.uml#_bKO70_Q1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bKYs0vQ1EeK9gKrxk10euQ" points="[50, -25, -352, 174]$[423, -221, 21, -22]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bOi0EPQ1EeK9gKrxk10euQ" id="(0.77,0.22)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_bVGIB_Q1EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_adcuUPQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGICvQ1EeK9gKrxk10euQ" type="6001">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIC_Q1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIDPQ1EeK9gKrxk10euQ" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIDfQ1EeK9gKrxk10euQ" x="-22" y="45"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIDvQ1EeK9gKrxk10euQ" type="6003">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGID_Q1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIEPQ1EeK9gKrxk10euQ" type="6005">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIEfQ1EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIEvQ1EeK9gKrxk10euQ" type="6033">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIE_Q1EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIFPQ1EeK9gKrxk10euQ" type="6034">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIFfQ1EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_bVGICPQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:Association" href="model.uml#_bVGIA_Q1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bVGICfQ1EeK9gKrxk10euQ" points="[-32, -50, 125, 188]$[-163, -288, -6, -50]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_uGlREPQ1EeK9gKrxk10euQ" type="4003" source="_s7J_xfQ1EeK9gKrxk10euQ" target="_tuVwMPQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_uGlRE_Q1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uGlRFPQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_uGlRFfQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uGlRFvQ1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_uGlREfQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uGlREvQ1EeK9gKrxk10euQ" points="[6, -50, -13, 94]$[12, -92, -7, 52]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_wES68fQ1EeK9gKrxk10euQ" type="4002" source="_anHnsfQ1EeK9gKrxk10euQ" target="_s7J_xfQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_wES69PQ1EeK9gKrxk10euQ" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wES69fQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_wES68vQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wES68_Q1EeK9gKrxk10euQ" points="[-7, -50, -7, 135]$[-7, -135, -7, 50]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_yJmakPQ1EeK9gKrxk10euQ" type="4003" source="_adcuUPQ1EeK9gKrxk10euQ" target="_s63E0PQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_yJmak_Q1EeK9gKrxk10euQ" type="6008">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_yJmalPQ1EeK9gKrxk10euQ" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_yJmalfQ1EeK9gKrxk10euQ" type="6009">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_yJmalvQ1EeK9gKrxk10euQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_yJmakfQ1EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:InterfaceRealization" href="model.uml#_yJcpkPQ1EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yJmakvQ1EeK9gKrxk10euQ" points="[5, -19, 0, 163]$[5, -130, 0, 52]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yJwLkPQ1EeK9gKrxk10euQ" id="(0.4473684210526316,0.16964285714285715)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_lsXWcPQ4EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_tuVwMPQ1EeK9gKrxk10euQ">

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWc_Q4EeK9gKrxk10euQ" type="6001">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWdPQ4EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWdfQ4EeK9gKrxk10euQ" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWdvQ4EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWd_Q4EeK9gKrxk10euQ" type="6003">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWePQ4EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWefQ4EeK9gKrxk10euQ" type="6005">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWevQ4EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWe_Q4EeK9gKrxk10euQ" type="6033">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWfPQ4EeK9gKrxk10euQ" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWffQ4EeK9gKrxk10euQ" type="6034">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWfvQ4EeK9gKrxk10euQ" y="-20"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lsXWcfQ4EeK9gKrxk10euQ"/>

-    <element xmi:type="uml:Association" href="model.uml#_lsOMg_Q4EeK9gKrxk10euQ"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lsXWcvQ4EeK9gKrxk10euQ" points="[8, -22, -211, 526]$[214, -549, -5, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lsqRYPQ4EeK9gKrxk10euQ" id="(0.51,0.22)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lsqRYfQ4EeK9gKrxk10euQ" id="(0.05,0.47115384615384615)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Zt12UPQ1EeK9gKrxk10euQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_adcuUPQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_admfUPQ1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_admfUfQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQUPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQUfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_cPkMMPQ1EeK9gKrxk10euQ" type="3012">
+        <element xmi:type="uml:Property" href="model.uml#_cPQqMPQ1EeK9gKrxk10euQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cPkMMfQ1EeK9gKrxk10euQ"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_cugK8PQ1EeK9gKrxk10euQ" type="3012">
+        <element xmi:type="uml:Property" href="model.uml#_cuXBAPQ1EeK9gKrxk10euQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cugK8fQ1EeK9gKrxk10euQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_admfUvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_admfU_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfVPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfVfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_admfVvQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQUvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQU_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_admfV_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_admfWPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfWfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfWvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_admfW_Q1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_adwQVPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_adwQVfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_admfXPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_admfXfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_admfXvQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_admfX_Q1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_aeDLQPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aeMVMPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aeMVMfQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aeDLQfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aeDLQvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_aa6-wPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_adcuUfQ1EeK9gKrxk10euQ" x="265" y="360"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_anHnsfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_anHns_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_anHntPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnw_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnxPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_anHntfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_anHntvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnt_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnuPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_anHnufQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnxfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnxvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_anHnuvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_anHnu_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnvPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnvfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_anHnvvQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anHnx_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anHnyPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_anHnv_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_anHnwPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_anHnwfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnwvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_anRYsPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_anRYs_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_anRYtPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_anRYsfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anRYsvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_anHnsPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anHnsvQ1EeK9gKrxk10euQ" x="810" y="390"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ar4y8fQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ar4y8_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y9PQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zA_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zBPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y9fQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4y9vQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4y9_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y-PQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y-fQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zBfQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zBvQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y-vQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4y-_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4y_PQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y_fQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ar4y_vQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ar4zB_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ar4zCPQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ar4y__Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ar4zAPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ar4zAfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4zAvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_asLt4PQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_asLt4_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_asLt5PQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_asLt4fQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_asLt4vQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_ar4y8PQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ar4y8vQ1EeK9gKrxk10euQ" x="540" y="590"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_s63E0PQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_s63E0vQ1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E0_Q1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E4vQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E4_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E1PQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E1fQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E1vQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E1_Q1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E2PQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E5PQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E5fQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E2fQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E2vQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E2_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E3PQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s63E3fQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s63E5vQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s63E5_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s63E3vQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s63E3_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s63E4PQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E4fQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_wPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_w_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_xPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_wfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_wvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s63E0fQ1EeK9gKrxk10euQ" x="290" y="135"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_s7J_xfQ1EeK9gKrxk10euQ" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_s7J_x_Q1EeK9gKrxk10euQ" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_yPQ1EeK9gKrxk10euQ" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_1_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_2PQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_yfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_yvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_y_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_zPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_zfQ1EeK9gKrxk10euQ" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_2fQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_2vQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_zvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_z_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_0PQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_0fQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7J_0vQ1EeK9gKrxk10euQ" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7J_2_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7J_3PQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7J_0_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_s7J_1PQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_s7J_1fQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_1vQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s7TwwPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_s7Tww_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_s7TwxPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s7TwwfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7TwwvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7J_xvQ1EeK9gKrxk10euQ" x="810" y="205"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_tuVwMPQ1EeK9gKrxk10euQ" type="2004">
+    <children xmi:type="notation:DecorationNode" xmi:id="_tuVwMvQ1EeK9gKrxk10euQ" type="5011"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwM_Q1EeK9gKrxk10euQ" type="7006">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwQvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwQ_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwNPQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwNfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwNvQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwN_Q1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwOPQ1EeK9gKrxk10euQ" type="7007">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwRPQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwRfQ1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwOfQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwOvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwO_Q1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwPPQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_tuVwPfQ1EeK9gKrxk10euQ" type="7008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tuVwRvQ1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tuVwR_Q1EeK9gKrxk10euQ" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tuVwPvQ1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_tuVwP_Q1EeK9gKrxk10euQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_tuVwQPQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwQfQ1EeK9gKrxk10euQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_tue6IPQ1EeK9gKrxk10euQ" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tue6I_Q1EeK9gKrxk10euQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tue6JPQ1EeK9gKrxk10euQ" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tue6IfQ1EeK9gKrxk10euQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tue6IvQ1EeK9gKrxk10euQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tuVwMfQ1EeK9gKrxk10euQ" x="805" y="15"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_Zt12UfQ1EeK9gKrxk10euQ"/>
+  <element xmi:type="uml:Model" href="model.uml#_ZtZxs_Q1EeK9gKrxk10euQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="_bKYs0PQ1EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_anHnsfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs0_Q1EeK9gKrxk10euQ" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs1PQ1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs1fQ1EeK9gKrxk10euQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs1vQ1EeK9gKrxk10euQ" x="16" y="42"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs1_Q1EeK9gKrxk10euQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs2PQ1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs2fQ1EeK9gKrxk10euQ" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs2vQ1EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs2_Q1EeK9gKrxk10euQ" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs3PQ1EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bKYs3fQ1EeK9gKrxk10euQ" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bKYs3vQ1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_bKYs0fQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:Association" href="model.uml#_bKO70_Q1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bKYs0vQ1EeK9gKrxk10euQ" points="[50, -25, -352, 174]$[423, -221, 21, -22]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bOi0EPQ1EeK9gKrxk10euQ" id="(0.77,0.22)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_bVGIB_Q1EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_adcuUPQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGICvQ1EeK9gKrxk10euQ" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIC_Q1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIDPQ1EeK9gKrxk10euQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIDfQ1EeK9gKrxk10euQ" x="-22" y="45"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIDvQ1EeK9gKrxk10euQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGID_Q1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIEPQ1EeK9gKrxk10euQ" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIEfQ1EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIEvQ1EeK9gKrxk10euQ" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIE_Q1EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bVGIFPQ1EeK9gKrxk10euQ" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bVGIFfQ1EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_bVGICPQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:Association" href="model.uml#_bVGIA_Q1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bVGICfQ1EeK9gKrxk10euQ" points="[-32, -50, 125, 188]$[-163, -288, -6, -50]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_uGlREPQ1EeK9gKrxk10euQ" type="4003" source="_s7J_xfQ1EeK9gKrxk10euQ" target="_tuVwMPQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_uGlRE_Q1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uGlRFPQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uGlRFfQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uGlRFvQ1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_uGlREfQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="library.uml#_lgRikPQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uGlREvQ1EeK9gKrxk10euQ" points="[6, -50, -13, 94]$[12, -92, -7, 52]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_wES68fQ1EeK9gKrxk10euQ" type="4002" source="_anHnsfQ1EeK9gKrxk10euQ" target="_s7J_xfQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_wES69PQ1EeK9gKrxk10euQ" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_wES69fQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_wES68vQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wES68_Q1EeK9gKrxk10euQ" points="[-7, -50, -7, 135]$[-7, -135, -7, 50]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_yJmakPQ1EeK9gKrxk10euQ" type="4003" source="_adcuUPQ1EeK9gKrxk10euQ" target="_s63E0PQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_yJmak_Q1EeK9gKrxk10euQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_yJmalPQ1EeK9gKrxk10euQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_yJmalfQ1EeK9gKrxk10euQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_yJmalvQ1EeK9gKrxk10euQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_yJmakfQ1EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:InterfaceRealization" href="model.uml#_yJcpkPQ1EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yJmakvQ1EeK9gKrxk10euQ" points="[5, -19, 0, 163]$[5, -130, 0, 52]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yJwLkPQ1EeK9gKrxk10euQ" id="(0.4473684210526316,0.16964285714285715)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_lsXWcPQ4EeK9gKrxk10euQ" type="4001" source="_ar4y8fQ1EeK9gKrxk10euQ" target="_tuVwMPQ1EeK9gKrxk10euQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWc_Q4EeK9gKrxk10euQ" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWdPQ4EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWdfQ4EeK9gKrxk10euQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWdvQ4EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWd_Q4EeK9gKrxk10euQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWePQ4EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWefQ4EeK9gKrxk10euQ" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWevQ4EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWe_Q4EeK9gKrxk10euQ" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWfPQ4EeK9gKrxk10euQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_lsXWffQ4EeK9gKrxk10euQ" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lsXWfvQ4EeK9gKrxk10euQ" y="-20"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lsXWcfQ4EeK9gKrxk10euQ"/>
+    <element xmi:type="uml:Association" href="model.uml#_lsOMg_Q4EeK9gKrxk10euQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lsXWcvQ4EeK9gKrxk10euQ" points="[8, -22, -211, 526]$[214, -549, -5, -1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lsqRYPQ4EeK9gKrxk10euQ" id="(0.51,0.22)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lsqRYfQ4EeK9gKrxk10euQ" id="(0.05,0.47115384615384615)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.uml
index 33d9cb243da..6cebd3c226a 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/model.uml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ZtZxs_Q1EeK9gKrxk10euQ" name="Model">

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_ZtZxtPQ1EeK9gKrxk10euQ">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_oe_9gPQ1EeK9gKrxk10euQ">

-    <importedPackage xmi:type="uml:Model" href="library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Class" xmi:id="_aa6-wPQ1EeK9gKrxk10euQ" name="Class1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_cPQqMPQ1EeK9gKrxk10euQ" name="Attribute1">

-      <type xmi:type="uml:Interface" href="library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_cuXBAPQ1EeK9gKrxk10euQ" name="Attribute2">

-      <type xmi:type="uml:Class" href="library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>

-    </ownedAttribute>

-    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_yJcpkPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_aa6-wPQ1EeK9gKrxk10euQ">

-      <supplier xmi:type="uml:Interface" href="library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>

-    </interfaceRealization>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_anHnsPQ1EeK9gKrxk10euQ" name="Class2">

-    <generalization xmi:type="uml:Generalization" xmi:id="_z6w0cMDAEeOe24DdsiPxGg">

-      <general xmi:type="uml:Class" href="library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>

-    </generalization>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_ar4y8PQ1EeK9gKrxk10euQ" name="Class3">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_bKO70PQ1EeK9gKrxk10euQ" name="class2" type="_anHnsPQ1EeK9gKrxk10euQ" association="_bKO70_Q1EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bKO70fQ1EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bKO70vQ1EeK9gKrxk10euQ" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_bVGIAPQ1EeK9gKrxk10euQ" name="class1" type="_aa6-wPQ1EeK9gKrxk10euQ" association="_bVGIA_Q1EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bVGIAfQ1EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVGIAvQ1EeK9gKrxk10euQ" value="1"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_lsOMgPQ4EeK9gKrxk10euQ" name="interface2" association="_lsOMg_Q4EeK9gKrxk10euQ">

-      <type xmi:type="uml:Interface" href="library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lsOMgfQ4EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lsOMgvQ4EeK9gKrxk10euQ" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_bKO70_Q1EeK9gKrxk10euQ" name="class3_class2_1" memberEnd="_bKO71PQ1EeK9gKrxk10euQ _bKO70PQ1EeK9gKrxk10euQ">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_bKO71PQ1EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_bKO70_Q1EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bKO71fQ1EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bKO71vQ1EeK9gKrxk10euQ" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_bVGIA_Q1EeK9gKrxk10euQ" name="class3_class1_1" memberEnd="_bVGIBPQ1EeK9gKrxk10euQ _bVGIAPQ1EeK9gKrxk10euQ">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_bVGIBPQ1EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_bVGIA_Q1EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bVGIBfQ1EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVGIBvQ1EeK9gKrxk10euQ" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Association" xmi:id="_lsOMg_Q4EeK9gKrxk10euQ" name="class3_interface2_1" memberEnd="_lsOMhPQ4EeK9gKrxk10euQ _lsOMgPQ4EeK9gKrxk10euQ">

-    <ownedEnd xmi:type="uml:Property" xmi:id="_lsOMhPQ4EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_lsOMg_Q4EeK9gKrxk10euQ">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lsOMhfQ4EeK9gKrxk10euQ" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lsOMhvQ4EeK9gKrxk10euQ" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ZtZxs_Q1EeK9gKrxk10euQ" name="Model">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_ZtZxtPQ1EeK9gKrxk10euQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_oe_9gPQ1EeK9gKrxk10euQ">
+    <importedPackage xmi:type="uml:Model" href="library.uml#_gvvLwPQ1EeK9gKrxk10euQ"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_aa6-wPQ1EeK9gKrxk10euQ" name="Class1">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_cPQqMPQ1EeK9gKrxk10euQ" name="Attribute1">
+      <type xmi:type="uml:Interface" href="library.uml#_iVyjkPQ1EeK9gKrxk10euQ"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_cuXBAPQ1EeK9gKrxk10euQ" name="Attribute2">
+      <type xmi:type="uml:Class" href="library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>
+    </ownedAttribute>
+    <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_yJcpkPQ1EeK9gKrxk10euQ" name="InterfaceRealization1" client="_aa6-wPQ1EeK9gKrxk10euQ">
+      <supplier xmi:type="uml:Interface" href="library.uml#_iLO5YPQ1EeK9gKrxk10euQ"/>
+    </interfaceRealization>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_anHnsPQ1EeK9gKrxk10euQ" name="Class2">
+    <generalization xmi:type="uml:Generalization" xmi:id="_z6w0cMDAEeOe24DdsiPxGg">
+      <general xmi:type="uml:Class" href="library.uml#_iwbRIPQ1EeK9gKrxk10euQ"/>
+    </generalization>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ar4y8PQ1EeK9gKrxk10euQ" name="Class3">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_bKO70PQ1EeK9gKrxk10euQ" name="class2" type="_anHnsPQ1EeK9gKrxk10euQ" association="_bKO70_Q1EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bKO70fQ1EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bKO70vQ1EeK9gKrxk10euQ" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_bVGIAPQ1EeK9gKrxk10euQ" name="class1" type="_aa6-wPQ1EeK9gKrxk10euQ" association="_bVGIA_Q1EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bVGIAfQ1EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVGIAvQ1EeK9gKrxk10euQ" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_lsOMgPQ4EeK9gKrxk10euQ" name="interface2" association="_lsOMg_Q4EeK9gKrxk10euQ">
+      <type xmi:type="uml:Interface" href="library.uml#_iQ41cPQ1EeK9gKrxk10euQ"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lsOMgfQ4EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lsOMgvQ4EeK9gKrxk10euQ" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_bKO70_Q1EeK9gKrxk10euQ" name="class3_class2_1" memberEnd="_bKO71PQ1EeK9gKrxk10euQ _bKO70PQ1EeK9gKrxk10euQ">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_bKO71PQ1EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_bKO70_Q1EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bKO71fQ1EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bKO71vQ1EeK9gKrxk10euQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_bVGIA_Q1EeK9gKrxk10euQ" name="class3_class1_1" memberEnd="_bVGIBPQ1EeK9gKrxk10euQ _bVGIAPQ1EeK9gKrxk10euQ">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_bVGIBPQ1EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_bVGIA_Q1EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bVGIBfQ1EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVGIBvQ1EeK9gKrxk10euQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_lsOMg_Q4EeK9gKrxk10euQ" name="class3_interface2_1" memberEnd="_lsOMhPQ4EeK9gKrxk10euQ _lsOMgPQ4EeK9gKrxk10euQ">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_lsOMhPQ4EeK9gKrxk10euQ" name="class3" type="_ar4y8PQ1EeK9gKrxk10euQ" association="_lsOMg_Q4EeK9gKrxk10euQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lsOMhfQ4EeK9gKrxk10euQ" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lsOMhvQ4EeK9gKrxk10euQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.di
index 0892c56fb4c..c9be440f18e 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_kicukPtrEeKiosy8GwIZjA"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_kicukPtrEeKiosy8GwIZjA"/>

-        </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="model.notation#_kicukPtrEeKiosy8GwIZjA"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="model.notation#_kicukPtrEeKiosy8GwIZjA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.notation
index f60acc0b045..0499d63dfa3 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.notation
@@ -1,143 +1,143 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_kicukPtrEeKiosy8GwIZjA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_wgz-APtrEeKiosy8GwIZjA" type="2008">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_y0OyIPtrEeKiosy8GwIZjA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3s_2rEeKYpIVCYltNyg" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3tP2rEeKYpIVCYltNyg" key="StereotypeList" value="Profile::Stereotype1"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3tf2rEeKYpIVCYltNyg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3tv2rEeKYpIVCYltNyg" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3t_2rEeKYpIVCYltNyg" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_wgz-AvtrEeKiosy8GwIZjA" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_wgz-A_trEeKiosy8GwIZjA" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wg0lEPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wg0lEftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_wgz-BPtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_wgz-BftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wgz-BvtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wgz-B_trEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_wgz-CPtrEeKiosy8GwIZjA" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wg0lEvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wg0lE_trEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_wgz-CftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_wgz-CvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wgz-C_trEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wgz-DPtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_wgz-DftrEeKiosy8GwIZjA" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wg0lFPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wg0lFftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_wgz-DvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_wgz-D_trEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wgz-EPtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wgz-EftrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_wg9vAPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wg9vA_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wg9vBPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_wg9vAftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wg9vAvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Class" href="model.uml#_wgyI0PtrEeKiosy8GwIZjA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wgz-AftrEeKiosy8GwIZjA" x="380" y="466"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_wn2aIPtrEeKiosy8GwIZjA" type="2008">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zvPo4PtrEeKiosy8GwIZjA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QB6ZP2uEeKYpIVCYltNyg" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QB6Zf2uEeKYpIVCYltNyg" key="StereotypeList" value="Profile::Stereotype2"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QB6Zv2uEeKYpIVCYltNyg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QB6Z_2uEeKYpIVCYltNyg" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QLEUP2uEeKYpIVCYltNyg" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_wn2aIvtrEeKiosy8GwIZjA" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_wn3BMPtrEeKiosy8GwIZjA" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wn3BP_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wn3BQPtrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_wn3BMftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_wn3BMvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wn3BM_trEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wn3BNPtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_wn3BNftrEeKiosy8GwIZjA" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wn3oQPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wn3oQftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_wn3BNvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_wn3BN_trEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wn3BOPtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wn3BOftrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_wn3BOvtrEeKiosy8GwIZjA" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wn3oQvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wn3oQ_trEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_wn3BO_trEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_wn3BPPtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wn3BPftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wn3BPvtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_woAyMPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_woAyM_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_woAyNPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_woAyMftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_woAyMvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Class" href="model.uml#_wn1zEPtrEeKiosy8GwIZjA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wn2aIftrEeKiosy8GwIZjA" x="645" y="270"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_w5otsPtrEeKiosy8GwIZjA" type="2008">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zPw3kPtrEeKiosy8GwIZjA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPlcP2vEeKYpIVCYltNyg" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPlcf2vEeKYpIVCYltNyg" key="StereotypeList" value="Profile::Stereotype3"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPlcv2vEeKYpIVCYltNyg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPlc_2vEeKYpIVCYltNyg" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPldP2vEeKYpIVCYltNyg" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_w5otsvtrEeKiosy8GwIZjA" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_w5ots_trEeKiosy8GwIZjA" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w5pUwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w5pUwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_w5ottPtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_w5ottftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_w5ottvtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5ott_trEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_w5otuPtrEeKiosy8GwIZjA" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w5pUwvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w5pUw_trEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_w5otuftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_w5otuvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_w5otu_trEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5otvPtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_w5otvftrEeKiosy8GwIZjA" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w5pUxPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w5pUxftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_w5otvvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_w5otv_trEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_w5otwPtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5otwftrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_w5yesPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w5yes_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w5yetPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_w5yesftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5yesvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Class" href="model.uml#_w5nfkPtrEeKiosy8GwIZjA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5otsftrEeKiosy8GwIZjA" x="965" y="490" width="121" height="96"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_kicukftrEeKiosy8GwIZjA"/>

-  <element xmi:type="uml:Model" href="model.uml#_kh5U8PtrEeKiosy8GwIZjA"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_kicukPtrEeKiosy8GwIZjA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_wgz-APtrEeKiosy8GwIZjA" type="2008">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_y0OyIPtrEeKiosy8GwIZjA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3s_2rEeKYpIVCYltNyg" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3tP2rEeKYpIVCYltNyg" key="StereotypeList" value="Profile::Stereotype1"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3tf2rEeKYpIVCYltNyg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3tv2rEeKYpIVCYltNyg" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vfQ3t_2rEeKYpIVCYltNyg" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_wgz-AvtrEeKiosy8GwIZjA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wgz-A_trEeKiosy8GwIZjA" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wg0lEPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wg0lEftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wgz-BPtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_wgz-BftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_wgz-BvtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wgz-B_trEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wgz-CPtrEeKiosy8GwIZjA" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wg0lEvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wg0lE_trEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wgz-CftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_wgz-CvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_wgz-C_trEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wgz-DPtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wgz-DftrEeKiosy8GwIZjA" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wg0lFPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wg0lFftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wgz-DvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_wgz-D_trEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_wgz-EPtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wgz-EftrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wg9vAPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wg9vA_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wg9vBPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wg9vAftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wg9vAvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_wgyI0PtrEeKiosy8GwIZjA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wgz-AftrEeKiosy8GwIZjA" x="380" y="466"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_wn2aIPtrEeKiosy8GwIZjA" type="2008">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zvPo4PtrEeKiosy8GwIZjA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QB6ZP2uEeKYpIVCYltNyg" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QB6Zf2uEeKYpIVCYltNyg" key="StereotypeList" value="Profile::Stereotype2"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QB6Zv2uEeKYpIVCYltNyg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QB6Z_2uEeKYpIVCYltNyg" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__QLEUP2uEeKYpIVCYltNyg" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_wn2aIvtrEeKiosy8GwIZjA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wn3BMPtrEeKiosy8GwIZjA" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wn3BP_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wn3BQPtrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wn3BMftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_wn3BMvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_wn3BM_trEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wn3BNPtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wn3BNftrEeKiosy8GwIZjA" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wn3oQPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wn3oQftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wn3BNvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_wn3BN_trEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_wn3BOPtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wn3BOftrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wn3BOvtrEeKiosy8GwIZjA" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wn3oQvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wn3oQ_trEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wn3BO_trEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_wn3BPPtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_wn3BPftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wn3BPvtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_woAyMPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_woAyM_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_woAyNPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_woAyMftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_woAyMvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_wn1zEPtrEeKiosy8GwIZjA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wn2aIftrEeKiosy8GwIZjA" x="645" y="270"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_w5otsPtrEeKiosy8GwIZjA" type="2008">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zPw3kPtrEeKiosy8GwIZjA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPlcP2vEeKYpIVCYltNyg" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPlcf2vEeKYpIVCYltNyg" key="StereotypeList" value="Profile::Stereotype3"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPlcv2vEeKYpIVCYltNyg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPlc_2vEeKYpIVCYltNyg" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ALPldP2vEeKYpIVCYltNyg" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_w5otsvtrEeKiosy8GwIZjA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_w5ots_trEeKiosy8GwIZjA" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w5pUwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w5pUwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w5ottPtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_w5ottftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_w5ottvtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5ott_trEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_w5otuPtrEeKiosy8GwIZjA" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w5pUwvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w5pUw_trEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w5otuftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_w5otuvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_w5otu_trEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5otvPtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_w5otvftrEeKiosy8GwIZjA" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w5pUxPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w5pUxftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w5otvvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_w5otv_trEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_w5otwPtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5otwftrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_w5yesPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w5yes_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w5yetPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_w5yesftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5yesvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_w5nfkPtrEeKiosy8GwIZjA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w5otsftrEeKiosy8GwIZjA" x="965" y="490" width="121" height="96"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_kicukftrEeKiosy8GwIZjA"/>
+  <element xmi:type="uml:Model" href="model.uml#_kh5U8PtrEeKiosy8GwIZjA"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.uml
index a1662c8daf3..e92b62ee372 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/model.uml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Profile="http:///schemas/Profile/_szf-wPtrEeKiosy8GwIZjA/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http:///schemas/Profile/_szf-wPtrEeKiosy8GwIZjA/0 p1/profile1.profile.uml#_s0UeIPtrEeKiosy8GwIZjA">

-  <uml:Model xmi:id="_kh5U8PtrEeKiosy8GwIZjA" name="model">

-    <packagedElement xmi:type="uml:Class" xmi:id="_wgyI0PtrEeKiosy8GwIZjA" name="Class1"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_wn1zEPtrEeKiosy8GwIZjA" name="Class2"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_w5nfkPtrEeKiosy8GwIZjA" name="Class3"/>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_wP_TwPtrEeKiosy8GwIZjA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wQuTkPtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="p1/profile1.profile.uml#_s0UeIPtrEeKiosy8GwIZjA"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="p1/profile1.profile.uml#_oA-q8PtrEeKiosy8GwIZjA"/>

-    </profileApplication>

-  </uml:Model>

-  <Profile:Stereotype1 xmi:id="_vfHtwP2rEeKYpIVCYltNyg" base_Class="_wgyI0PtrEeKiosy8GwIZjA"/>

-  <Profile:Stereotype2 xmi:id="__QB6YP2uEeKYpIVCYltNyg" base_Class="_wn1zEPtrEeKiosy8GwIZjA"/>

-  <Profile:Stereotype3 xmi:id="_ALF0cP2vEeKYpIVCYltNyg" base_Class="_w5nfkPtrEeKiosy8GwIZjA"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Profile="http:///schemas/Profile/_szf-wPtrEeKiosy8GwIZjA/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http:///schemas/Profile/_szf-wPtrEeKiosy8GwIZjA/0 p1/profile1.profile.uml#_s0UeIPtrEeKiosy8GwIZjA">
+  <uml:Model xmi:id="_kh5U8PtrEeKiosy8GwIZjA" name="model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_wgyI0PtrEeKiosy8GwIZjA" name="Class1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_wn1zEPtrEeKiosy8GwIZjA" name="Class2"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_w5nfkPtrEeKiosy8GwIZjA" name="Class3"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_wP_TwPtrEeKiosy8GwIZjA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wQuTkPtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="p1/profile1.profile.uml#_s0UeIPtrEeKiosy8GwIZjA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="p1/profile1.profile.uml#_oA-q8PtrEeKiosy8GwIZjA"/>
+    </profileApplication>
+  </uml:Model>
+  <Profile:Stereotype1 xmi:id="_vfHtwP2rEeKYpIVCYltNyg" base_Class="_wgyI0PtrEeKiosy8GwIZjA"/>
+  <Profile:Stereotype2 xmi:id="__QB6YP2uEeKYpIVCYltNyg" base_Class="_wn1zEPtrEeKiosy8GwIZjA"/>
+  <Profile:Stereotype3 xmi:id="_ALF0cP2vEeKYpIVCYltNyg" base_Class="_w5nfkPtrEeKiosy8GwIZjA"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.di
index 42480728a9f..5614f714fde 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="profile1.profile.notation#_oA_5EPtrEeKiosy8GwIZjA"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="profile1.profile.notation#_oA_5EPtrEeKiosy8GwIZjA"/>

-        </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="profile1.profile.notation#_oA_5EPtrEeKiosy8GwIZjA"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="profile1.profile.notation#_oA_5EPtrEeKiosy8GwIZjA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.notation
index 6c47b646fde..870a1fe7eed 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.notation
@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_oA_5EPtrEeKiosy8GwIZjA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_ozgUEPtrEeKiosy8GwIZjA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_ozg7IPtrEeKiosy8GwIZjA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ozg7IftrEeKiosy8GwIZjA" type="1071">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ozlzoPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ozmasPtrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ozg7IvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ozg7I_trEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ozg7JPtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozg7JftrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ozg7JvtrEeKiosy8GwIZjA" visible="false" type="1019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oznBwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oznBwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ozg7J_trEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ozg7KPtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ozg7KftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozg7KvtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_oz1EMPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oz1EM_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oz1ENPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_oz1EMftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oz1EMvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="profile1.profile.uml#_ozdQwPtrEeKiosy8GwIZjA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozgUEftrEeKiosy8GwIZjA" x="415" y="510"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_o4IVYPtrEeKiosy8GwIZjA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_o4IVYvtrEeKiosy8GwIZjA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o4IVY_trEeKiosy8GwIZjA" type="1071">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4I8cPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4I8cftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o4IVZPtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_o4IVZftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o4IVZvtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVZ_trEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o4IVaPtrEeKiosy8GwIZjA" visible="false" type="1019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4I8cvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4I8c_trEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o4IVaftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_o4IVavtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o4IVa_trEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVbPtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o4PDEPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4PDE_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4PDFPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o4PDEftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4PDEvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="profile1.profile.uml#_o4HuUPtrEeKiosy8GwIZjA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVYftrEeKiosy8GwIZjA" x="785" y="510"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_o9XasPtrEeKiosy8GwIZjA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_o9XasvtrEeKiosy8GwIZjA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o9Xas_trEeKiosy8GwIZjA" type="1071">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9YBwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9YBwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9XatPtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_o9XatftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o9XatvtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9Xat_trEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o9XauPtrEeKiosy8GwIZjA" visible="false" type="1019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9YBwvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9YBw_trEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9XauftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_o9XauvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o9Xau_trEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9XavPtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o9eIYPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9eIY_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9eIZPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9eIYftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9eIYvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="profile1.profile.uml#_o9WMkPtrEeKiosy8GwIZjA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9XasftrEeKiosy8GwIZjA" x="1110" y="506"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_qrPRwPtrEeKiosy8GwIZjA" type="1031">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qrQf4PtrEeKiosy8GwIZjA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4ftrEeKiosy8GwIZjA" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4vtrEeKiosy8GwIZjA" key="StereotypeList" value="StandardProfileL2::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4_trEeKiosy8GwIZjA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf5PtrEeKiosy8GwIZjA" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf5ftrEeKiosy8GwIZjA" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_qrPRwvtrEeKiosy8GwIZjA" type="1084"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_qruZ8PtrEeKiosy8GwIZjA" visible="false" type="AppliedStereotypeCompartement">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_qruZ8ftrEeKiosy8GwIZjA" showTitle="true"/>

-      <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qruZ8vtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_qrvBAPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qrvBA_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrvBBPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_qrvBAftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrvBAvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrPRw_trEeKiosy8GwIZjA" x="785" y="125"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_oA_5EftrEeKiosy8GwIZjA"/>

-  <element xmi:type="uml:Profile" href="profile1.profile.uml#_oA-q8PtrEeKiosy8GwIZjA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_rNDlYPtrEeKiosy8GwIZjA" type="1013" source="_ozgUEPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_rNDlYftrEeKiosy8GwIZjA"/>

-    <element xmi:type="uml:Extension" href="profile1.profile.uml#_rMhZ4ftrEeKiosy8GwIZjA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rNDlYvtrEeKiosy8GwIZjA" points="[-6, -59, 27, 266]$[-32, -332, 1, -7]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rNK6IPtrEeKiosy8GwIZjA" id="(0.76,0.59)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rNK6IftrEeKiosy8GwIZjA" id="(0.54,0.14)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_rWLsMPtrEeKiosy8GwIZjA" type="1013" source="_o4IVYPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_rWLsMftrEeKiosy8GwIZjA"/>

-    <element xmi:type="uml:Extension" href="profile1.profile.uml#_rWKeEftrEeKiosy8GwIZjA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rWLsMvtrEeKiosy8GwIZjA" points="[-50, -25, 359, 171]$[-459, -203, -50, -7]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_rjcsI_trEeKiosy8GwIZjA" type="1013" source="_o9XasPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_rjcsJPtrEeKiosy8GwIZjA"/>

-    <element xmi:type="uml:Extension" href="profile1.profile.uml#_rjcsIftrEeKiosy8GwIZjA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rjcsJftrEeKiosy8GwIZjA" points="[-90, -50, 691, 391]$[-778, -416, 3, 25]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rjmdIPtrEeKiosy8GwIZjA" id="(0.9,0.7)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_oA_5EPtrEeKiosy8GwIZjA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_ozgUEPtrEeKiosy8GwIZjA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ozg7IPtrEeKiosy8GwIZjA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ozg7IftrEeKiosy8GwIZjA" type="1071">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ozlzoPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ozmasPtrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ozg7IvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ozg7I_trEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ozg7JPtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozg7JftrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ozg7JvtrEeKiosy8GwIZjA" visible="false" type="1019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oznBwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oznBwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ozg7J_trEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ozg7KPtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ozg7KftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozg7KvtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_oz1EMPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oz1EM_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oz1ENPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oz1EMftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oz1EMvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="profile1.profile.uml#_ozdQwPtrEeKiosy8GwIZjA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozgUEftrEeKiosy8GwIZjA" x="415" y="510"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_o4IVYPtrEeKiosy8GwIZjA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_o4IVYvtrEeKiosy8GwIZjA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o4IVY_trEeKiosy8GwIZjA" type="1071">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4I8cPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4I8cftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o4IVZPtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o4IVZftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o4IVZvtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVZ_trEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o4IVaPtrEeKiosy8GwIZjA" visible="false" type="1019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4I8cvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4I8c_trEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o4IVaftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o4IVavtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o4IVa_trEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVbPtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o4PDEPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4PDE_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4PDFPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o4PDEftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4PDEvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="profile1.profile.uml#_o4HuUPtrEeKiosy8GwIZjA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVYftrEeKiosy8GwIZjA" x="785" y="510"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_o9XasPtrEeKiosy8GwIZjA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_o9XasvtrEeKiosy8GwIZjA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o9Xas_trEeKiosy8GwIZjA" type="1071">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9YBwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9YBwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o9XatPtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o9XatftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o9XatvtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9Xat_trEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o9XauPtrEeKiosy8GwIZjA" visible="false" type="1019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9YBwvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9YBw_trEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o9XauftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o9XauvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o9Xau_trEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9XavPtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o9eIYPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9eIY_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9eIZPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o9eIYftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9eIYvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="profile1.profile.uml#_o9WMkPtrEeKiosy8GwIZjA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9XasftrEeKiosy8GwIZjA" x="1110" y="506"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_qrPRwPtrEeKiosy8GwIZjA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qrQf4PtrEeKiosy8GwIZjA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4ftrEeKiosy8GwIZjA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4vtrEeKiosy8GwIZjA" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4_trEeKiosy8GwIZjA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf5PtrEeKiosy8GwIZjA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf5ftrEeKiosy8GwIZjA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_qrPRwvtrEeKiosy8GwIZjA" type="1084"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qruZ8PtrEeKiosy8GwIZjA" visible="false" type="AppliedStereotypeCompartement">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qruZ8ftrEeKiosy8GwIZjA" showTitle="true"/>
+      <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qruZ8vtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qrvBAPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qrvBA_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrvBBPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qrvBAftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrvBAvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrPRw_trEeKiosy8GwIZjA" x="785" y="125"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_oA_5EftrEeKiosy8GwIZjA"/>
+  <element xmi:type="uml:Profile" href="profile1.profile.uml#_oA-q8PtrEeKiosy8GwIZjA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_rNDlYPtrEeKiosy8GwIZjA" type="1013" source="_ozgUEPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_rNDlYftrEeKiosy8GwIZjA"/>
+    <element xmi:type="uml:Extension" href="profile1.profile.uml#_rMhZ4ftrEeKiosy8GwIZjA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rNDlYvtrEeKiosy8GwIZjA" points="[-6, -59, 27, 266]$[-32, -332, 1, -7]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rNK6IPtrEeKiosy8GwIZjA" id="(0.76,0.59)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rNK6IftrEeKiosy8GwIZjA" id="(0.54,0.14)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_rWLsMPtrEeKiosy8GwIZjA" type="1013" source="_o4IVYPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_rWLsMftrEeKiosy8GwIZjA"/>
+    <element xmi:type="uml:Extension" href="profile1.profile.uml#_rWKeEftrEeKiosy8GwIZjA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rWLsMvtrEeKiosy8GwIZjA" points="[-50, -25, 359, 171]$[-459, -203, -50, -7]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_rjcsI_trEeKiosy8GwIZjA" type="1013" source="_o9XasPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_rjcsJPtrEeKiosy8GwIZjA"/>
+    <element xmi:type="uml:Extension" href="profile1.profile.uml#_rjcsIftrEeKiosy8GwIZjA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rjcsJftrEeKiosy8GwIZjA" points="[-90, -50, 691, 391]$[-778, -416, 3, 25]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rjmdIPtrEeKiosy8GwIZjA" id="(0.9,0.7)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.uml
index 51c736c4529..9c3d1ca7f30 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p1/profile1.profile.uml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_oA-q8PtrEeKiosy8GwIZjA" name="Profile" metaclassReference="_qrODoPtrEeKiosy8GwIZjA" metamodelReference="_oA-q8ftrEeKiosy8GwIZjA">

-  <eAnnotations xmi:id="_s0T3EPtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_s0UeIPtrEeKiosy8GwIZjA" name="Profile" nsURI="http:///schemas/Profile/_szf-wPtrEeKiosy8GwIZjA/0" nsPrefix="Profile">

-      <eAnnotations xmi:id="_s0WTUvtrEeKiosy8GwIZjA" source="PapyrusVersion">

-        <details xmi:id="_s0WTU_trEeKiosy8GwIZjA" key="Version" value="0.0.1"/>

-        <details xmi:id="_s0WTVPtrEeKiosy8GwIZjA" key="Comment" value=""/>

-        <details xmi:id="_s0WTVftrEeKiosy8GwIZjA" key="Copyright" value=""/>

-        <details xmi:id="_s0WTVvtrEeKiosy8GwIZjA" key="Date" value="2013-08-02"/>

-        <details xmi:id="_s0WTV_trEeKiosy8GwIZjA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeIftrEeKiosy8GwIZjA" name="Stereotype1">

-        <eAnnotations xmi:id="_s0UeIvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ozdQwPtrEeKiosy8GwIZjA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeI_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeJftrEeKiosy8GwIZjA" name="Stereotype2">

-        <eAnnotations xmi:id="_s0UeJvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_o4HuUPtrEeKiosy8GwIZjA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeJ_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeKftrEeKiosy8GwIZjA" name="Stereotype3">

-        <eAnnotations xmi:id="_s0UeKvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_o9WMkPtrEeKiosy8GwIZjA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeK_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:id="_qrODoPtrEeKiosy8GwIZjA" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <packageImport xmi:id="_oA-q8ftrEeKiosy8GwIZjA">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

-  </packageImport>

-  <packageImport xmi:id="_oA-q8vtrEeKiosy8GwIZjA">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_ozdQwPtrEeKiosy8GwIZjA" name="Stereotype1">

-    <ownedAttribute xmi:id="_rMhZ4PtrEeKiosy8GwIZjA" name="base_Class" association="_rMhZ4ftrEeKiosy8GwIZjA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_o4HuUPtrEeKiosy8GwIZjA" name="Stereotype2">

-    <ownedAttribute xmi:id="_rWKeEPtrEeKiosy8GwIZjA" name="base_Class" association="_rWKeEftrEeKiosy8GwIZjA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_o9WMkPtrEeKiosy8GwIZjA" name="Stereotype3">

-    <ownedAttribute xmi:id="_rjcsIPtrEeKiosy8GwIZjA" name="base_Class" association="_rjcsIftrEeKiosy8GwIZjA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_rMhZ4ftrEeKiosy8GwIZjA" name="E_Stereotype1_Class1" memberEnd="_rMhZ4vtrEeKiosy8GwIZjA _rMhZ4PtrEeKiosy8GwIZjA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rMhZ4vtrEeKiosy8GwIZjA" name="extension_Stereotype1" type="_ozdQwPtrEeKiosy8GwIZjA" aggregation="composite" association="_rMhZ4ftrEeKiosy8GwIZjA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_rWKeEftrEeKiosy8GwIZjA" name="E_Stereotype2_Class1" memberEnd="_rWKeEvtrEeKiosy8GwIZjA _rWKeEPtrEeKiosy8GwIZjA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rWKeEvtrEeKiosy8GwIZjA" name="extension_Stereotype2" type="_o4HuUPtrEeKiosy8GwIZjA" aggregation="composite" association="_rWKeEftrEeKiosy8GwIZjA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_rjcsIftrEeKiosy8GwIZjA" name="E_Stereotype3_Class1" memberEnd="_rjcsIvtrEeKiosy8GwIZjA _rjcsIPtrEeKiosy8GwIZjA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rjcsIvtrEeKiosy8GwIZjA" name="extension_Stereotype3" type="_o9WMkPtrEeKiosy8GwIZjA" aggregation="composite" association="_rjcsIftrEeKiosy8GwIZjA"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_oA-q8PtrEeKiosy8GwIZjA" name="Profile" metaclassReference="_qrODoPtrEeKiosy8GwIZjA" metamodelReference="_oA-q8ftrEeKiosy8GwIZjA">
+  <eAnnotations xmi:id="_s0T3EPtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_s0UeIPtrEeKiosy8GwIZjA" name="Profile" nsURI="http:///schemas/Profile/_szf-wPtrEeKiosy8GwIZjA/0" nsPrefix="Profile">
+      <eAnnotations xmi:id="_s0WTUvtrEeKiosy8GwIZjA" source="PapyrusVersion">
+        <details xmi:id="_s0WTU_trEeKiosy8GwIZjA" key="Version" value="0.0.1"/>
+        <details xmi:id="_s0WTVPtrEeKiosy8GwIZjA" key="Comment" value=""/>
+        <details xmi:id="_s0WTVftrEeKiosy8GwIZjA" key="Copyright" value=""/>
+        <details xmi:id="_s0WTVvtrEeKiosy8GwIZjA" key="Date" value="2013-08-02"/>
+        <details xmi:id="_s0WTV_trEeKiosy8GwIZjA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeIftrEeKiosy8GwIZjA" name="Stereotype1">
+        <eAnnotations xmi:id="_s0UeIvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ozdQwPtrEeKiosy8GwIZjA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeI_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeJftrEeKiosy8GwIZjA" name="Stereotype2">
+        <eAnnotations xmi:id="_s0UeJvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_o4HuUPtrEeKiosy8GwIZjA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeJ_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeKftrEeKiosy8GwIZjA" name="Stereotype3">
+        <eAnnotations xmi:id="_s0UeKvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_o9WMkPtrEeKiosy8GwIZjA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeK_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:id="_qrODoPtrEeKiosy8GwIZjA" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <packageImport xmi:id="_oA-q8ftrEeKiosy8GwIZjA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:id="_oA-q8vtrEeKiosy8GwIZjA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_ozdQwPtrEeKiosy8GwIZjA" name="Stereotype1">
+    <ownedAttribute xmi:id="_rMhZ4PtrEeKiosy8GwIZjA" name="base_Class" association="_rMhZ4ftrEeKiosy8GwIZjA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_o4HuUPtrEeKiosy8GwIZjA" name="Stereotype2">
+    <ownedAttribute xmi:id="_rWKeEPtrEeKiosy8GwIZjA" name="base_Class" association="_rWKeEftrEeKiosy8GwIZjA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_o9WMkPtrEeKiosy8GwIZjA" name="Stereotype3">
+    <ownedAttribute xmi:id="_rjcsIPtrEeKiosy8GwIZjA" name="base_Class" association="_rjcsIftrEeKiosy8GwIZjA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_rMhZ4ftrEeKiosy8GwIZjA" name="E_Stereotype1_Class1" memberEnd="_rMhZ4vtrEeKiosy8GwIZjA _rMhZ4PtrEeKiosy8GwIZjA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rMhZ4vtrEeKiosy8GwIZjA" name="extension_Stereotype1" type="_ozdQwPtrEeKiosy8GwIZjA" aggregation="composite" association="_rMhZ4ftrEeKiosy8GwIZjA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_rWKeEftrEeKiosy8GwIZjA" name="E_Stereotype2_Class1" memberEnd="_rWKeEvtrEeKiosy8GwIZjA _rWKeEPtrEeKiosy8GwIZjA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rWKeEvtrEeKiosy8GwIZjA" name="extension_Stereotype2" type="_o4HuUPtrEeKiosy8GwIZjA" aggregation="composite" association="_rWKeEftrEeKiosy8GwIZjA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_rjcsIftrEeKiosy8GwIZjA" name="E_Stereotype3_Class1" memberEnd="_rjcsIvtrEeKiosy8GwIZjA _rjcsIPtrEeKiosy8GwIZjA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rjcsIvtrEeKiosy8GwIZjA" name="extension_Stereotype3" type="_o9WMkPtrEeKiosy8GwIZjA" aggregation="composite" association="_rjcsIftrEeKiosy8GwIZjA"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.di
index 5e4c3d37c66..0dd576b7b91 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="profile2.profile.notation#_oA_5EPtrEeKiosy8GwIZjA"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="profile2.profile.notation#_oA_5EPtrEeKiosy8GwIZjA"/>

-        </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="profile2.profile.notation#_oA_5EPtrEeKiosy8GwIZjA"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="profile2.profile.notation#_oA_5EPtrEeKiosy8GwIZjA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.notation
index e7be5b449f0..7359c30f7f8 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.notation
@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_oA_5EPtrEeKiosy8GwIZjA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_ozgUEPtrEeKiosy8GwIZjA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_ozg7IPtrEeKiosy8GwIZjA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ozg7IftrEeKiosy8GwIZjA" type="1071">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ozlzoPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ozmasPtrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ozg7IvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ozg7I_trEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ozg7JPtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozg7JftrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_ozg7JvtrEeKiosy8GwIZjA" visible="false" type="1019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oznBwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oznBwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ozg7J_trEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ozg7KPtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ozg7KftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozg7KvtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_oz1EMPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oz1EM_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oz1ENPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_oz1EMftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oz1EMvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="profile2.profile.uml#_ozdQwPtrEeKiosy8GwIZjA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozgUEftrEeKiosy8GwIZjA" x="415" y="510"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_o4IVYPtrEeKiosy8GwIZjA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_o4IVYvtrEeKiosy8GwIZjA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o4IVY_trEeKiosy8GwIZjA" type="1071">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4I8cPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4I8cftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o4IVZPtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_o4IVZftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o4IVZvtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVZ_trEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o4IVaPtrEeKiosy8GwIZjA" visible="false" type="1019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4I8cvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4I8c_trEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o4IVaftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_o4IVavtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o4IVa_trEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVbPtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o4PDEPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4PDE_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4PDFPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o4PDEftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4PDEvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="profile2.profile.uml#_o4HuUPtrEeKiosy8GwIZjA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVYftrEeKiosy8GwIZjA" x="785" y="510"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_o9XasPtrEeKiosy8GwIZjA" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_o9XasvtrEeKiosy8GwIZjA" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o9Xas_trEeKiosy8GwIZjA" type="1071">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9YBwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9YBwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9XatPtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_o9XatftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o9XatvtrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9Xat_trEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o9XauPtrEeKiosy8GwIZjA" visible="false" type="1019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9YBwvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9YBw_trEeKiosy8GwIZjA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9XauftrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_o9XauvtrEeKiosy8GwIZjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o9Xau_trEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9XavPtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_o9eIYPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9eIY_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9eIZPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o9eIYftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9eIYvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Stereotype" href="profile2.profile.uml#_o9WMkPtrEeKiosy8GwIZjA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9XasftrEeKiosy8GwIZjA" x="1110" y="506"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_qrPRwPtrEeKiosy8GwIZjA" type="1031">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qrQf4PtrEeKiosy8GwIZjA" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4ftrEeKiosy8GwIZjA" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4vtrEeKiosy8GwIZjA" key="StereotypeList" value="StandardProfileL2::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4_trEeKiosy8GwIZjA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf5PtrEeKiosy8GwIZjA" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf5ftrEeKiosy8GwIZjA" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_qrPRwvtrEeKiosy8GwIZjA" type="1084"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_qruZ8PtrEeKiosy8GwIZjA" visible="false" type="AppliedStereotypeCompartement">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_qruZ8ftrEeKiosy8GwIZjA" showTitle="true"/>

-      <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qruZ8vtrEeKiosy8GwIZjA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_qrvBAPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qrvBA_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrvBBPtrEeKiosy8GwIZjA" key="mutable" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_qrvBAftrEeKiosy8GwIZjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrvBAvtrEeKiosy8GwIZjA"/>

-    </children>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrPRw_trEeKiosy8GwIZjA" x="785" y="125"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_oA_5EftrEeKiosy8GwIZjA"/>

-  <element xmi:type="uml:Profile" href="profile2.profile.uml#_oA-q8PtrEeKiosy8GwIZjA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_rNDlYPtrEeKiosy8GwIZjA" type="1013" source="_ozgUEPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_rNDlYftrEeKiosy8GwIZjA"/>

-    <element xmi:type="uml:Extension" href="profile2.profile.uml#_rMhZ4ftrEeKiosy8GwIZjA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rNDlYvtrEeKiosy8GwIZjA" points="[-6, -59, 27, 266]$[-32, -332, 1, -7]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rNK6IPtrEeKiosy8GwIZjA" id="(0.76,0.59)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rNK6IftrEeKiosy8GwIZjA" id="(0.54,0.14)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_rWLsMPtrEeKiosy8GwIZjA" type="1013" source="_o4IVYPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_rWLsMftrEeKiosy8GwIZjA"/>

-    <element xmi:type="uml:Extension" href="profile2.profile.uml#_rWKeEftrEeKiosy8GwIZjA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rWLsMvtrEeKiosy8GwIZjA" points="[-50, -25, 359, 171]$[-459, -203, -50, -7]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_rjcsI_trEeKiosy8GwIZjA" type="1013" source="_o9XasPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_rjcsJPtrEeKiosy8GwIZjA"/>

-    <element xmi:type="uml:Extension" href="profile2.profile.uml#_rjcsIftrEeKiosy8GwIZjA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rjcsJftrEeKiosy8GwIZjA" points="[-90, -50, 691, 391]$[-778, -416, 3, 25]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rjmdIPtrEeKiosy8GwIZjA" id="(0.9,0.7)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_oA_5EPtrEeKiosy8GwIZjA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_ozgUEPtrEeKiosy8GwIZjA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ozg7IPtrEeKiosy8GwIZjA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ozg7IftrEeKiosy8GwIZjA" type="1071">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ozlzoPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ozmasPtrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ozg7IvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ozg7I_trEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ozg7JPtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozg7JftrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ozg7JvtrEeKiosy8GwIZjA" visible="false" type="1019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oznBwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oznBwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ozg7J_trEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ozg7KPtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ozg7KftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozg7KvtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_oz1EMPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oz1EM_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oz1ENPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oz1EMftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oz1EMvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="profile2.profile.uml#_ozdQwPtrEeKiosy8GwIZjA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ozgUEftrEeKiosy8GwIZjA" x="415" y="510"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_o4IVYPtrEeKiosy8GwIZjA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_o4IVYvtrEeKiosy8GwIZjA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o4IVY_trEeKiosy8GwIZjA" type="1071">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4I8cPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4I8cftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o4IVZPtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o4IVZftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o4IVZvtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVZ_trEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o4IVaPtrEeKiosy8GwIZjA" visible="false" type="1019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4I8cvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4I8c_trEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o4IVaftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o4IVavtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o4IVa_trEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVbPtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o4PDEPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o4PDE_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o4PDFPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o4PDEftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4PDEvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="profile2.profile.uml#_o4HuUPtrEeKiosy8GwIZjA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4IVYftrEeKiosy8GwIZjA" x="785" y="510"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_o9XasPtrEeKiosy8GwIZjA" type="1026">
+    <children xmi:type="notation:DecorationNode" xmi:id="_o9XasvtrEeKiosy8GwIZjA" type="1034"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o9Xas_trEeKiosy8GwIZjA" type="1071">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9YBwPtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9YBwftrEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o9XatPtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o9XatftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o9XatvtrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9Xat_trEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o9XauPtrEeKiosy8GwIZjA" visible="false" type="1019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9YBwvtrEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9YBw_trEeKiosy8GwIZjA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o9XauftrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o9XauvtrEeKiosy8GwIZjA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o9Xau_trEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9XavPtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o9eIYPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o9eIY_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o9eIZPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o9eIYftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9eIYvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="profile2.profile.uml#_o9WMkPtrEeKiosy8GwIZjA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9XasftrEeKiosy8GwIZjA" x="1110" y="506"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_qrPRwPtrEeKiosy8GwIZjA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qrQf4PtrEeKiosy8GwIZjA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4ftrEeKiosy8GwIZjA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4vtrEeKiosy8GwIZjA" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf4_trEeKiosy8GwIZjA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf5PtrEeKiosy8GwIZjA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrQf5ftrEeKiosy8GwIZjA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_qrPRwvtrEeKiosy8GwIZjA" type="1084"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qruZ8PtrEeKiosy8GwIZjA" visible="false" type="AppliedStereotypeCompartement">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qruZ8ftrEeKiosy8GwIZjA" showTitle="true"/>
+      <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qruZ8vtrEeKiosy8GwIZjA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qrvBAPtrEeKiosy8GwIZjA" visible="false" type="compartment_shape_display">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qrvBA_trEeKiosy8GwIZjA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qrvBBPtrEeKiosy8GwIZjA" key="mutable" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qrvBAftrEeKiosy8GwIZjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrvBAvtrEeKiosy8GwIZjA"/>
+    </children>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrPRw_trEeKiosy8GwIZjA" x="785" y="125"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_oA_5EftrEeKiosy8GwIZjA"/>
+  <element xmi:type="uml:Profile" href="profile2.profile.uml#_oA-q8PtrEeKiosy8GwIZjA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_rNDlYPtrEeKiosy8GwIZjA" type="1013" source="_ozgUEPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_rNDlYftrEeKiosy8GwIZjA"/>
+    <element xmi:type="uml:Extension" href="profile2.profile.uml#_rMhZ4ftrEeKiosy8GwIZjA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rNDlYvtrEeKiosy8GwIZjA" points="[-6, -59, 27, 266]$[-32, -332, 1, -7]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rNK6IPtrEeKiosy8GwIZjA" id="(0.76,0.59)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rNK6IftrEeKiosy8GwIZjA" id="(0.54,0.14)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_rWLsMPtrEeKiosy8GwIZjA" type="1013" source="_o4IVYPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_rWLsMftrEeKiosy8GwIZjA"/>
+    <element xmi:type="uml:Extension" href="profile2.profile.uml#_rWKeEftrEeKiosy8GwIZjA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rWLsMvtrEeKiosy8GwIZjA" points="[-50, -25, 359, 171]$[-459, -203, -50, -7]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_rjcsI_trEeKiosy8GwIZjA" type="1013" source="_o9XasPtrEeKiosy8GwIZjA" target="_qrPRwPtrEeKiosy8GwIZjA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_rjcsJPtrEeKiosy8GwIZjA"/>
+    <element xmi:type="uml:Extension" href="profile2.profile.uml#_rjcsIftrEeKiosy8GwIZjA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rjcsJftrEeKiosy8GwIZjA" points="[-90, -50, 691, 391]$[-778, -416, 3, 25]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rjmdIPtrEeKiosy8GwIZjA" id="(0.9,0.7)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.uml
index 51c736c4529..9c3d1ca7f30 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/dependencyManagement/profiles/p2/profile2.profile.uml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_oA-q8PtrEeKiosy8GwIZjA" name="Profile" metaclassReference="_qrODoPtrEeKiosy8GwIZjA" metamodelReference="_oA-q8ftrEeKiosy8GwIZjA">

-  <eAnnotations xmi:id="_s0T3EPtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_s0UeIPtrEeKiosy8GwIZjA" name="Profile" nsURI="http:///schemas/Profile/_szf-wPtrEeKiosy8GwIZjA/0" nsPrefix="Profile">

-      <eAnnotations xmi:id="_s0WTUvtrEeKiosy8GwIZjA" source="PapyrusVersion">

-        <details xmi:id="_s0WTU_trEeKiosy8GwIZjA" key="Version" value="0.0.1"/>

-        <details xmi:id="_s0WTVPtrEeKiosy8GwIZjA" key="Comment" value=""/>

-        <details xmi:id="_s0WTVftrEeKiosy8GwIZjA" key="Copyright" value=""/>

-        <details xmi:id="_s0WTVvtrEeKiosy8GwIZjA" key="Date" value="2013-08-02"/>

-        <details xmi:id="_s0WTV_trEeKiosy8GwIZjA" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeIftrEeKiosy8GwIZjA" name="Stereotype1">

-        <eAnnotations xmi:id="_s0UeIvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ozdQwPtrEeKiosy8GwIZjA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeI_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeJftrEeKiosy8GwIZjA" name="Stereotype2">

-        <eAnnotations xmi:id="_s0UeJvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_o4HuUPtrEeKiosy8GwIZjA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeJ_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeKftrEeKiosy8GwIZjA" name="Stereotype3">

-        <eAnnotations xmi:id="_s0UeKvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_o9WMkPtrEeKiosy8GwIZjA"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeK_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:id="_qrODoPtrEeKiosy8GwIZjA" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <packageImport xmi:id="_oA-q8ftrEeKiosy8GwIZjA">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

-  </packageImport>

-  <packageImport xmi:id="_oA-q8vtrEeKiosy8GwIZjA">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_ozdQwPtrEeKiosy8GwIZjA" name="Stereotype1">

-    <ownedAttribute xmi:id="_rMhZ4PtrEeKiosy8GwIZjA" name="base_Class" association="_rMhZ4ftrEeKiosy8GwIZjA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_o4HuUPtrEeKiosy8GwIZjA" name="Stereotype2">

-    <ownedAttribute xmi:id="_rWKeEPtrEeKiosy8GwIZjA" name="base_Class" association="_rWKeEftrEeKiosy8GwIZjA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_o9WMkPtrEeKiosy8GwIZjA" name="Stereotype3">

-    <ownedAttribute xmi:id="_rjcsIPtrEeKiosy8GwIZjA" name="base_Class" association="_rjcsIftrEeKiosy8GwIZjA">

-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_rMhZ4ftrEeKiosy8GwIZjA" name="E_Stereotype1_Class1" memberEnd="_rMhZ4vtrEeKiosy8GwIZjA _rMhZ4PtrEeKiosy8GwIZjA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rMhZ4vtrEeKiosy8GwIZjA" name="extension_Stereotype1" type="_ozdQwPtrEeKiosy8GwIZjA" aggregation="composite" association="_rMhZ4ftrEeKiosy8GwIZjA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_rWKeEftrEeKiosy8GwIZjA" name="E_Stereotype2_Class1" memberEnd="_rWKeEvtrEeKiosy8GwIZjA _rWKeEPtrEeKiosy8GwIZjA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rWKeEvtrEeKiosy8GwIZjA" name="extension_Stereotype2" type="_o4HuUPtrEeKiosy8GwIZjA" aggregation="composite" association="_rWKeEftrEeKiosy8GwIZjA"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_rjcsIftrEeKiosy8GwIZjA" name="E_Stereotype3_Class1" memberEnd="_rjcsIvtrEeKiosy8GwIZjA _rjcsIPtrEeKiosy8GwIZjA">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rjcsIvtrEeKiosy8GwIZjA" name="extension_Stereotype3" type="_o9WMkPtrEeKiosy8GwIZjA" aggregation="composite" association="_rjcsIftrEeKiosy8GwIZjA"/>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_oA-q8PtrEeKiosy8GwIZjA" name="Profile" metaclassReference="_qrODoPtrEeKiosy8GwIZjA" metamodelReference="_oA-q8ftrEeKiosy8GwIZjA">
+  <eAnnotations xmi:id="_s0T3EPtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_s0UeIPtrEeKiosy8GwIZjA" name="Profile" nsURI="http:///schemas/Profile/_szf-wPtrEeKiosy8GwIZjA/0" nsPrefix="Profile">
+      <eAnnotations xmi:id="_s0WTUvtrEeKiosy8GwIZjA" source="PapyrusVersion">
+        <details xmi:id="_s0WTU_trEeKiosy8GwIZjA" key="Version" value="0.0.1"/>
+        <details xmi:id="_s0WTVPtrEeKiosy8GwIZjA" key="Comment" value=""/>
+        <details xmi:id="_s0WTVftrEeKiosy8GwIZjA" key="Copyright" value=""/>
+        <details xmi:id="_s0WTVvtrEeKiosy8GwIZjA" key="Date" value="2013-08-02"/>
+        <details xmi:id="_s0WTV_trEeKiosy8GwIZjA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeIftrEeKiosy8GwIZjA" name="Stereotype1">
+        <eAnnotations xmi:id="_s0UeIvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ozdQwPtrEeKiosy8GwIZjA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeI_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeJftrEeKiosy8GwIZjA" name="Stereotype2">
+        <eAnnotations xmi:id="_s0UeJvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_o4HuUPtrEeKiosy8GwIZjA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeJ_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_s0UeKftrEeKiosy8GwIZjA" name="Stereotype3">
+        <eAnnotations xmi:id="_s0UeKvtrEeKiosy8GwIZjA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_o9WMkPtrEeKiosy8GwIZjA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_s0UeK_trEeKiosy8GwIZjA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:id="_qrODoPtrEeKiosy8GwIZjA" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <packageImport xmi:id="_oA-q8ftrEeKiosy8GwIZjA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:id="_oA-q8vtrEeKiosy8GwIZjA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_ozdQwPtrEeKiosy8GwIZjA" name="Stereotype1">
+    <ownedAttribute xmi:id="_rMhZ4PtrEeKiosy8GwIZjA" name="base_Class" association="_rMhZ4ftrEeKiosy8GwIZjA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_o4HuUPtrEeKiosy8GwIZjA" name="Stereotype2">
+    <ownedAttribute xmi:id="_rWKeEPtrEeKiosy8GwIZjA" name="base_Class" association="_rWKeEftrEeKiosy8GwIZjA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_o9WMkPtrEeKiosy8GwIZjA" name="Stereotype3">
+    <ownedAttribute xmi:id="_rjcsIPtrEeKiosy8GwIZjA" name="base_Class" association="_rjcsIftrEeKiosy8GwIZjA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_rMhZ4ftrEeKiosy8GwIZjA" name="E_Stereotype1_Class1" memberEnd="_rMhZ4vtrEeKiosy8GwIZjA _rMhZ4PtrEeKiosy8GwIZjA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rMhZ4vtrEeKiosy8GwIZjA" name="extension_Stereotype1" type="_ozdQwPtrEeKiosy8GwIZjA" aggregation="composite" association="_rMhZ4ftrEeKiosy8GwIZjA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_rWKeEftrEeKiosy8GwIZjA" name="E_Stereotype2_Class1" memberEnd="_rWKeEvtrEeKiosy8GwIZjA _rWKeEPtrEeKiosy8GwIZjA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rWKeEvtrEeKiosy8GwIZjA" name="extension_Stereotype2" type="_o4HuUPtrEeKiosy8GwIZjA" aggregation="composite" association="_rWKeEftrEeKiosy8GwIZjA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_rjcsIftrEeKiosy8GwIZjA" name="E_Stereotype3_Class1" memberEnd="_rjcsIvtrEeKiosy8GwIZjA _rjcsIPtrEeKiosy8GwIZjA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rjcsIvtrEeKiosy8GwIZjA" name="extension_Stereotype3" type="_o9WMkPtrEeKiosy8GwIZjA" aggregation="composite" association="_rjcsIftrEeKiosy8GwIZjA"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/emf/Metamodel.ecore b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/emf/Metamodel.ecore
index 12bf1f1985e..28896001a2f 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/emf/Metamodel.ecore
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/emf/Metamodel.ecore
@@ -1,30 +1,30 @@
-<?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="TestMetamodel" nsURI="http://www.eclipse.org/papyrus/tools/tests"

-    nsPrefix="test">

-  <eClassifiers xsi:type="ecore:EClass" name="Class1">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElements" upperBound="-1"

-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="singleValuedProperty" eType="#//Class2"

-        eOpposite="#//Class2/infiniteReference"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="multiValuedProperty" upperBound="-1"

-        eType="#//Class3"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Class2">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="infiniteReference" eType="#//Class1"

-        eOpposite="#//Class1/singleValuedProperty"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enum" eType="#//Enum1"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Class3"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Class4" eSuperTypes="#//Class2 #//Class3"/>

-  <eClassifiers xsi:type="ecore:EEnum" name="Enum1">

-    <eLiterals name="v1"/>

-    <eLiterals name="v2" value="1"/>

-    <eLiterals name="v3" value="2"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="Enum2">

-    <eLiterals name="v4"/>

-    <eLiterals name="v5" value="1"/>

-    <eLiterals name="v6" value="2" literal="v6"/>

-  </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="TestMetamodel" nsURI="http://www.eclipse.org/papyrus/tools/tests"
+    nsPrefix="test">
+  <eClassifiers xsi:type="ecore:EClass" name="Class1">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElements" upperBound="-1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="singleValuedProperty" eType="#//Class2"
+        eOpposite="#//Class2/infiniteReference"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="multiValuedProperty" upperBound="-1"
+        eType="#//Class3"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Class2">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="infiniteReference" eType="#//Class1"
+        eOpposite="#//Class1/singleValuedProperty"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enum" eType="#//Enum1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Class3"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Class4" eSuperTypes="#//Class2 #//Class3"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="Enum1">
+    <eLiterals name="v1"/>
+    <eLiterals name="v2" value="1"/>
+    <eLiterals name="v3" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Enum2">
+    <eLiterals name="v4"/>
+    <eLiterals name="v5" value="1"/>
+    <eLiterals name="v6" value="2" literal="v6"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/emf/TestModel.xmi b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/emf/TestModel.xmi
index 964433e8701..5b1ed080c75 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/emf/TestModel.xmi
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/emf/TestModel.xmi
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="ASCII"?>

-<test:Class1

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:test="http://www.eclipse.org/papyrus/tools/tests"

-    xsi:schemaLocation="http://www.eclipse.org/papyrus/tools/tests Metamodel.ecore"

-    singleValuedProperty="//@ownedElements.0">

-  <ownedElements

-      xsi:type="test:Class2"

-      infiniteReference="/"/>

-  <ownedElements

-      xsi:type="test:Class3"/>

-  <ownedElements

-      xsi:type="test:Class1">

-    <ownedElements

-        xsi:type="test:Class2"/>

-    <ownedElements

-        xsi:type="test:Class3"/>

-    <ownedElements

-        xsi:type="test:Class2"/>

-    <ownedElements

-        xsi:type="test:Class3"/>

-  </ownedElements>

-  <ownedElements

-      xsi:type="test:Class1">

-    <ownedElements

-        xsi:type="test:Class2"/>

-    <ownedElements

-        xsi:type="test:Class3"/>

-    <ownedElements

-        xsi:type="test:Class2"/>

-    <ownedElements

-        xsi:type="test:Class3"/>

-    <ownedElements

-        xsi:type="test:Class4"/>

-    <ownedElements

-        xsi:type="test:Class4"/>

-  </ownedElements>

-</test:Class1>

+<?xml version="1.0" encoding="ASCII"?>
+<test:Class1
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:test="http://www.eclipse.org/papyrus/tools/tests"
+    xsi:schemaLocation="http://www.eclipse.org/papyrus/tools/tests Metamodel.ecore"
+    singleValuedProperty="//@ownedElements.0">
+  <ownedElements
+      xsi:type="test:Class2"
+      infiniteReference="/"/>
+  <ownedElements
+      xsi:type="test:Class3"/>
+  <ownedElements
+      xsi:type="test:Class1">
+    <ownedElements
+        xsi:type="test:Class2"/>
+    <ownedElements
+        xsi:type="test:Class3"/>
+    <ownedElements
+        xsi:type="test:Class2"/>
+    <ownedElements
+        xsi:type="test:Class3"/>
+  </ownedElements>
+  <ownedElements
+      xsi:type="test:Class1">
+    <ownedElements
+        xsi:type="test:Class2"/>
+    <ownedElements
+        xsi:type="test:Class3"/>
+    <ownedElements
+        xsi:type="test:Class2"/>
+    <ownedElements
+        xsi:type="test:Class3"/>
+    <ownedElements
+        xsi:type="test:Class4"/>
+    <ownedElements
+        xsi:type="test:Class4"/>
+  </ownedElements>
+</test:Class1>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.di
index 9a94f6f2b3b..66251048917 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="profileTest.profile.notation#_dDohENcjEeKw9PDRLmC3Lg"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="profileTest.profile.notation#_dDohENcjEeKw9PDRLmC3Lg"/>

-        </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="profileTest.profile.notation#_dDohENcjEeKw9PDRLmC3Lg"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="profileTest.profile.notation#_dDohENcjEeKw9PDRLmC3Lg"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.notation
index 045d1f466ba..17422cc8e46 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.notation
@@ -1,163 +1,163 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_dDohENcjEeKw9PDRLmC3Lg" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_ekLt0NcjEeKw9PDRLmC3Lg" type="1030" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ekeowNcjEeKw9PDRLmC3Lg" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ekeowdcjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ekeowtcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ekeow9cjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ekeoxNcjEeKw9PDRLmC3Lg" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ekeoxdcjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_ekoZwNcjEeKw9PDRLmC3Lg" type="1047"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_ekoZwdcjEeKw9PDRLmC3Lg" type="1042">

-      <children xmi:type="notation:Shape" xmi:id="_f6eLUNcjEeKw9PDRLmC3Lg" type="1023" fontName="Segoe UI" lineColor="0">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f6eLUtcjEeKw9PDRLmC3Lg" source="ShadowFigure">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f6eLU9cjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f6eLVNcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f6eLVdcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f6eLVtcjEeKw9PDRLmC3Lg" source="QualifiedName">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f6eLV9cjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_f6eLWNcjEeKw9PDRLmC3Lg" type="1046"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_f6n8UNcjEeKw9PDRLmC3Lg" type="1052">

-          <children xmi:type="notation:Shape" xmi:id="_pLx-oNcjEeKw9PDRLmC3Lg" type="3002" fontName="Segoe UI" lineColor="0">

-            <element xmi:type="uml:Property" href="profileTest.profile.uml#_pK5N0NcjEeKw9PDRLmC3Lg"/>

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_pLx-odcjEeKw9PDRLmC3Lg"/>

-          </children>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_f6n8UdcjEeKw9PDRLmC3Lg"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_f6n8UtcjEeKw9PDRLmC3Lg"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_f6n8U9cjEeKw9PDRLmC3Lg"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f6n8VNcjEeKw9PDRLmC3Lg"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_f6n8VdcjEeKw9PDRLmC3Lg" visible="false" type="1053">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_f6n8VtcjEeKw9PDRLmC3Lg"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_f6n8V9cjEeKw9PDRLmC3Lg"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_f6n8WNcjEeKw9PDRLmC3Lg"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f6n8WdcjEeKw9PDRLmC3Lg"/>

-        </children>

-        <element xmi:type="uml:Stereotype" href="profileTest.profile.uml#_f6LQYNcjEeKw9PDRLmC3Lg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f6eLUdcjEeKw9PDRLmC3Lg" x="60" y="43"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ekoZwtcjEeKw9PDRLmC3Lg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ekoZw9cjEeKw9PDRLmC3Lg"/>

-    </children>

-    <element xmi:type="uml:Profile" href="profileTest.profile.uml#_ejJMANcjEeKw9PDRLmC3Lg"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ekLt0dcjEeKw9PDRLmC3Lg" x="70" y="215" width="311" height="216"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_fSdJENcjEeKw9PDRLmC3Lg" type="1030" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fSdJEtcjEeKw9PDRLmC3Lg" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fSdJE9cjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fSdJFNcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fSdJFdcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fSdJFtcjEeKw9PDRLmC3Lg" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fSdJF9cjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_fSdJGNcjEeKw9PDRLmC3Lg" type="1047"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_fSdJGdcjEeKw9PDRLmC3Lg" type="1042">

-      <children xmi:type="notation:Shape" xmi:id="_g2bdQNcjEeKw9PDRLmC3Lg" type="1023" fontName="Segoe UI" lineColor="0">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g2bdQtcjEeKw9PDRLmC3Lg" source="ShadowFigure">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g2bdQ9cjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g2bdRNcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g2bdRdcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g2bdRtcjEeKw9PDRLmC3Lg" source="QualifiedName">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g2bdR9cjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_g2bdSNcjEeKw9PDRLmC3Lg" type="1046"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_g2bdSdcjEeKw9PDRLmC3Lg" type="1052">

-          <children xmi:type="notation:Shape" xmi:id="_s4oq4NcjEeKw9PDRLmC3Lg" type="3002" fontName="Segoe UI" lineColor="0">

-            <element xmi:type="uml:Property" href="profileTest.profile.uml#_s4VI4NcjEeKw9PDRLmC3Lg"/>

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_s4oq4dcjEeKw9PDRLmC3Lg"/>

-          </children>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_g2bdStcjEeKw9PDRLmC3Lg"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_g2bdS9cjEeKw9PDRLmC3Lg"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_g2bdTNcjEeKw9PDRLmC3Lg"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g2bdTdcjEeKw9PDRLmC3Lg"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_g2bdTtcjEeKw9PDRLmC3Lg" visible="false" type="1053">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_g2bdT9cjEeKw9PDRLmC3Lg"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_g2bdUNcjEeKw9PDRLmC3Lg"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_g2bdUdcjEeKw9PDRLmC3Lg"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g2bdUtcjEeKw9PDRLmC3Lg"/>

-        </children>

-        <element xmi:type="uml:Stereotype" href="profileTest.profile.uml#_g2RsQNcjEeKw9PDRLmC3Lg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g2bdQdcjEeKw9PDRLmC3Lg" x="74" y="54"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_fSdJGtcjEeKw9PDRLmC3Lg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fSdJG9cjEeKw9PDRLmC3Lg"/>

-    </children>

-    <element xmi:type="uml:Profile" href="profileTest.profile.uml#_fSJnENcjEeKw9PDRLmC3Lg"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fSdJEdcjEeKw9PDRLmC3Lg" x="595" y="220" width="381" height="206"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_m0ohEdcjEeKw9PDRLmC3Lg" type="1031" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohE9cjEeKw9PDRLmC3Lg" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohFNcjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohFdcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohFtcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohF9cjEeKw9PDRLmC3Lg" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohGNcjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohG9cjEeKw9PDRLmC3Lg" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohHNcjEeKw9PDRLmC3Lg" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohHdcjEeKw9PDRLmC3Lg" key="StereotypeList" value="StandardProfileL2::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohHtcjEeKw9PDRLmC3Lg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohH9cjEeKw9PDRLmC3Lg" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohINcjEeKw9PDRLmC3Lg" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_m0ohGdcjEeKw9PDRLmC3Lg" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m0ohGtcjEeKw9PDRLmC3Lg" x="310" y="35"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_m0ohIdcjEeKw9PDRLmC3Lg" type="1031" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohI9cjEeKw9PDRLmC3Lg" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohJNcjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohJdcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohJtcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohJ9cjEeKw9PDRLmC3Lg" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohKNcjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohK9cjEeKw9PDRLmC3Lg" source="Stereotype_Annotation">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohLNcjEeKw9PDRLmC3Lg" key="StereotypeWithQualifiedNameList" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohLdcjEeKw9PDRLmC3Lg" key="StereotypeList" value="StandardProfileL2::Metaclass"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohLtcjEeKw9PDRLmC3Lg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohL9cjEeKw9PDRLmC3Lg" key="PropStereoDisplay" value=""/>

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohMNcjEeKw9PDRLmC3Lg" key="StereotypePropertyLocation" value="Compartment"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_m0ohKdcjEeKw9PDRLmC3Lg" type="1084"/>

-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m0ohKtcjEeKw9PDRLmC3Lg" x="165" y="130"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_dDohEdcjEeKw9PDRLmC3Lg"/>

-  <element xmi:type="uml:Profile" href="profileTest.profile.uml#_dCSdQNcjEeKw9PDRLmC3Lg"/>

-  <edges xmi:type="notation:Connector" xmi:id="_iUTwgNcjEeKw9PDRLmC3Lg" type="4002" source="_g2bdQNcjEeKw9PDRLmC3Lg" target="_f6eLUNcjEeKw9PDRLmC3Lg" lineColor="0">

-    <children xmi:type="notation:DecorationNode" xmi:id="_iUTwg9cjEeKw9PDRLmC3Lg" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_iUTwhNcjEeKw9PDRLmC3Lg" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_iUTwgdcjEeKw9PDRLmC3Lg" fontName="Segoe UI"/>

-    <element xmi:type="uml:Generalization" href="profileTest.profile.uml#_iS9ssNcjEeKw9PDRLmC3Lg"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iUTwgtcjEeKw9PDRLmC3Lg" points="[-50, -1, 474, -10]$[-474, -13, 50, -22]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_oLzvYNcjEeKw9PDRLmC3Lg" type="1013" source="_f6eLUNcjEeKw9PDRLmC3Lg" target="_m0ohIdcjEeKw9PDRLmC3Lg" lineColor="0">

-    <styles xmi:type="notation:FontStyle" xmi:id="_oLzvYdcjEeKw9PDRLmC3Lg" fontName="Segoe UI"/>

-    <element xmi:type="uml:Extension" href="profileTest.profile.uml#_oLg0cNcjEeKw9PDRLmC3Lg"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oLzvYtcjEeKw9PDRLmC3Lg" points="[4, -50, 0, 139]$[-20, -183, -24, 6]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLzvY9cjEeKw9PDRLmC3Lg" id="(0.24,0.64)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_okptMNcjEeKw9PDRLmC3Lg" type="1013" source="_g2bdQNcjEeKw9PDRLmC3Lg" target="_m0ohEdcjEeKw9PDRLmC3Lg" lineColor="0">

-    <styles xmi:type="notation:FontStyle" xmi:id="_okptMdcjEeKw9PDRLmC3Lg" fontName="Segoe UI"/>

-    <element xmi:type="uml:Extension" href="profileTest.profile.uml#_okgjQNcjEeKw9PDRLmC3Lg"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_okptMtcjEeKw9PDRLmC3Lg" points="[-23, -21, 314, 265]$[-287, -284, 50, 2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_okzeMNcjEeKw9PDRLmC3Lg" id="(0.23,0.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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_dDohENcjEeKw9PDRLmC3Lg" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_ekLt0NcjEeKw9PDRLmC3Lg" type="1030" fontName="Segoe UI" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ekeowNcjEeKw9PDRLmC3Lg" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ekeowdcjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ekeowtcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ekeow9cjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ekeoxNcjEeKw9PDRLmC3Lg" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ekeoxdcjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ekoZwNcjEeKw9PDRLmC3Lg" type="1047"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ekoZwdcjEeKw9PDRLmC3Lg" type="1042">
+      <children xmi:type="notation:Shape" xmi:id="_f6eLUNcjEeKw9PDRLmC3Lg" type="1023" fontName="Segoe UI" lineColor="0">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f6eLUtcjEeKw9PDRLmC3Lg" source="ShadowFigure">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f6eLU9cjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f6eLVNcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f6eLVdcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f6eLVtcjEeKw9PDRLmC3Lg" source="QualifiedName">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f6eLV9cjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_f6eLWNcjEeKw9PDRLmC3Lg" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_f6n8UNcjEeKw9PDRLmC3Lg" type="1052">
+          <children xmi:type="notation:Shape" xmi:id="_pLx-oNcjEeKw9PDRLmC3Lg" type="3002" fontName="Segoe UI" lineColor="0">
+            <element xmi:type="uml:Property" href="profileTest.profile.uml#_pK5N0NcjEeKw9PDRLmC3Lg"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_pLx-odcjEeKw9PDRLmC3Lg"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_f6n8UdcjEeKw9PDRLmC3Lg"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_f6n8UtcjEeKw9PDRLmC3Lg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_f6n8U9cjEeKw9PDRLmC3Lg"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f6n8VNcjEeKw9PDRLmC3Lg"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_f6n8VdcjEeKw9PDRLmC3Lg" visible="false" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_f6n8VtcjEeKw9PDRLmC3Lg"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_f6n8V9cjEeKw9PDRLmC3Lg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_f6n8WNcjEeKw9PDRLmC3Lg"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f6n8WdcjEeKw9PDRLmC3Lg"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="profileTest.profile.uml#_f6LQYNcjEeKw9PDRLmC3Lg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f6eLUdcjEeKw9PDRLmC3Lg" x="60" y="43"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ekoZwtcjEeKw9PDRLmC3Lg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ekoZw9cjEeKw9PDRLmC3Lg"/>
+    </children>
+    <element xmi:type="uml:Profile" href="profileTest.profile.uml#_ejJMANcjEeKw9PDRLmC3Lg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ekLt0dcjEeKw9PDRLmC3Lg" x="70" y="215" width="311" height="216"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_fSdJENcjEeKw9PDRLmC3Lg" type="1030" fontName="Segoe UI" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fSdJEtcjEeKw9PDRLmC3Lg" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fSdJE9cjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fSdJFNcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fSdJFdcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fSdJFtcjEeKw9PDRLmC3Lg" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fSdJF9cjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_fSdJGNcjEeKw9PDRLmC3Lg" type="1047"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_fSdJGdcjEeKw9PDRLmC3Lg" type="1042">
+      <children xmi:type="notation:Shape" xmi:id="_g2bdQNcjEeKw9PDRLmC3Lg" type="1023" fontName="Segoe UI" lineColor="0">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g2bdQtcjEeKw9PDRLmC3Lg" source="ShadowFigure">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g2bdQ9cjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g2bdRNcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g2bdRdcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g2bdRtcjEeKw9PDRLmC3Lg" source="QualifiedName">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g2bdR9cjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_g2bdSNcjEeKw9PDRLmC3Lg" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_g2bdSdcjEeKw9PDRLmC3Lg" type="1052">
+          <children xmi:type="notation:Shape" xmi:id="_s4oq4NcjEeKw9PDRLmC3Lg" type="3002" fontName="Segoe UI" lineColor="0">
+            <element xmi:type="uml:Property" href="profileTest.profile.uml#_s4VI4NcjEeKw9PDRLmC3Lg"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_s4oq4dcjEeKw9PDRLmC3Lg"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_g2bdStcjEeKw9PDRLmC3Lg"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_g2bdS9cjEeKw9PDRLmC3Lg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_g2bdTNcjEeKw9PDRLmC3Lg"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g2bdTdcjEeKw9PDRLmC3Lg"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_g2bdTtcjEeKw9PDRLmC3Lg" visible="false" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_g2bdT9cjEeKw9PDRLmC3Lg"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_g2bdUNcjEeKw9PDRLmC3Lg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_g2bdUdcjEeKw9PDRLmC3Lg"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g2bdUtcjEeKw9PDRLmC3Lg"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="profileTest.profile.uml#_g2RsQNcjEeKw9PDRLmC3Lg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g2bdQdcjEeKw9PDRLmC3Lg" x="74" y="54"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fSdJGtcjEeKw9PDRLmC3Lg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fSdJG9cjEeKw9PDRLmC3Lg"/>
+    </children>
+    <element xmi:type="uml:Profile" href="profileTest.profile.uml#_fSJnENcjEeKw9PDRLmC3Lg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fSdJEdcjEeKw9PDRLmC3Lg" x="595" y="220" width="381" height="206"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_m0ohEdcjEeKw9PDRLmC3Lg" type="1031" fontName="Segoe UI" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohE9cjEeKw9PDRLmC3Lg" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohFNcjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohFdcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohFtcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohF9cjEeKw9PDRLmC3Lg" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohGNcjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohG9cjEeKw9PDRLmC3Lg" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohHNcjEeKw9PDRLmC3Lg" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohHdcjEeKw9PDRLmC3Lg" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohHtcjEeKw9PDRLmC3Lg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohH9cjEeKw9PDRLmC3Lg" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohINcjEeKw9PDRLmC3Lg" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_m0ohGdcjEeKw9PDRLmC3Lg" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m0ohGtcjEeKw9PDRLmC3Lg" x="310" y="35"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_m0ohIdcjEeKw9PDRLmC3Lg" type="1031" fontName="Segoe UI" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohI9cjEeKw9PDRLmC3Lg" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohJNcjEeKw9PDRLmC3Lg" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohJdcjEeKw9PDRLmC3Lg" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohJtcjEeKw9PDRLmC3Lg" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohJ9cjEeKw9PDRLmC3Lg" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohKNcjEeKw9PDRLmC3Lg" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_m0ohK9cjEeKw9PDRLmC3Lg" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohLNcjEeKw9PDRLmC3Lg" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohLdcjEeKw9PDRLmC3Lg" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohLtcjEeKw9PDRLmC3Lg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohL9cjEeKw9PDRLmC3Lg" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m0ohMNcjEeKw9PDRLmC3Lg" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_m0ohKdcjEeKw9PDRLmC3Lg" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m0ohKtcjEeKw9PDRLmC3Lg" x="165" y="130"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_dDohEdcjEeKw9PDRLmC3Lg"/>
+  <element xmi:type="uml:Profile" href="profileTest.profile.uml#_dCSdQNcjEeKw9PDRLmC3Lg"/>
+  <edges xmi:type="notation:Connector" xmi:id="_iUTwgNcjEeKw9PDRLmC3Lg" type="4002" source="_g2bdQNcjEeKw9PDRLmC3Lg" target="_f6eLUNcjEeKw9PDRLmC3Lg" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iUTwg9cjEeKw9PDRLmC3Lg" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iUTwhNcjEeKw9PDRLmC3Lg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_iUTwgdcjEeKw9PDRLmC3Lg" fontName="Segoe UI"/>
+    <element xmi:type="uml:Generalization" href="profileTest.profile.uml#_iS9ssNcjEeKw9PDRLmC3Lg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iUTwgtcjEeKw9PDRLmC3Lg" points="[-50, -1, 474, -10]$[-474, -13, 50, -22]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_oLzvYNcjEeKw9PDRLmC3Lg" type="1013" source="_f6eLUNcjEeKw9PDRLmC3Lg" target="_m0ohIdcjEeKw9PDRLmC3Lg" lineColor="0">
+    <styles xmi:type="notation:FontStyle" xmi:id="_oLzvYdcjEeKw9PDRLmC3Lg" fontName="Segoe UI"/>
+    <element xmi:type="uml:Extension" href="profileTest.profile.uml#_oLg0cNcjEeKw9PDRLmC3Lg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oLzvYtcjEeKw9PDRLmC3Lg" points="[4, -50, 0, 139]$[-20, -183, -24, 6]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLzvY9cjEeKw9PDRLmC3Lg" id="(0.24,0.64)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_okptMNcjEeKw9PDRLmC3Lg" type="1013" source="_g2bdQNcjEeKw9PDRLmC3Lg" target="_m0ohEdcjEeKw9PDRLmC3Lg" lineColor="0">
+    <styles xmi:type="notation:FontStyle" xmi:id="_okptMdcjEeKw9PDRLmC3Lg" fontName="Segoe UI"/>
+    <element xmi:type="uml:Extension" href="profileTest.profile.uml#_okgjQNcjEeKw9PDRLmC3Lg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_okptMtcjEeKw9PDRLmC3Lg" points="[-23, -21, 314, 265]$[-287, -284, 50, 2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_okzeMNcjEeKw9PDRLmC3Lg" id="(0.23,0.29)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.uml
index de79a1d29f2..64aceacba40 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/profileTest.profile.uml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_dCSdQNcjEeKw9PDRLmC3Lg" name="Profile" metaclassReference="_m0U_ENcjEeKw9PDRLmC3Lg _m0ohENcjEeKw9PDRLmC3Lg" metamodelReference="_dCSdQdcjEeKw9PDRLmC3Lg">

-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xjOKsdcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-    <contents xmi:type="ecore:EPackage" xmi:id="_zdqeIdcjEeKw9PDRLmC3Lg" name="Profile" nsURI="http:///schemas/Profile/_zdqeINcjEeKw9PDRLmC3Lg/1" nsPrefix="Profile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zdqeItcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ejJMANcjEeKw9PDRLmC3Lg"/>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zeQUANcjEeKw9PDRLmC3Lg" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUAdcjEeKw9PDRLmC3Lg" key="Version" value="0.0.2"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUAtcjEeKw9PDRLmC3Lg" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUA9cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUBNcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUBdcjEeKw9PDRLmC3Lg" key="Author" value=""/>

-      </eAnnotations>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_xj9xkNcjEeKw9PDRLmC3Lg" name="Profile" nsURI="http:///schemas/Profile/_xjOKsNcjEeKw9PDRLmC3Lg/0" nsPrefix="Profile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xj9xkdcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ejJMANcjEeKw9PDRLmC3Lg"/>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkjncNcjEeKw9PDRLmC3Lg" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjncdcjEeKw9PDRLmC3Lg" key="Version" value="0.0.1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjnctcjEeKw9PDRLmC3Lg" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjnc9cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjndNcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjnddcjEeKw9PDRLmC3Lg" key="Author" value=""/>

-      </eAnnotations>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_m0U_ENcjEeKw9PDRLmC3Lg" alias="Class">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-  </elementImport>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_m0ohENcjEeKw9PDRLmC3Lg" alias="Activity">

-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>

-  </elementImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_dCSdQdcjEeKw9PDRLmC3Lg">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

-  </packageImport>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_dCSdQtcjEeKw9PDRLmC3Lg">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Profile" xmi:id="_ejJMANcjEeKw9PDRLmC3Lg" name="Profile1">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkHikNcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-      <contents xmi:type="ecore:EPackage" xmi:id="_zdqeJNcjEeKw9PDRLmC3Lg" name="Profile1" nsURI="http://Profile/schemas/Profile1/_zdqeI9cjEeKw9PDRLmC3Lg/1" nsPrefix="Profile1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zeaFANcjEeKw9PDRLmC3Lg" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFAdcjEeKw9PDRLmC3Lg" key="Version" value="0.0.2"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFAtcjEeKw9PDRLmC3Lg" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFA9cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFBNcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFBdcjEeKw9PDRLmC3Lg" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_zdqeJdcjEeKw9PDRLmC3Lg" name="Stereotype1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zdqeJtcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_f6LQYNcjEeKw9PDRLmC3Lg"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_zdqeJ9cjEeKw9PDRLmC3Lg" name="base_Activity" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Activity"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_zdqeKdcjEeKw9PDRLmC3Lg" name="prop1" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_xkQsgNcjEeKw9PDRLmC3Lg" name="Profile1" nsURI="http://Profile/schemas/Profile1/_xj9xktcjEeKw9PDRLmC3Lg/0" nsPrefix="Profile1">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xktYcNcjEeKw9PDRLmC3Lg" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYcdcjEeKw9PDRLmC3Lg" key="Version" value="0.0.1"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYctcjEeKw9PDRLmC3Lg" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYc9cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYdNcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYddcjEeKw9PDRLmC3Lg" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_xkQsgdcjEeKw9PDRLmC3Lg" name="Stereotype1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkQsgtcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_f6LQYNcjEeKw9PDRLmC3Lg"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_xkQsg9cjEeKw9PDRLmC3Lg" name="base_Activity" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Activity"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_xkQshdcjEeKw9PDRLmC3Lg" name="prop1" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-    </eAnnotations>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_f6LQYNcjEeKw9PDRLmC3Lg" name="Stereotype1">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_oLXDcNcjEeKw9PDRLmC3Lg" name="base_Activity" association="_oLg0cNcjEeKw9PDRLmC3Lg">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_pK5N0NcjEeKw9PDRLmC3Lg" name="prop1" visibility="public">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sFmrcNcjEeKw9PDRLmC3Lg" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sFv1YNcjEeKw9PDRLmC3Lg" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_sGDXYNcjEeKw9PDRLmC3Lg">

-          <value xsi:nil="true"/>

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Extension" xmi:id="_oLg0cNcjEeKw9PDRLmC3Lg" name="E_Stereotype1_Activity1" memberEnd="_oLg0cdcjEeKw9PDRLmC3Lg _oLXDcNcjEeKw9PDRLmC3Lg">

-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_oLg0cdcjEeKw9PDRLmC3Lg" name="extension_Stereotype1" type="_f6LQYNcjEeKw9PDRLmC3Lg" aggregation="composite" association="_oLg0cNcjEeKw9PDRLmC3Lg"/>

-    </packagedElement>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Profile" xmi:id="_fSJnENcjEeKw9PDRLmC3Lg" name="Profile2">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkQsiNcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-      <contents xmi:type="ecore:EPackage" xmi:id="_zdzoEdcjEeKw9PDRLmC3Lg" name="Profile2" nsURI="http://Profile/schemas/Profile2/_zdzoENcjEeKw9PDRLmC3Lg/1" nsPrefix="Profile2">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zdzoEtcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ejJMANcjEeKw9PDRLmC3Lg"/>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ze2w8NcjEeKw9PDRLmC3Lg" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w8dcjEeKw9PDRLmC3Lg" key="Version" value="0.0.2"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w8tcjEeKw9PDRLmC3Lg" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w89cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w9NcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w9dcjEeKw9PDRLmC3Lg" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_zdzoE9cjEeKw9PDRLmC3Lg" name="Stereotype2" eSuperTypes="_zdqeJdcjEeKw9PDRLmC3Lg">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zdzoFNcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g2RsQNcjEeKw9PDRLmC3Lg"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_zdzoFdcjEeKw9PDRLmC3Lg" name="base_Class" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_zdzoF9cjEeKw9PDRLmC3Lg" name="prop2" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-      <contents xmi:type="ecore:EPackage" xmi:id="_xkadgNcjEeKw9PDRLmC3Lg" name="Profile2" nsURI="http://Profile/schemas/Profile2/_xkQsh9cjEeKw9PDRLmC3Lg/0" nsPrefix="Profile2">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkadgdcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ejJMANcjEeKw9PDRLmC3Lg"/>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xlATYdcjEeKw9PDRLmC3Lg" source="PapyrusVersion">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATYtcjEeKw9PDRLmC3Lg" key="Version" value="0.0.1"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATY9cjEeKw9PDRLmC3Lg" key="Comment" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATZNcjEeKw9PDRLmC3Lg" key="Copyright" value=""/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATZdcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATZtcjEeKw9PDRLmC3Lg" key="Author" value=""/>

-        </eAnnotations>

-        <eClassifiers xmi:type="ecore:EClass" xmi:id="_xkadgtcjEeKw9PDRLmC3Lg" name="Stereotype2" eSuperTypes="_xkQsgdcjEeKw9PDRLmC3Lg">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkadg9cjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g2RsQNcjEeKw9PDRLmC3Lg"/>

-          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_xkadhNcjEeKw9PDRLmC3Lg" name="base_Class" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-          </eStructuralFeatures>

-          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_xkadhtcjEeKw9PDRLmC3Lg" name="Attribute1" ordered="false" lowerBound="1">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-          </eStructuralFeatures>

-        </eClassifiers>

-      </contents>

-    </eAnnotations>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_g2RsQNcjEeKw9PDRLmC3Lg" name="Stereotype2">

-      <generalization xmi:type="uml:Generalization" xmi:id="_iS9ssNcjEeKw9PDRLmC3Lg" general="_f6LQYNcjEeKw9PDRLmC3Lg"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_okWyQNcjEeKw9PDRLmC3Lg" name="base_Class" association="_okgjQNcjEeKw9PDRLmC3Lg">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_s4VI4NcjEeKw9PDRLmC3Lg" name="prop2" visibility="public">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_w7NIcNcjEeKw9PDRLmC3Lg" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_w7WSYNcjEeKw9PDRLmC3Lg" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_w7pNUNcjEeKw9PDRLmC3Lg">

-          <value xsi:nil="true"/>

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Extension" xmi:id="_okgjQNcjEeKw9PDRLmC3Lg" name="E_Stereotype2_Class1" memberEnd="_okgjQdcjEeKw9PDRLmC3Lg _okWyQNcjEeKw9PDRLmC3Lg">

-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_okgjQdcjEeKw9PDRLmC3Lg" name="extension_Stereotype2" type="_g2RsQNcjEeKw9PDRLmC3Lg" aggregation="composite" association="_okgjQNcjEeKw9PDRLmC3Lg"/>

-    </packagedElement>

-  </packagedElement>

-</uml:Profile>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_dCSdQNcjEeKw9PDRLmC3Lg" name="Profile" metaclassReference="_m0U_ENcjEeKw9PDRLmC3Lg _m0ohENcjEeKw9PDRLmC3Lg" metamodelReference="_dCSdQdcjEeKw9PDRLmC3Lg">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xjOKsdcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_zdqeIdcjEeKw9PDRLmC3Lg" name="Profile" nsURI="http:///schemas/Profile/_zdqeINcjEeKw9PDRLmC3Lg/1" nsPrefix="Profile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zdqeItcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ejJMANcjEeKw9PDRLmC3Lg"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zeQUANcjEeKw9PDRLmC3Lg" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUAdcjEeKw9PDRLmC3Lg" key="Version" value="0.0.2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUAtcjEeKw9PDRLmC3Lg" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUA9cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUBNcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeQUBdcjEeKw9PDRLmC3Lg" key="Author" value=""/>
+      </eAnnotations>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_xj9xkNcjEeKw9PDRLmC3Lg" name="Profile" nsURI="http:///schemas/Profile/_xjOKsNcjEeKw9PDRLmC3Lg/0" nsPrefix="Profile">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xj9xkdcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ejJMANcjEeKw9PDRLmC3Lg"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkjncNcjEeKw9PDRLmC3Lg" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjncdcjEeKw9PDRLmC3Lg" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjnctcjEeKw9PDRLmC3Lg" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjnc9cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjndNcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xkjnddcjEeKw9PDRLmC3Lg" key="Author" value=""/>
+      </eAnnotations>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_m0U_ENcjEeKw9PDRLmC3Lg" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_m0ohENcjEeKw9PDRLmC3Lg" alias="Activity">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>
+  </elementImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_dCSdQdcjEeKw9PDRLmC3Lg">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_dCSdQtcjEeKw9PDRLmC3Lg">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Profile" xmi:id="_ejJMANcjEeKw9PDRLmC3Lg" name="Profile1">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkHikNcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <contents xmi:type="ecore:EPackage" xmi:id="_zdqeJNcjEeKw9PDRLmC3Lg" name="Profile1" nsURI="http://Profile/schemas/Profile1/_zdqeI9cjEeKw9PDRLmC3Lg/1" nsPrefix="Profile1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zeaFANcjEeKw9PDRLmC3Lg" source="PapyrusVersion">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFAdcjEeKw9PDRLmC3Lg" key="Version" value="0.0.2"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFAtcjEeKw9PDRLmC3Lg" key="Comment" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFA9cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFBNcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zeaFBdcjEeKw9PDRLmC3Lg" key="Author" value=""/>
+        </eAnnotations>
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_zdqeJdcjEeKw9PDRLmC3Lg" name="Stereotype1">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zdqeJtcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_f6LQYNcjEeKw9PDRLmC3Lg"/>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_zdqeJ9cjEeKw9PDRLmC3Lg" name="base_Activity" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Activity"/>
+          </eStructuralFeatures>
+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_zdqeKdcjEeKw9PDRLmC3Lg" name="prop1" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+          </eStructuralFeatures>
+        </eClassifiers>
+      </contents>
+      <contents xmi:type="ecore:EPackage" xmi:id="_xkQsgNcjEeKw9PDRLmC3Lg" name="Profile1" nsURI="http://Profile/schemas/Profile1/_xj9xktcjEeKw9PDRLmC3Lg/0" nsPrefix="Profile1">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xktYcNcjEeKw9PDRLmC3Lg" source="PapyrusVersion">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYcdcjEeKw9PDRLmC3Lg" key="Version" value="0.0.1"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYctcjEeKw9PDRLmC3Lg" key="Comment" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYc9cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYdNcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xktYddcjEeKw9PDRLmC3Lg" key="Author" value=""/>
+        </eAnnotations>
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_xkQsgdcjEeKw9PDRLmC3Lg" name="Stereotype1">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkQsgtcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_f6LQYNcjEeKw9PDRLmC3Lg"/>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_xkQsg9cjEeKw9PDRLmC3Lg" name="base_Activity" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Activity"/>
+          </eStructuralFeatures>
+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_xkQshdcjEeKw9PDRLmC3Lg" name="prop1" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+          </eStructuralFeatures>
+        </eClassifiers>
+      </contents>
+    </eAnnotations>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_f6LQYNcjEeKw9PDRLmC3Lg" name="Stereotype1">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_oLXDcNcjEeKw9PDRLmC3Lg" name="base_Activity" association="_oLg0cNcjEeKw9PDRLmC3Lg">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_pK5N0NcjEeKw9PDRLmC3Lg" name="prop1" visibility="public">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sFmrcNcjEeKw9PDRLmC3Lg" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sFv1YNcjEeKw9PDRLmC3Lg" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_sGDXYNcjEeKw9PDRLmC3Lg">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_oLg0cNcjEeKw9PDRLmC3Lg" name="E_Stereotype1_Activity1" memberEnd="_oLg0cdcjEeKw9PDRLmC3Lg _oLXDcNcjEeKw9PDRLmC3Lg">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_oLg0cdcjEeKw9PDRLmC3Lg" name="extension_Stereotype1" type="_f6LQYNcjEeKw9PDRLmC3Lg" aggregation="composite" association="_oLg0cNcjEeKw9PDRLmC3Lg"/>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Profile" xmi:id="_fSJnENcjEeKw9PDRLmC3Lg" name="Profile2">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkQsiNcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <contents xmi:type="ecore:EPackage" xmi:id="_zdzoEdcjEeKw9PDRLmC3Lg" name="Profile2" nsURI="http://Profile/schemas/Profile2/_zdzoENcjEeKw9PDRLmC3Lg/1" nsPrefix="Profile2">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zdzoEtcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ejJMANcjEeKw9PDRLmC3Lg"/>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ze2w8NcjEeKw9PDRLmC3Lg" source="PapyrusVersion">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w8dcjEeKw9PDRLmC3Lg" key="Version" value="0.0.2"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w8tcjEeKw9PDRLmC3Lg" key="Comment" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w89cjEeKw9PDRLmC3Lg" key="Copyright" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w9NcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ze2w9dcjEeKw9PDRLmC3Lg" key="Author" value=""/>
+        </eAnnotations>
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_zdzoE9cjEeKw9PDRLmC3Lg" name="Stereotype2" eSuperTypes="_zdqeJdcjEeKw9PDRLmC3Lg">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zdzoFNcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g2RsQNcjEeKw9PDRLmC3Lg"/>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_zdzoFdcjEeKw9PDRLmC3Lg" name="base_Class" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+          </eStructuralFeatures>
+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_zdzoF9cjEeKw9PDRLmC3Lg" name="prop2" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+          </eStructuralFeatures>
+        </eClassifiers>
+      </contents>
+      <contents xmi:type="ecore:EPackage" xmi:id="_xkadgNcjEeKw9PDRLmC3Lg" name="Profile2" nsURI="http://Profile/schemas/Profile2/_xkQsh9cjEeKw9PDRLmC3Lg/0" nsPrefix="Profile2">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkadgdcjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ejJMANcjEeKw9PDRLmC3Lg"/>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xlATYdcjEeKw9PDRLmC3Lg" source="PapyrusVersion">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATYtcjEeKw9PDRLmC3Lg" key="Version" value="0.0.1"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATY9cjEeKw9PDRLmC3Lg" key="Comment" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATZNcjEeKw9PDRLmC3Lg" key="Copyright" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATZdcjEeKw9PDRLmC3Lg" key="Date" value="2013-06-17"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xlATZtcjEeKw9PDRLmC3Lg" key="Author" value=""/>
+        </eAnnotations>
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_xkadgtcjEeKw9PDRLmC3Lg" name="Stereotype2" eSuperTypes="_xkQsgdcjEeKw9PDRLmC3Lg">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xkadg9cjEeKw9PDRLmC3Lg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_g2RsQNcjEeKw9PDRLmC3Lg"/>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_xkadhNcjEeKw9PDRLmC3Lg" name="base_Class" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+          </eStructuralFeatures>
+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_xkadhtcjEeKw9PDRLmC3Lg" name="Attribute1" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+          </eStructuralFeatures>
+        </eClassifiers>
+      </contents>
+    </eAnnotations>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_g2RsQNcjEeKw9PDRLmC3Lg" name="Stereotype2">
+      <generalization xmi:type="uml:Generalization" xmi:id="_iS9ssNcjEeKw9PDRLmC3Lg" general="_f6LQYNcjEeKw9PDRLmC3Lg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_okWyQNcjEeKw9PDRLmC3Lg" name="base_Class" association="_okgjQNcjEeKw9PDRLmC3Lg">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_s4VI4NcjEeKw9PDRLmC3Lg" name="prop2" visibility="public">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_w7NIcNcjEeKw9PDRLmC3Lg" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_w7WSYNcjEeKw9PDRLmC3Lg" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_w7pNUNcjEeKw9PDRLmC3Lg">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_okgjQNcjEeKw9PDRLmC3Lg" name="E_Stereotype2_Class1" memberEnd="_okgjQdcjEeKw9PDRLmC3Lg _okWyQNcjEeKw9PDRLmC3Lg">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_okgjQdcjEeKw9PDRLmC3Lg" name="extension_Stereotype2" type="_g2RsQNcjEeKw9PDRLmC3Lg" aggregation="composite" association="_okgjQNcjEeKw9PDRLmC3Lg"/>
+    </packagedElement>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.di b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.di
index 1b990d56b32..cc0cbd2c08e 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.di
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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="testModel.notation#_TK8gMENHEeG0c8mgtNb9-Q"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="testModel.notation#_TK8gMENHEeG0c8mgtNb9-Q"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<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="testModel.notation#_TK8gMENHEeG0c8mgtNb9-Q"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="testModel.notation#_TK8gMENHEeG0c8mgtNb9-Q"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.notation b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.notation
index e79b5b16618..be8ed73ad62 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.notation
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.notation
@@ -1,235 +1,235 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_TK8gMENHEeG0c8mgtNb9-Q" type="PapyrusUMLClassDiagram" name="TestDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_V3rMMENHEeG0c8mgtNb9-Q" type="2008" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3rMMkNHEeG0c8mgtNb9-Q" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3rMM0NHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3rMNENHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3rMNUNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3rMNkNHEeG0c8mgtNb9-Q" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3rMN0NHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_V3rMOENHEeG0c8mgtNb9-Q" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_V3rMOUNHEeG0c8mgtNb9-Q" type="7017">

-      <children xmi:type="notation:Shape" xmi:id="_XNg9wENHEeG0c8mgtNb9-Q" type="3012" fontName="Segoe UI" lineColor="0">

-        <element xmi:type="uml:Property" href="testModel.uml#_XNXz0ENHEeG0c8mgtNb9-Q"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XNg9wUNHEeG0c8mgtNb9-Q"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_V3rMOkNHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_V3rMO0NHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_V3rMPENHEeG0c8mgtNb9-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3rMPUNHEeG0c8mgtNb9-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_V3rMPkNHEeG0c8mgtNb9-Q" type="7018">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_V3rMP0NHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_V3rMQENHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_V3rMQUNHEeG0c8mgtNb9-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3rMQkNHEeG0c8mgtNb9-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_V3rMQ0NHEeG0c8mgtNb9-Q" type="7019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_V3rMRENHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_V3rMRUNHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_V3rMRkNHEeG0c8mgtNb9-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3rMR0NHEeG0c8mgtNb9-Q"/>

-    </children>

-    <element xmi:type="uml:Class" href="testModel.uml#_V3hbMENHEeG0c8mgtNb9-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3rMMUNHEeG0c8mgtNb9-Q" x="135" y="265" width="150" height="129"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_WUPMYUNHEeG0c8mgtNb9-Q" type="2008" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WUY9YENHEeG0c8mgtNb9-Q" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WUY9YUNHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WUY9YkNHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WUY9Y0NHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WUY9ZENHEeG0c8mgtNb9-Q" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WUY9ZUNHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_WUY9ZkNHEeG0c8mgtNb9-Q" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_WUY9Z0NHEeG0c8mgtNb9-Q" type="7017">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_WUY9aENHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WUY9aUNHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WUY9akNHEeG0c8mgtNb9-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUY9a0NHEeG0c8mgtNb9-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_WUY9bENHEeG0c8mgtNb9-Q" type="7018">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_WUY9bUNHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WUY9bkNHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WUY9b0NHEeG0c8mgtNb9-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUY9cENHEeG0c8mgtNb9-Q"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_WUY9cUNHEeG0c8mgtNb9-Q" type="7019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_WUY9ckNHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WUY9c0NHEeG0c8mgtNb9-Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WUY9dENHEeG0c8mgtNb9-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUY9dUNHEeG0c8mgtNb9-Q"/>

-    </children>

-    <element xmi:type="uml:Class" href="testModel.uml#_WUPMYENHEeG0c8mgtNb9-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUPMYkNHEeG0c8mgtNb9-Q" x="345" y="250" width="126" height="151"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_ak8MkENHEeG0c8mgtNb9-Q" type="2007" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ak8MkkNHEeG0c8mgtNb9-Q" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ak8Mk0NHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ak8MlENHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ak8MlUNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ak8MlkNHEeG0c8mgtNb9-Q" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ak8Ml0NHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_ak8MmENHEeG0c8mgtNb9-Q" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_ak8MmUNHEeG0c8mgtNb9-Q" type="7016">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ak8MmkNHEeG0c8mgtNb9-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ak8Mm0NHEeG0c8mgtNb9-Q"/>

-    </children>

-    <element xmi:type="uml:Package" href="testModel.uml#_akpRoENHEeG0c8mgtNb9-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ak8MkUNHEeG0c8mgtNb9-Q" x="204" y="50"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_blqCsENHEeG0c8mgtNb9-Q" type="2007" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_blqCskNHEeG0c8mgtNb9-Q" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_blqCs0NHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_blqCtENHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_blqCtUNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_blqCtkNHEeG0c8mgtNb9-Q" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_blqCt0NHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_blqCuENHEeG0c8mgtNb9-Q" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_blqCuUNHEeG0c8mgtNb9-Q" type="7016">

-      <children xmi:type="notation:Shape" xmi:id="_f7uEAUNHEeG0c8mgtNb9-Q" type="3010" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f7uEA0NHEeG0c8mgtNb9-Q" source="ShadowFigure">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f7uEBENHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f7uEBUNHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f7uEBkNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f7uEB0NHEeG0c8mgtNb9-Q" source="QualifiedName">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f7uECENHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_f7uECUNHEeG0c8mgtNb9-Q" type="5014"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_f7uECkNHEeG0c8mgtNb9-Q" type="7011">

-          <children xmi:type="notation:Shape" xmi:id="_qJ36EUNHEeG0c8mgtNb9-Q" type="3012" fontName="Segoe UI" lineColor="0">

-            <element xmi:type="uml:Property" href="testModel.uml#_qJ36EENHEeG0c8mgtNb9-Q"/>

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_qJ36EkNHEeG0c8mgtNb9-Q"/>

-          </children>

-          <children xmi:type="notation:Shape" xmi:id="_qSNWsENHEeG0c8mgtNb9-Q" type="3012" fontName="Segoe UI" lineColor="0">

-            <element xmi:type="uml:Property" href="testModel.uml#_qSDlsENHEeG0c8mgtNb9-Q"/>

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_qSNWsUNHEeG0c8mgtNb9-Q"/>

-          </children>

-          <children xmi:type="notation:Shape" xmi:id="_qa1uQUNHEeG0c8mgtNb9-Q" type="3012" fontName="Segoe UI" lineColor="0">

-            <element xmi:type="uml:Property" href="testModel.uml#_qa1uQENHEeG0c8mgtNb9-Q"/>

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_qa1uQkNHEeG0c8mgtNb9-Q"/>

-          </children>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_f7uEC0NHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_f7uEDENHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_f7uEDUNHEeG0c8mgtNb9-Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f7uEDkNHEeG0c8mgtNb9-Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_f7uED0NHEeG0c8mgtNb9-Q" type="7012">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_f7uEEENHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_f7uEEUNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_f7uEEkNHEeG0c8mgtNb9-Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f7uEE0NHEeG0c8mgtNb9-Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_f7uEFENHEeG0c8mgtNb9-Q" type="7013">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_f7uEFUNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_f7uEFkNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_f7uEF0NHEeG0c8mgtNb9-Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f7uEGENHEeG0c8mgtNb9-Q"/>

-        </children>

-        <element xmi:type="uml:Class" href="testModel.uml#_f7uEAENHEeG0c8mgtNb9-Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f7uEAkNHEeG0c8mgtNb9-Q" x="22" y="7"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_blqCukNHEeG0c8mgtNb9-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_blqCu0NHEeG0c8mgtNb9-Q"/>

-    </children>

-    <element xmi:type="uml:Package" href="testModel.uml#_blg4wENHEeG0c8mgtNb9-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_blqCsUNHEeG0c8mgtNb9-Q" x="602" y="53" width="249" height="183"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_dGp7YENHEeG0c8mgtNb9-Q" type="2007" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dGp7YkNHEeG0c8mgtNb9-Q" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dGp7Y0NHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dGp7ZENHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dGp7ZUNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dGp7ZkNHEeG0c8mgtNb9-Q" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dGp7Z0NHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_dGp7aENHEeG0c8mgtNb9-Q" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_dGp7aUNHEeG0c8mgtNb9-Q" type="7016">

-      <children xmi:type="notation:Shape" xmi:id="_e62c4UNHEeG0c8mgtNb9-Q" type="3021" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e7AN4ENHEeG0c8mgtNb9-Q" source="ShadowFigure">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e7AN4UNHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e7AN4kNHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e7AN40NHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e7AN5ENHEeG0c8mgtNb9-Q" source="QualifiedName">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e7AN5UNHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_e7AN5kNHEeG0c8mgtNb9-Q" type="5043"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_e7AN50NHEeG0c8mgtNb9-Q" type="7023">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_e7AN6ENHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_e7AN6UNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_e7AN6kNHEeG0c8mgtNb9-Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e7AN60NHEeG0c8mgtNb9-Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_e7AN7ENHEeG0c8mgtNb9-Q" type="7024">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_e7AN7UNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_e7AN7kNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_e7AN70NHEeG0c8mgtNb9-Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e7AN8ENHEeG0c8mgtNb9-Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_e7AN8UNHEeG0c8mgtNb9-Q" type="7025">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_e7AN8kNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_e7AN80NHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_e7AN9ENHEeG0c8mgtNb9-Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e7AN9UNHEeG0c8mgtNb9-Q"/>

-        </children>

-        <element xmi:type="uml:Component" href="testModel.uml#_e62c4ENHEeG0c8mgtNb9-Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e62c4kNHEeG0c8mgtNb9-Q" x="25" y="13"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_h38gIUNHEeG0c8mgtNb9-Q" type="3023" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_h38gI0NHEeG0c8mgtNb9-Q" source="ShadowFigure">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_h38gJENHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_h38gJUNHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_h38gJkNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>

-        </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_h38gJ0NHEeG0c8mgtNb9-Q" source="QualifiedName">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_h38gKENHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_h38gKUNHEeG0c8mgtNb9-Q" type="5049"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_h38gKkNHEeG0c8mgtNb9-Q" type="7027">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_h38gK0NHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_h38gLENHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_h38gLUNHEeG0c8mgtNb9-Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h38gLkNHEeG0c8mgtNb9-Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_h38gL0NHEeG0c8mgtNb9-Q" type="7028">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_h38gMENHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_h38gMUNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_h38gMkNHEeG0c8mgtNb9-Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h38gM0NHEeG0c8mgtNb9-Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_h38gNENHEeG0c8mgtNb9-Q" type="7029">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_h38gNUNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_h38gNkNHEeG0c8mgtNb9-Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_h38gN0NHEeG0c8mgtNb9-Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h38gOENHEeG0c8mgtNb9-Q"/>

-        </children>

-        <element xmi:type="uml:Interface" href="testModel.uml#_h38gIENHEeG0c8mgtNb9-Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h38gIkNHEeG0c8mgtNb9-Q" x="153" y="14"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_dGp7akNHEeG0c8mgtNb9-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dGp7a0NHEeG0c8mgtNb9-Q"/>

-    </children>

-    <element xmi:type="uml:Package" href="testModel.uml#_dGgxcENHEeG0c8mgtNb9-Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dGp7YUNHEeG0c8mgtNb9-Q" x="640" y="330" width="326" height="236"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_TK8gMUNHEeG0c8mgtNb9-Q"/>

-  <element xmi:type="uml:Model" href="testModel.uml#_QGjiZENHEeG0c8mgtNb9-Q"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_TK8gMENHEeG0c8mgtNb9-Q" type="PapyrusUMLClassDiagram" name="TestDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_V3rMMENHEeG0c8mgtNb9-Q" type="2008" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3rMMkNHEeG0c8mgtNb9-Q" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3rMM0NHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3rMNENHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3rMNUNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3rMNkNHEeG0c8mgtNb9-Q" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3rMN0NHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_V3rMOENHEeG0c8mgtNb9-Q" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_V3rMOUNHEeG0c8mgtNb9-Q" type="7017">
+      <children xmi:type="notation:Shape" xmi:id="_XNg9wENHEeG0c8mgtNb9-Q" type="3012" fontName="Segoe UI" lineColor="0">
+        <element xmi:type="uml:Property" href="testModel.uml#_XNXz0ENHEeG0c8mgtNb9-Q"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XNg9wUNHEeG0c8mgtNb9-Q"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_V3rMOkNHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_V3rMO0NHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_V3rMPENHEeG0c8mgtNb9-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3rMPUNHEeG0c8mgtNb9-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_V3rMPkNHEeG0c8mgtNb9-Q" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_V3rMP0NHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_V3rMQENHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_V3rMQUNHEeG0c8mgtNb9-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3rMQkNHEeG0c8mgtNb9-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_V3rMQ0NHEeG0c8mgtNb9-Q" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_V3rMRENHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_V3rMRUNHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_V3rMRkNHEeG0c8mgtNb9-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3rMR0NHEeG0c8mgtNb9-Q"/>
+    </children>
+    <element xmi:type="uml:Class" href="testModel.uml#_V3hbMENHEeG0c8mgtNb9-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3rMMUNHEeG0c8mgtNb9-Q" x="135" y="265" width="150" height="129"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_WUPMYUNHEeG0c8mgtNb9-Q" type="2008" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WUY9YENHEeG0c8mgtNb9-Q" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WUY9YUNHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WUY9YkNHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WUY9Y0NHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WUY9ZENHEeG0c8mgtNb9-Q" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WUY9ZUNHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_WUY9ZkNHEeG0c8mgtNb9-Q" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_WUY9Z0NHEeG0c8mgtNb9-Q" type="7017">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_WUY9aENHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_WUY9aUNHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WUY9akNHEeG0c8mgtNb9-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUY9a0NHEeG0c8mgtNb9-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_WUY9bENHEeG0c8mgtNb9-Q" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_WUY9bUNHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_WUY9bkNHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WUY9b0NHEeG0c8mgtNb9-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUY9cENHEeG0c8mgtNb9-Q"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_WUY9cUNHEeG0c8mgtNb9-Q" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_WUY9ckNHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_WUY9c0NHEeG0c8mgtNb9-Q"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WUY9dENHEeG0c8mgtNb9-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUY9dUNHEeG0c8mgtNb9-Q"/>
+    </children>
+    <element xmi:type="uml:Class" href="testModel.uml#_WUPMYENHEeG0c8mgtNb9-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUPMYkNHEeG0c8mgtNb9-Q" x="345" y="250" width="126" height="151"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ak8MkENHEeG0c8mgtNb9-Q" type="2007" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ak8MkkNHEeG0c8mgtNb9-Q" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ak8Mk0NHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ak8MlENHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ak8MlUNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ak8MlkNHEeG0c8mgtNb9-Q" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ak8Ml0NHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ak8MmENHEeG0c8mgtNb9-Q" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ak8MmUNHEeG0c8mgtNb9-Q" type="7016">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ak8MmkNHEeG0c8mgtNb9-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ak8Mm0NHEeG0c8mgtNb9-Q"/>
+    </children>
+    <element xmi:type="uml:Package" href="testModel.uml#_akpRoENHEeG0c8mgtNb9-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ak8MkUNHEeG0c8mgtNb9-Q" x="204" y="50"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_blqCsENHEeG0c8mgtNb9-Q" type="2007" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_blqCskNHEeG0c8mgtNb9-Q" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_blqCs0NHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_blqCtENHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_blqCtUNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_blqCtkNHEeG0c8mgtNb9-Q" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_blqCt0NHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_blqCuENHEeG0c8mgtNb9-Q" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_blqCuUNHEeG0c8mgtNb9-Q" type="7016">
+      <children xmi:type="notation:Shape" xmi:id="_f7uEAUNHEeG0c8mgtNb9-Q" type="3010" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f7uEA0NHEeG0c8mgtNb9-Q" source="ShadowFigure">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f7uEBENHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f7uEBUNHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f7uEBkNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f7uEB0NHEeG0c8mgtNb9-Q" source="QualifiedName">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f7uECENHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_f7uECUNHEeG0c8mgtNb9-Q" type="5014"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_f7uECkNHEeG0c8mgtNb9-Q" type="7011">
+          <children xmi:type="notation:Shape" xmi:id="_qJ36EUNHEeG0c8mgtNb9-Q" type="3012" fontName="Segoe UI" lineColor="0">
+            <element xmi:type="uml:Property" href="testModel.uml#_qJ36EENHEeG0c8mgtNb9-Q"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qJ36EkNHEeG0c8mgtNb9-Q"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_qSNWsENHEeG0c8mgtNb9-Q" type="3012" fontName="Segoe UI" lineColor="0">
+            <element xmi:type="uml:Property" href="testModel.uml#_qSDlsENHEeG0c8mgtNb9-Q"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qSNWsUNHEeG0c8mgtNb9-Q"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_qa1uQUNHEeG0c8mgtNb9-Q" type="3012" fontName="Segoe UI" lineColor="0">
+            <element xmi:type="uml:Property" href="testModel.uml#_qa1uQENHEeG0c8mgtNb9-Q"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_qa1uQkNHEeG0c8mgtNb9-Q"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_f7uEC0NHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_f7uEDENHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_f7uEDUNHEeG0c8mgtNb9-Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f7uEDkNHEeG0c8mgtNb9-Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_f7uED0NHEeG0c8mgtNb9-Q" type="7012">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_f7uEEENHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_f7uEEUNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_f7uEEkNHEeG0c8mgtNb9-Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f7uEE0NHEeG0c8mgtNb9-Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_f7uEFENHEeG0c8mgtNb9-Q" type="7013">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_f7uEFUNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_f7uEFkNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_f7uEF0NHEeG0c8mgtNb9-Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f7uEGENHEeG0c8mgtNb9-Q"/>
+        </children>
+        <element xmi:type="uml:Class" href="testModel.uml#_f7uEAENHEeG0c8mgtNb9-Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f7uEAkNHEeG0c8mgtNb9-Q" x="22" y="7"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_blqCukNHEeG0c8mgtNb9-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_blqCu0NHEeG0c8mgtNb9-Q"/>
+    </children>
+    <element xmi:type="uml:Package" href="testModel.uml#_blg4wENHEeG0c8mgtNb9-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_blqCsUNHEeG0c8mgtNb9-Q" x="602" y="53" width="249" height="183"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_dGp7YENHEeG0c8mgtNb9-Q" type="2007" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dGp7YkNHEeG0c8mgtNb9-Q" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dGp7Y0NHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dGp7ZENHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dGp7ZUNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dGp7ZkNHEeG0c8mgtNb9-Q" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dGp7Z0NHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_dGp7aENHEeG0c8mgtNb9-Q" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_dGp7aUNHEeG0c8mgtNb9-Q" type="7016">
+      <children xmi:type="notation:Shape" xmi:id="_e62c4UNHEeG0c8mgtNb9-Q" type="3021" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e7AN4ENHEeG0c8mgtNb9-Q" source="ShadowFigure">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e7AN4UNHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e7AN4kNHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e7AN40NHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e7AN5ENHEeG0c8mgtNb9-Q" source="QualifiedName">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e7AN5UNHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_e7AN5kNHEeG0c8mgtNb9-Q" type="5043"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_e7AN50NHEeG0c8mgtNb9-Q" type="7023">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_e7AN6ENHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_e7AN6UNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_e7AN6kNHEeG0c8mgtNb9-Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e7AN60NHEeG0c8mgtNb9-Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_e7AN7ENHEeG0c8mgtNb9-Q" type="7024">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_e7AN7UNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_e7AN7kNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_e7AN70NHEeG0c8mgtNb9-Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e7AN8ENHEeG0c8mgtNb9-Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_e7AN8UNHEeG0c8mgtNb9-Q" type="7025">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_e7AN8kNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_e7AN80NHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_e7AN9ENHEeG0c8mgtNb9-Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e7AN9UNHEeG0c8mgtNb9-Q"/>
+        </children>
+        <element xmi:type="uml:Component" href="testModel.uml#_e62c4ENHEeG0c8mgtNb9-Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e62c4kNHEeG0c8mgtNb9-Q" x="25" y="13"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_h38gIUNHEeG0c8mgtNb9-Q" type="3023" fontName="Segoe UI" transparency="0" gradient="16777215, 16777215, 0" lineColor="0">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_h38gI0NHEeG0c8mgtNb9-Q" source="ShadowFigure">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_h38gJENHEeG0c8mgtNb9-Q" key="ShadowFigure_Value" value="false"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_h38gJUNHEeG0c8mgtNb9-Q" source="displayNameLabelIcon">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_h38gJkNHEeG0c8mgtNb9-Q" key="displayNameLabelIcon_value" value="true"/>
+        </eAnnotations>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_h38gJ0NHEeG0c8mgtNb9-Q" source="QualifiedName">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_h38gKENHEeG0c8mgtNb9-Q" key="QualifiedNameDepth" value="1000"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_h38gKUNHEeG0c8mgtNb9-Q" type="5049"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_h38gKkNHEeG0c8mgtNb9-Q" type="7027">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_h38gK0NHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_h38gLENHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_h38gLUNHEeG0c8mgtNb9-Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h38gLkNHEeG0c8mgtNb9-Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_h38gL0NHEeG0c8mgtNb9-Q" type="7028">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_h38gMENHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_h38gMUNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_h38gMkNHEeG0c8mgtNb9-Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h38gM0NHEeG0c8mgtNb9-Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_h38gNENHEeG0c8mgtNb9-Q" type="7029">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_h38gNUNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_h38gNkNHEeG0c8mgtNb9-Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_h38gN0NHEeG0c8mgtNb9-Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h38gOENHEeG0c8mgtNb9-Q"/>
+        </children>
+        <element xmi:type="uml:Interface" href="testModel.uml#_h38gIENHEeG0c8mgtNb9-Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h38gIkNHEeG0c8mgtNb9-Q" x="153" y="14"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_dGp7akNHEeG0c8mgtNb9-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dGp7a0NHEeG0c8mgtNb9-Q"/>
+    </children>
+    <element xmi:type="uml:Package" href="testModel.uml#_dGgxcENHEeG0c8mgtNb9-Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dGp7YUNHEeG0c8mgtNb9-Q" x="640" y="330" width="326" height="236"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_TK8gMUNHEeG0c8mgtNb9-Q"/>
+  <element xmi:type="uml:Model" href="testModel.uml#_QGjiZENHEeG0c8mgtNb9-Q"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.uml
index 2c2070946da..3a42442ccdf 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.uml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/resources/uml/testModel.uml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_QGjiZENHEeG0c8mgtNb9-Q" name="Model">

-  <packageImport xmi:id="_QGjiZUNHEeG0c8mgtNb9-Q">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Class" xmi:id="_V3hbMENHEeG0c8mgtNb9-Q" name="Class1">

-    <ownedAttribute xmi:id="_XNXz0ENHEeG0c8mgtNb9-Q" name="Property1">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_WUPMYENHEeG0c8mgtNb9-Q" name="Class2"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_akpRoENHEeG0c8mgtNb9-Q" name="EmptyPackage"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_blg4wENHEeG0c8mgtNb9-Q" name="Package1">

-    <packagedElement xmi:type="uml:Class" xmi:id="_f7uEAENHEeG0c8mgtNb9-Q" name="Class1">

-      <ownedAttribute xmi:id="_qJ36EENHEeG0c8mgtNb9-Q" name="Property1"/>

-      <ownedAttribute xmi:id="_qSDlsENHEeG0c8mgtNb9-Q" name="Property2"/>

-      <ownedAttribute xmi:id="_qa1uQENHEeG0c8mgtNb9-Q" name="Property3"/>

-    </packagedElement>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_dGgxcENHEeG0c8mgtNb9-Q" name="Package2">

-    <packagedElement xmi:type="uml:Component" xmi:id="_e62c4ENHEeG0c8mgtNb9-Q" name="Subclass1"/>

-    <packagedElement xmi:type="uml:Interface" xmi:id="_h38gIENHEeG0c8mgtNb9-Q" name="Interface1"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_QGjiZENHEeG0c8mgtNb9-Q" name="Model">
+  <packageImport xmi:id="_QGjiZUNHEeG0c8mgtNb9-Q">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_V3hbMENHEeG0c8mgtNb9-Q" name="Class1">
+    <ownedAttribute xmi:id="_XNXz0ENHEeG0c8mgtNb9-Q" name="Property1">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_WUPMYENHEeG0c8mgtNb9-Q" name="Class2"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_akpRoENHEeG0c8mgtNb9-Q" name="EmptyPackage"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_blg4wENHEeG0c8mgtNb9-Q" name="Package1">
+    <packagedElement xmi:type="uml:Class" xmi:id="_f7uEAENHEeG0c8mgtNb9-Q" name="Class1">
+      <ownedAttribute xmi:id="_qJ36EENHEeG0c8mgtNb9-Q" name="Property1"/>
+      <ownedAttribute xmi:id="_qSDlsENHEeG0c8mgtNb9-Q" name="Property2"/>
+      <ownedAttribute xmi:id="_qa1uQENHEeG0c8mgtNb9-Q" name="Property3"/>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_dGgxcENHEeG0c8mgtNb9-Q" name="Package2">
+    <packagedElement xmi:type="uml:Component" xmi:id="_e62c4ENHEeG0c8mgtNb9-Q" name="Subclass1"/>
+    <packagedElement xmi:type="uml:Interface" xmi:id="_h38gIENHEeG0c8mgtNb9-Q" name="Interface1"/>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/ContentProviderTest.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/ContentProviderTest.java
index 8d48f309ea2..742d8a7f0d8 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/ContentProviderTest.java
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/ContentProviderTest.java
@@ -1,186 +1,186 @@
-/*****************************************************************************

- * 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 422257

- *  Christian W. Damus (CEA) - bug 434133

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.tests.tests;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.io.IOException;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.ui.emf.providers.EMFContentProvider;

-import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.eclipse.papyrus.uml.tools.tests.Activator;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Ignore;

-import org.junit.Rule;

-import org.junit.Test;

-

-//TODO : Test TreeToFlatContentProvider (Number of elements displayed, isValid...)

-public class ContentProviderTest extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	private EObject testModel;

-

-	private EClass Class1, Class2, Class3, Class4;

-

-	private final int maxLoops = 20; //Avoid infinite recursion on infinite trees

-

-	private EStructuralFeature singleValuedProperty, multiValuedProperty, enumProperty;

-

-	@Before

-	public void init() {

-		try {

-			testModel = EMFHelper.loadEMFModel(houseKeeper.createResourceSet(), URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/emf/TestModel.xmi", true));

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-		}

-

-		assertNotNull("Cannot load the EMF Tests model", testModel);

-

-		Class1 = getEClass("Class1");

-		Class2 = getEClass("Class2");

-		Class3 = getEClass("Class3");

-		Class4 = getEClass("Class4");

-

-		singleValuedProperty = getFeature("Class1", "singleValuedProperty");

-		multiValuedProperty = getFeature("Class1", "multiValuedProperty");

-		enumProperty = getFeature("Class2", "enum");

-

-		assertNotNull(Class1);

-		assertNotNull(Class2);

-		assertNotNull(Class3);

-		assertNotNull(Class4);

-

-		assertNotNull(singleValuedProperty);

-		assertNotNull(multiValuedProperty);

-		assertNotNull(enumProperty);

-	}

-

-	@Test

-	public void singleValuePropertyTest() {

-		//The semantic content provider should return the whole model as a Tree

-		SemanticEMFContentProvider provider = new SemanticEMFContentProvider(testModel, singleValuedProperty, new EObject[]{ testModel });

-		Object[] roots = provider.getElements();

-		assertNotNull(roots);

-		assertEquals(1, roots.length);

-

-		testTree(roots[0], provider, provider, maxLoops);

-	}

-

-	@Test

-	public void singleValuePropertyGraphicalTest() {

-		//The graphical content provider should only return the valid values for the selected feature

-		EMFContentProvider provider = new EMFContentProvider(testModel, singleValuedProperty);

-

-		//The semantic roots contain both the model and the metamodel, but the metamodel doesn't contain any valid value. It should not be displayed.

-		Object[] roots = provider.getElements();

-		assertNotNull(roots);

-		assertEquals(1, roots.length);

-

-		testTree(roots[0], provider, provider, maxLoops);

-

-		//TODO : Test filters

-	}

-

-	@Test

-	public void enumPropertyTest() {

-		EMFContentProvider provider = new EMFContentProvider(testModel, enumProperty);

-		Object[] elements = provider.getElements();

-		assertNotNull(elements);

-		assertEquals(3, elements.length); //It should only return the 3 valid enum literals

-

-		//TODO Improve this test. Currently, the only implementation provides a flat provider, but a tree

-		//provider might also be valid

-	}

-

-	private void testTree(Object current, IHierarchicContentProvider hierarchicProvider, IAdaptableContentProvider adaptableProvider, int maxLoops) {

-		if(maxLoops <= 0) {

-			//This is not necessarily an error. ContentProviders can be infinite

-			//assertTrue("Infinite recursion", false);

-			return;

-		}

-		maxLoops--;

-

-		testElement(current, hierarchicProvider, adaptableProvider);

-

-		for(Object containerElement : hierarchicProvider.getChildren(current)) {

-			testTree(containerElement, hierarchicProvider, adaptableProvider, maxLoops);

-		}

-	}

-

-	private boolean testElement(Object current, IHierarchicContentProvider hierarchicProvider, IAdaptableContentProvider adaptableProvider) {

-		//current is an EMFFacet wrapper. Test the adapted value

-

-		Object adaptedValue = adaptableProvider.getAdaptedValue(current);

-		assertNotNull(adaptedValue);

-		assertTrue(adaptedValue instanceof EObject);

-

-		//Bug 434133: EMFFacet Wrapper should still be adaptable to EObject/EReference

-		Assert.assertTrue(current instanceof IAdaptable);

-

-		if(adaptedValue instanceof EReference) {

-			EStructuralFeature.Setting setting = (EStructuralFeature.Setting)((IAdaptable)current).getAdapter(EStructuralFeature.Setting.class);

-			Assert.assertNotNull(setting);

-			Assert.assertEquals(adaptedValue, setting.getEStructuralFeature());

-		} else if(adaptedValue instanceof EObject) {

-			Assert.assertEquals(adaptedValue, ((IAdaptable)current).getAdapter(EObject.class));

-		}

-		//End of test for Bug 434133

-

-		EObject eObject = (EObject)adaptedValue;

-

-		boolean isValid = hierarchicProvider.isValidValue(current);

-

-		//Only Class2 and Class4 elements are valid for this property

-		assertEquals(isValid, eObject.eClass() == Class2 || eObject.eClass() == Class4);

-

-		return isValid;

-	}

-

-	@Ignore("Not implemented yet")

-	@Test

-	public void multipleValuePropertyTest() {

-		throw new UnsupportedOperationException("Not implemtend yet");

-	}

-

-	private EStructuralFeature getFeature(String className, String featureName) {

-		EClass eClass = getEClass(className);

-		return eClass.getEStructuralFeature(featureName);

-	}

-

-	private EPackage getEPackage() {

-		return testModel.eClass().getEPackage();

-	}

-

-	private EClass getEClass(String className) {

-		return (EClass)getEPackage().getEClassifier(className);

-	}

-}

+/*****************************************************************************
+ * 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 422257
+ *  Christian W. Damus (CEA) - bug 434133
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.tools.tests.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFContentProvider;
+import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.tools.tests.Activator;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+
+//TODO : Test TreeToFlatContentProvider (Number of elements displayed, isValid...)
+public class ContentProviderTest extends AbstractPapyrusTest {
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	private EObject testModel;
+
+	private EClass Class1, Class2, Class3, Class4;
+
+	private final int maxLoops = 20; //Avoid infinite recursion on infinite trees
+
+	private EStructuralFeature singleValuedProperty, multiValuedProperty, enumProperty;
+
+	@Before
+	public void init() {
+		try {
+			testModel = EMFHelper.loadEMFModel(houseKeeper.createResourceSet(), URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/emf/TestModel.xmi", true));
+		} catch (IOException ex) {
+			Activator.log.error(ex);
+		}
+
+		assertNotNull("Cannot load the EMF Tests model", testModel);
+
+		Class1 = getEClass("Class1");
+		Class2 = getEClass("Class2");
+		Class3 = getEClass("Class3");
+		Class4 = getEClass("Class4");
+
+		singleValuedProperty = getFeature("Class1", "singleValuedProperty");
+		multiValuedProperty = getFeature("Class1", "multiValuedProperty");
+		enumProperty = getFeature("Class2", "enum");
+
+		assertNotNull(Class1);
+		assertNotNull(Class2);
+		assertNotNull(Class3);
+		assertNotNull(Class4);
+
+		assertNotNull(singleValuedProperty);
+		assertNotNull(multiValuedProperty);
+		assertNotNull(enumProperty);
+	}
+
+	@Test
+	public void singleValuePropertyTest() {
+		//The semantic content provider should return the whole model as a Tree
+		SemanticEMFContentProvider provider = new SemanticEMFContentProvider(testModel, singleValuedProperty, new EObject[]{ testModel });
+		Object[] roots = provider.getElements();
+		assertNotNull(roots);
+		assertEquals(1, roots.length);
+
+		testTree(roots[0], provider, provider, maxLoops);
+	}
+
+	@Test
+	public void singleValuePropertyGraphicalTest() {
+		//The graphical content provider should only return the valid values for the selected feature
+		EMFContentProvider provider = new EMFContentProvider(testModel, singleValuedProperty);
+
+		//The semantic roots contain both the model and the metamodel, but the metamodel doesn't contain any valid value. It should not be displayed.
+		Object[] roots = provider.getElements();
+		assertNotNull(roots);
+		assertEquals(1, roots.length);
+
+		testTree(roots[0], provider, provider, maxLoops);
+
+		//TODO : Test filters
+	}
+
+	@Test
+	public void enumPropertyTest() {
+		EMFContentProvider provider = new EMFContentProvider(testModel, enumProperty);
+		Object[] elements = provider.getElements();
+		assertNotNull(elements);
+		assertEquals(3, elements.length); //It should only return the 3 valid enum literals
+
+		//TODO Improve this test. Currently, the only implementation provides a flat provider, but a tree
+		//provider might also be valid
+	}
+
+	private void testTree(Object current, IHierarchicContentProvider hierarchicProvider, IAdaptableContentProvider adaptableProvider, int maxLoops) {
+		if(maxLoops <= 0) {
+			//This is not necessarily an error. ContentProviders can be infinite
+			//assertTrue("Infinite recursion", false);
+			return;
+		}
+		maxLoops--;
+
+		testElement(current, hierarchicProvider, adaptableProvider);
+
+		for(Object containerElement : hierarchicProvider.getChildren(current)) {
+			testTree(containerElement, hierarchicProvider, adaptableProvider, maxLoops);
+		}
+	}
+
+	private boolean testElement(Object current, IHierarchicContentProvider hierarchicProvider, IAdaptableContentProvider adaptableProvider) {
+		//current is an EMFFacet wrapper. Test the adapted value
+
+		Object adaptedValue = adaptableProvider.getAdaptedValue(current);
+		assertNotNull(adaptedValue);
+		assertTrue(adaptedValue instanceof EObject);
+
+		//Bug 434133: EMFFacet Wrapper should still be adaptable to EObject/EReference
+		Assert.assertTrue(current instanceof IAdaptable);
+
+		if(adaptedValue instanceof EReference) {
+			EStructuralFeature.Setting setting = (EStructuralFeature.Setting)((IAdaptable)current).getAdapter(EStructuralFeature.Setting.class);
+			Assert.assertNotNull(setting);
+			Assert.assertEquals(adaptedValue, setting.getEStructuralFeature());
+		} else if(adaptedValue instanceof EObject) {
+			Assert.assertEquals(adaptedValue, ((IAdaptable)current).getAdapter(EObject.class));
+		}
+		//End of test for Bug 434133
+
+		EObject eObject = (EObject)adaptedValue;
+
+		boolean isValid = hierarchicProvider.isValidValue(current);
+
+		//Only Class2 and Class4 elements are valid for this property
+		assertEquals(isValid, eObject.eClass() == Class2 || eObject.eClass() == Class4);
+
+		return isValid;
+	}
+
+	@Ignore("Not implemented yet")
+	@Test
+	public void multipleValuePropertyTest() {
+		throw new UnsupportedOperationException("Not implemtend yet");
+	}
+
+	private EStructuralFeature getFeature(String className, String featureName) {
+		EClass eClass = getEClass(className);
+		return eClass.getEStructuralFeature(featureName);
+	}
+
+	private EPackage getEPackage() {
+		return testModel.eClass().getEPackage();
+	}
+
+	private EClass getEClass(String className) {
+		return (EClass)getEPackage().getEClassifier(className);
+	}
+}
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/DependencyManagementTest.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/DependencyManagementTest.java
index 51f3a1b8dd1..4b22850285f 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/DependencyManagementTest.java
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/DependencyManagementTest.java
@@ -1,702 +1,702 @@
-/*****************************************************************************

- * 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 408491

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.tests.tests;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.emf.resource.DependencyManagementHelper;

-import org.eclipse.papyrus.infra.emf.resource.DependencyManager;

-import org.eclipse.papyrus.junit.utils.ModelUtils;

-import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;

-import org.eclipse.papyrus.junit.utils.ProjectUtils;

-import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;

-import org.eclipse.papyrus.uml.tools.tests.Activator;

-import org.eclipse.uml2.common.util.UML2Util;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.util.UMLUtil;

-import org.junit.Assert;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-

-/**

- * Test case for DependencyManagementHelper

- *

- * @author Camille Letavernier

- *

- */

-public class DependencyManagementTest extends AbstractEditorTest {

-

-	public final static String SOURCE_PATH = "resources/dependencyManagement/";

-

-	// Switch from a library to a copy

-	@Test

-	public void testSimpleSwitch() throws Exception {

-		// Create the project will 2 libraries and a client

-		IProject project = ProjectUtils.createProject("dependencyManagement.simpleSwitch");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "model");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "library");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "copy-of-library");

-

-		// Retrieve the URIs of each model

-		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/model.di", true);

-		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/model.uml", true);

-		final URI sourceLibraryURI = URI.createPlatformResourceURI(project.getName() + "/library.uml", true);

-		final URI targetLibraryURI = URI.createPlatformResourceURI(project.getName() + "/copy-of-library.uml", true);

-

-		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);

-

-		// The modelset doesn't have any reference to the target library

-		Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetLibraryURI, false));

-

-		domain.getCommandStack().execute(new RecordingCommand(domain, "Edit model dependencies") {

-

-			@Override

-			protected void doExecute() {

-				DependencyManagementHelper.updateDependencies(sourceLibraryURI, targetLibraryURI, modelSet, domain);

-			}

-		});

-

-		EcoreUtil.resolveAll(modelSet);

-		// The modelset now has some references to the target library

-		Assert.assertNotNull("The modelset should have references to the target library", modelSet.getResource(targetLibraryURI, false));

-

-		modelSet.save(new NullProgressMonitor());

-

-		//

-		// Reload

-		//

-		ModelSet reloadedModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-

-		// The reloaded modelset must have some references to the target library

-		Resource clientModelResource = reloadedModelSet.getResource(clientModelURI, false);

-		Assert.assertNotNull("The modelset should have references to the target library", clientModelResource);

-

-		// The reloaded modelset doesn't have any reference to the source library

-		Assert.assertNull("The modelset should not have references to the source library", reloadedModelSet.getResource(sourceLibraryURI, false));

-

-		domain.dispose();

-		modelSet.unload();

-

-		ModelUtils.getEditingDomain(reloadedModelSet).dispose();

-		reloadedModelSet.unload();

-

-		project.delete(true, null);

-	}

-

-	// Switch from a registered library to a local one

-	@Test

-	public void testSwitchFromRegistererdToLocal() throws Exception {

-		// Create the project will 2 libraries and a client

-		IProject project = ProjectUtils.createProject("dependencyManagement.SwitchFromRegistererdToLocal");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "model-with-registered");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "library");

-

-		// Retrieve the URIs of each model

-		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/model-with-registered.di", true);

-		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/model-with-registered.uml", true);

-		final URI sourceLibraryURI = URI.createURI("pathmap://UML_TEST_LIBRARIES/registered-library.uml", true);

-		final URI targetLibraryURI = URI.createPlatformResourceURI(project.getName() + "/library.uml", true);

-

-		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);

-

-		// The modelset doesn't have any reference to the target library

-		Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetLibraryURI, false));

-

-		domain.getCommandStack().execute(new RecordingCommand(domain, "Edit model dependencies") {

-

-			@Override

-			protected void doExecute() {

-				DependencyManagementHelper.updateDependencies(sourceLibraryURI, targetLibraryURI, modelSet, domain);

-			}

-		});

-

-

-		EcoreUtil.resolveAll(modelSet);

-		// The modelset now has some references to the target library

-		Assert.assertNotNull("The modelset should have references to the target library", modelSet.getResource(targetLibraryURI, false));

-

-

-		modelSet.save(new NullProgressMonitor());

-

-		//

-		// Reload

-		//

-		ModelSet reloadedModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-

-		// The reloaded modelset must have some references to the target library

-		Resource clientModelResource = reloadedModelSet.getResource(clientModelURI, false);

-		Assert.assertNotNull("The modelset should have references to the target library", clientModelResource);

-

-		// The reloaded modelset doesn't have any reference to the source library

-		Assert.assertNull("The modelset should not have references to the source library", reloadedModelSet.getResource(sourceLibraryURI, false));

-

-		domain.dispose();

-		modelSet.unload();

-

-		ModelUtils.getEditingDomain(reloadedModelSet).dispose();

-		reloadedModelSet.unload();

-

-		project.delete(true, null);

-	}

-

-	// Switch from a registered library to a local one

-	@Test

-	public void testSwitchFromLocalToRegistered() throws Exception {

-		// Create the project will 2 libraries and a client

-		IProject project = ProjectUtils.createProject("dependencyManagement.simpleSwitch");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "model");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "library");

-

-		// Retrieve the URIs of each model

-		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/model.di", true);

-		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/model.uml", true);

-		final URI sourceLibraryURI = URI.createPlatformResourceURI(project.getName() + "/library.uml", true);

-		final URI targetLibraryURI = URI.createPlatformResourceURI("pathmap://UML_TEST_LIBRARIES/registered-library.uml", true);

-

-		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);

-

-		// The modelset doesn't have any reference to the target library

-		Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetLibraryURI, false));

-

-		domain.getCommandStack().execute(new RecordingCommand(domain, "Edit model dependencies") {

-

-			@Override

-			protected void doExecute() {

-				DependencyManagementHelper.updateDependencies(sourceLibraryURI, targetLibraryURI, modelSet, domain);

-			}

-		});

-

-

-		EcoreUtil.resolveAll(modelSet);

-		// The modelset now has some references to the target library

-		Assert.assertNotNull("The modelset should have references to the target library", modelSet.getResource(targetLibraryURI, false));

-

-

-		modelSet.save(new NullProgressMonitor());

-

-

-		//

-		// Reload

-		//

-

-		ModelSet reloadedModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-

-		// The reloaded modelset must have some references to the target library

-		Resource clientModelResource = reloadedModelSet.getResource(clientModelURI, false);

-		Assert.assertNotNull("The modelset should have references to the target library", clientModelResource);

-

-		// The reloaded modelset doesn't have any reference to the source library

-		Assert.assertNull("The modelset should not have references to the source library", reloadedModelSet.getResource(sourceLibraryURI, false));

-

-		domain.dispose();

-		modelSet.unload();

-

-		ModelUtils.getEditingDomain(reloadedModelSet).dispose();

-		reloadedModelSet.unload();

-

-		project.delete(true, null);

-	}

-

-

-

-	// Switch from two different versions of a profile

-	@Test

-	public void testSwitchProfilesWithStereotypes() throws Exception {

-		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p1/profile1.profile");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p2/profile2.profile");

-

-		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model.di", true);

-		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model.uml", true);

-		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p1/profile1.profile.uml", true);

-		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p2/profile2.profile.uml", true);

-

-		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);

-		ModelSet newModelSet = null;

-

-		try {

-			// The modelset doesn't have any reference to the target profile

-			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));

-

-			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// Before the transformation, stereotypes from the source profile must be applied

-			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);

-

-			// Execute the transformation

-			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {

-

-				@Override

-				protected void doExecute() {

-					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, null, null);

-				}

-

-			});

-

-			// After the transformation, stereotypes from the target profile must be applied

-			checkAppliedProfileAndStereotypes(modelSet, rootModel, targetProfileURI);

-

-			// Save, reload, and check again

-			modelSet.save(new NullProgressMonitor());

-

-			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-

-			Assert.assertNull("The modelset should not have references to the source library", newModelSet.getResource(sourceProfileURI, false));

-

-			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// After the transformation + reload, stereotypes from the target profile must be applied

-			checkAppliedProfileAndStereotypes(modelSet, rootModel, targetProfileURI);

-		} finally {

-			// Cleanup

-			domain.dispose();

-			modelSet.unload();

-

-			if(newModelSet != null) {

-				ModelUtils.getEditingDomain(newModelSet).dispose();

-				newModelSet.unload();

-			}

-

-			project.delete(true, null);

-		}

-	}

-

-	private void checkAppliedProfileAndStereotypes(ModelSet modelSet, Model rootModel, URI expectedProfileURI) throws Exception {

-		Profile expectedProfile = UMLUtil.load(modelSet, expectedProfileURI, UMLPackage.eINSTANCE.getProfile());

-

-		Assert.assertEquals(expectedProfile, rootModel.getAppliedProfiles().get(0));

-

-		NamedElement class1 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class1").iterator().next();

-		NamedElement class2 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class2").iterator().next();

-		NamedElement class3 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class3").iterator().next();

-

-		NamedElement stereotype1 = UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype1").iterator().next();

-		NamedElement stereotype2 = UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype2").iterator().next();

-		NamedElement stereotype3 = UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype3").iterator().next();

-

-		Assert.assertEquals(stereotype1, class1.getAppliedStereotype("Profile::Stereotype1"));

-		Assert.assertEquals(stereotype2, class2.getAppliedStereotype("Profile::Stereotype2"));

-		Assert.assertEquals(stereotype3, class3.getAppliedStereotype("Profile::Stereotype3"));

-	}

-

-	// Switch from two different versions of a profile, verifying properties

-	@Test

-	public void testSwitchProfilesWithStereotypeProperties() throws Exception {

-		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model2");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p3/profile3.profile");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p4/profile4.profile");

-

-		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.di", true);

-		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.uml", true);

-		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p3/profile3.profile.uml", true);

-		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p4/profile4.profile.uml", true);

-

-		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);

-		ModelSet newModelSet = null;

-

-		try {

-			// The modelset doesn't have any reference to the target profile

-			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));

-

-			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// Before the transformation, stereotypes from the source profile must be applied

-			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);

-

-			// Execute the transformation

-			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {

-

-				@Override

-				protected void doExecute() {

-					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, null, null);

-				}

-

-			});

-

-			// After the transformation, stereotypes from the target profile must be applied

-			checkAppliedProfileAndStereotypeProperties(modelSet, rootModel, targetProfileURI);

-

-			// Save, reload, and check again

-			modelSet.save(new NullProgressMonitor());

-

-			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-

-			Assert.assertNull("The modelset should not have references to the source library", newModelSet.getResource(sourceProfileURI, false));

-

-			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// After the transformation + reload, stereotypes from the target profile must be applied

-			checkAppliedProfileAndStereotypeProperties(modelSet, rootModel, targetProfileURI);

-		} finally {

-			// Cleanup

-			domain.dispose();

-			modelSet.unload();

-

-			if(newModelSet != null) {

-				ModelUtils.getEditingDomain(newModelSet).dispose();

-				newModelSet.unload();

-			}

-

-			project.delete(true, null);

-		}

-	}

-

-	// Verify that stereotype applications that can be retargeted to the new profile retain their identities

-	@Test

-	public void testSwitchProfilesStereotypeIdentities() throws Exception {

-		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model2");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p3/profile3.profile");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p4/profile4.profile");

-

-		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.di", true);

-		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.uml", true);

-		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p3/profile3.profile.uml", true);

-		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p4/profile4.profile.uml", true);

-

-		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);

-		ModelSet newModelSet = null;

-

-		try {

-			// The modelset doesn't have any reference to the target profile

-			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));

-

-			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// Gather the identities of stereotype instances

-			Map<String, EObject> idsToStereotypeInstances = new HashMap<String, EObject>();

-			XMLResource xml = (XMLResource)rootModel.eResource();

-			for(TreeIterator<EObject> iter = xml.getAllContents(); iter.hasNext();) {

-				EObject next = iter.next();

-				if(!(next instanceof Element)) {

-					iter.prune();

-				} else {

-					for(EObject stereo : ((Element)next).getStereotypeApplications()) {

-						idsToStereotypeInstances.put(xml.getID(stereo), stereo);

-					}

-				}

-			}

-

-			// Before the transformation, stereotypes from the source profile must be applied

-			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);

-

-			// Execute the transformation

-			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {

-

-				@Override

-				protected void doExecute() {

-					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, null, null);

-				}

-

-			});

-

-			// Save, reload, and check IDs

-			modelSet.save(new NullProgressMonitor());

-

-			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-

-			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// All of the stereotype instances must have existed before

-			xml = (XMLResource)rootModel.eResource();

-			for(TreeIterator<EObject> iter = xml.getAllContents(); iter.hasNext();) {

-				EObject next = iter.next();

-				if(!(next instanceof Element)) {

-					iter.prune();

-				} else {

-					Element element = (Element)next;

-					for(Stereotype stereo : element.getAppliedStereotypes()) {

-						// The required stereotypes were added in the new profile definition, so they couldn't have been applied before

-						if(!element.isStereotypeRequired(stereo)) {

-							EObject application = element.getStereotypeApplication(stereo);

-							EObject original = idsToStereotypeInstances.remove(xml.getID(application));

-							Assert.assertNotNull("Stereotype instance has a new identity", original);

-							Assert.assertEquals("Stereotype instance has wrong identity", UML2Util.getQualifiedName(original.eClass(), "::"), UML2Util.getQualifiedName(application.eClass(), "::"));

-						}

-					}

-				}

-			}

-

-		} finally {

-			// Cleanup

-			domain.dispose();

-			modelSet.unload();

-

-			if(newModelSet != null) {

-				ModelUtils.getEditingDomain(newModelSet).dispose();

-				newModelSet.unload();

-			}

-

-			project.delete(true, null);

-		}

-	}

-

-	private void checkAppliedProfileAndStereotypeProperties(ModelSet modelSet, Model rootModel, URI expectedProfileURI) throws Exception {

-		Profile expectedProfile = UMLUtil.load(modelSet, expectedProfileURI, UMLPackage.eINSTANCE.getProfile());

-

-		Assert.assertEquals(expectedProfile, rootModel.getAppliedProfiles().get(0));

-

-		NamedElement class1 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class1").iterator().next();

-		NamedElement class2 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class2").iterator().next();

-

-		Stereotype stereotype1 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype1").iterator().next();

-		Stereotype stereotype2 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype2").iterator().next();

-

-		EnumerationLiteral attribute1 = (EnumerationLiteral)class1.getValue(stereotype1, "Attribute1");

-		Assert.assertNotNull(attribute1);

-		Assert.assertEquals("EnumerationLiteral3", attribute1.getName());

-

-		Operation operation = (Operation)class2.getValue(stereotype2, "operation");

-		Assert.assertNotNull(operation);

-		Assert.assertEquals("Operation1", operation.getName());

-		Assert.assertSame(class2, operation.getNamespace());

-	}

-

-	// Switch from two different versions of a profile, verifying that new required stereotypes are applied

-	@Test

-	public void testSwitchProfilesWithRequiredStereotypes() throws Exception {

-		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model2");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p3/profile3.profile");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p4/profile4.profile");

-

-		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.di", true);

-		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.uml", true);

-		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p3/profile3.profile.uml", true);

-		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p4/profile4.profile.uml", true);

-

-		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);

-		ModelSet newModelSet = null;

-

-		try {

-			// The modelset doesn't have any reference to the target profile

-			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));

-

-			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// Before the transformation, stereotypes from the source profile must be applied

-			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);

-

-			// Execute the transformation

-			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {

-

-				@Override

-				protected void doExecute() {

-					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, null, null);

-				}

-

-			});

-

-			// After the transformation, stereotypes from the target profile must be applied

-			checkAppliedProfileAndRequiredStereotypes(modelSet, rootModel, targetProfileURI);

-

-			// Save, reload, and check again

-			modelSet.save(new NullProgressMonitor());

-

-			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-

-			Assert.assertNull("The modelset should not have references to the source library", newModelSet.getResource(sourceProfileURI, false));

-

-			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// After the transformation + reload, stereotypes from the target profile must be applied

-			checkAppliedProfileAndStereotypeProperties(modelSet, rootModel, targetProfileURI);

-		} finally {

-			// Cleanup

-			domain.dispose();

-			modelSet.unload();

-

-			if(newModelSet != null) {

-				ModelUtils.getEditingDomain(newModelSet).dispose();

-				newModelSet.unload();

-			}

-

-			project.delete(true, null);

-		}

-	}

-

-	private void checkAppliedProfileAndRequiredStereotypes(ModelSet modelSet, Model rootModel, URI expectedProfileURI) throws Exception {

-		Profile expectedProfile = UMLUtil.load(modelSet, expectedProfileURI, UMLPackage.eINSTANCE.getProfile());

-

-		Assert.assertEquals(expectedProfile, rootModel.getAppliedProfiles().get(0));

-

-		NamedElement class1 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class1").iterator().next();

-		NamedElement class2 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class2").iterator().next();

-		NamedElement class3 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class3").iterator().next();

-

-		Stereotype stereotype4 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype4").iterator().next();

-

-		Assert.assertTrue(class1.isStereotypeApplied(stereotype4));

-		Assert.assertTrue(class2.isStereotypeApplied(stereotype4));

-		Assert.assertTrue(class3.isStereotypeApplied(stereotype4));

-	}

-

-	// Switch from two different versions of a profile, verifying that missing definitions are handled correctly

-	@Test

-	public void testSwitchProfilesWithMissingDefinitions() throws Exception {

-		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model2");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p3/profile3.profile");

-		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p5/profile5.profile");

-

-		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.di", true);

-		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.uml", true);

-		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p3/profile3.profile.uml", true);

-		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p5/profile5.profile.uml", true);

-

-		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);

-		ModelSet newModelSet = null;

-

-		try {

-			// The modelset doesn't have any reference to the target profile

-			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));

-

-			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// Before the transformation, stereotypes from the source profile must be applied

-			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);

-

-			final BasicDiagnostic diagnostics = new BasicDiagnostic();

-

-			// Execute the transformation

-			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {

-

-				@Override

-				protected void doExecute() {

-					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, diagnostics, null);

-				}

-

-			});

-

-			// After the transformation, stereotypes from the target profile must be applied

-			checkAppliedProfileAndMissingDefinitions(modelSet, rootModel, targetProfileURI, diagnostics);

-

-			// Save, reload, and check again

-			modelSet.save(new NullProgressMonitor());

-

-			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);

-

-			Assert.assertNull("The modelset should not have references to the source library", newModelSet.getResource(sourceProfileURI, false));

-

-			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());

-

-			// After the transformation + reload, stereotypes from the target profile must be applied

-			checkAppliedProfileAndMissingDefinitions(modelSet, rootModel, targetProfileURI, diagnostics);

-		} finally {

-			// Cleanup

-			domain.dispose();

-			modelSet.unload();

-

-			if(newModelSet != null) {

-				ModelUtils.getEditingDomain(newModelSet).dispose();

-				newModelSet.unload();

-			}

-

-			project.delete(true, null);

-		}

-	}

-

-	private void checkAppliedProfileAndMissingDefinitions(ModelSet modelSet, Model rootModel, URI expectedProfileURI, Diagnostic diagnostics) throws Exception {

-		Profile expectedProfile = UMLUtil.load(modelSet, expectedProfileURI, UMLPackage.eINSTANCE.getProfile());

-

-		Assert.assertEquals(expectedProfile, rootModel.getAppliedProfiles().get(0));

-

-		// We have reported problems

-		Assert.assertNotNull(diagnostics.getChildren());

-		Assert.assertNotEquals(0, diagnostics.getChildren().size());

-

-		// The resource has no unrecognized schema content

-		Assert.assertTrue(((XMLResource)rootModel.eResource()).getEObjectToExtensionMap().isEmpty());

-

-		NamedElement class1 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class1").iterator().next();

-		NamedElement class2 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class2").iterator().next();

-		NamedElement class3 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class3").iterator().next();

-

-		Stereotype stereotype1 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype1").iterator().next();

-		Stereotype stereotype2 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype2").iterator().next();

-

-		Assert.assertTrue(class1.isStereotypeApplied(stereotype1));

-		EObject application = class1.getStereotypeApplication(stereotype1);

-		Assert.assertNull(application.eClass().getEStructuralFeature("Attribute1"));

-

-		Assert.assertTrue(class2.isStereotypeApplied(stereotype2));

-		application = class2.getStereotypeApplication(stereotype2);

-		Assert.assertNull(application.eClass().getEStructuralFeature("operation"));

-

-		Assert.assertTrue(class3.getAppliedStereotypes().isEmpty());

-	}

-

-	// Switch from a library to an un-existing resource

-	@Ignore("Todo")

-	@Test

-	public void testSwitchToProxy() throws Exception {

-		// TODO

-	}

-

-	// Switch from a proxy to a library

-	@Ignore("Todo")

-	@Test

-	public void testSwitchFromProxy() throws Exception {

-		// TODO

-	}

-

-	// Switch from a library to a modified copy of this library

-	@Ignore("Todo")

-	@Test

-	public void testSwitchToDifferentVersion() throws Exception {

-		// TODO

-	}

-

-	@Override

-	protected String getSourcePath() {

-		return SOURCE_PATH;

-	}

-

-	@Override

-	protected Bundle getBundle() {

-		return Activator.getDefault().getBundle();

-	}

-}

+/*****************************************************************************
+ * 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 408491
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.tools.tests.tests;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.emf.resource.DependencyManagementHelper;
+import org.eclipse.papyrus.infra.emf.resource.DependencyManager;
+import org.eclipse.papyrus.junit.utils.ModelUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.tools.tests.Activator;
+import org.eclipse.uml2.common.util.UML2Util;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * Test case for DependencyManagementHelper
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class DependencyManagementTest extends AbstractEditorTest {
+
+	public final static String SOURCE_PATH = "resources/dependencyManagement/";
+
+	// Switch from a library to a copy
+	@Test
+	public void testSimpleSwitch() throws Exception {
+		// Create the project will 2 libraries and a client
+		IProject project = ProjectUtils.createProject("dependencyManagement.simpleSwitch");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "model");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "library");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "copy-of-library");
+
+		// Retrieve the URIs of each model
+		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/model.di", true);
+		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/model.uml", true);
+		final URI sourceLibraryURI = URI.createPlatformResourceURI(project.getName() + "/library.uml", true);
+		final URI targetLibraryURI = URI.createPlatformResourceURI(project.getName() + "/copy-of-library.uml", true);
+
+		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);
+
+		// The modelset doesn't have any reference to the target library
+		Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetLibraryURI, false));
+
+		domain.getCommandStack().execute(new RecordingCommand(domain, "Edit model dependencies") {
+
+			@Override
+			protected void doExecute() {
+				DependencyManagementHelper.updateDependencies(sourceLibraryURI, targetLibraryURI, modelSet, domain);
+			}
+		});
+
+		EcoreUtil.resolveAll(modelSet);
+		// The modelset now has some references to the target library
+		Assert.assertNotNull("The modelset should have references to the target library", modelSet.getResource(targetLibraryURI, false));
+
+		modelSet.save(new NullProgressMonitor());
+
+		//
+		// Reload
+		//
+		ModelSet reloadedModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+
+		// The reloaded modelset must have some references to the target library
+		Resource clientModelResource = reloadedModelSet.getResource(clientModelURI, false);
+		Assert.assertNotNull("The modelset should have references to the target library", clientModelResource);
+
+		// The reloaded modelset doesn't have any reference to the source library
+		Assert.assertNull("The modelset should not have references to the source library", reloadedModelSet.getResource(sourceLibraryURI, false));
+
+		domain.dispose();
+		modelSet.unload();
+
+		ModelUtils.getEditingDomain(reloadedModelSet).dispose();
+		reloadedModelSet.unload();
+
+		project.delete(true, null);
+	}
+
+	// Switch from a registered library to a local one
+	@Test
+	public void testSwitchFromRegistererdToLocal() throws Exception {
+		// Create the project will 2 libraries and a client
+		IProject project = ProjectUtils.createProject("dependencyManagement.SwitchFromRegistererdToLocal");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "model-with-registered");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "library");
+
+		// Retrieve the URIs of each model
+		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/model-with-registered.di", true);
+		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/model-with-registered.uml", true);
+		final URI sourceLibraryURI = URI.createURI("pathmap://UML_TEST_LIBRARIES/registered-library.uml", true);
+		final URI targetLibraryURI = URI.createPlatformResourceURI(project.getName() + "/library.uml", true);
+
+		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);
+
+		// The modelset doesn't have any reference to the target library
+		Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetLibraryURI, false));
+
+		domain.getCommandStack().execute(new RecordingCommand(domain, "Edit model dependencies") {
+
+			@Override
+			protected void doExecute() {
+				DependencyManagementHelper.updateDependencies(sourceLibraryURI, targetLibraryURI, modelSet, domain);
+			}
+		});
+
+
+		EcoreUtil.resolveAll(modelSet);
+		// The modelset now has some references to the target library
+		Assert.assertNotNull("The modelset should have references to the target library", modelSet.getResource(targetLibraryURI, false));
+
+
+		modelSet.save(new NullProgressMonitor());
+
+		//
+		// Reload
+		//
+		ModelSet reloadedModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+
+		// The reloaded modelset must have some references to the target library
+		Resource clientModelResource = reloadedModelSet.getResource(clientModelURI, false);
+		Assert.assertNotNull("The modelset should have references to the target library", clientModelResource);
+
+		// The reloaded modelset doesn't have any reference to the source library
+		Assert.assertNull("The modelset should not have references to the source library", reloadedModelSet.getResource(sourceLibraryURI, false));
+
+		domain.dispose();
+		modelSet.unload();
+
+		ModelUtils.getEditingDomain(reloadedModelSet).dispose();
+		reloadedModelSet.unload();
+
+		project.delete(true, null);
+	}
+
+	// Switch from a registered library to a local one
+	@Test
+	public void testSwitchFromLocalToRegistered() throws Exception {
+		// Create the project will 2 libraries and a client
+		IProject project = ProjectUtils.createProject("dependencyManagement.simpleSwitch");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "model");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "library");
+
+		// Retrieve the URIs of each model
+		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/model.di", true);
+		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/model.uml", true);
+		final URI sourceLibraryURI = URI.createPlatformResourceURI(project.getName() + "/library.uml", true);
+		final URI targetLibraryURI = URI.createPlatformResourceURI("pathmap://UML_TEST_LIBRARIES/registered-library.uml", true);
+
+		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);
+
+		// The modelset doesn't have any reference to the target library
+		Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetLibraryURI, false));
+
+		domain.getCommandStack().execute(new RecordingCommand(domain, "Edit model dependencies") {
+
+			@Override
+			protected void doExecute() {
+				DependencyManagementHelper.updateDependencies(sourceLibraryURI, targetLibraryURI, modelSet, domain);
+			}
+		});
+
+
+		EcoreUtil.resolveAll(modelSet);
+		// The modelset now has some references to the target library
+		Assert.assertNotNull("The modelset should have references to the target library", modelSet.getResource(targetLibraryURI, false));
+
+
+		modelSet.save(new NullProgressMonitor());
+
+
+		//
+		// Reload
+		//
+
+		ModelSet reloadedModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+
+		// The reloaded modelset must have some references to the target library
+		Resource clientModelResource = reloadedModelSet.getResource(clientModelURI, false);
+		Assert.assertNotNull("The modelset should have references to the target library", clientModelResource);
+
+		// The reloaded modelset doesn't have any reference to the source library
+		Assert.assertNull("The modelset should not have references to the source library", reloadedModelSet.getResource(sourceLibraryURI, false));
+
+		domain.dispose();
+		modelSet.unload();
+
+		ModelUtils.getEditingDomain(reloadedModelSet).dispose();
+		reloadedModelSet.unload();
+
+		project.delete(true, null);
+	}
+
+
+
+	// Switch from two different versions of a profile
+	@Test
+	public void testSwitchProfilesWithStereotypes() throws Exception {
+		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p1/profile1.profile");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p2/profile2.profile");
+
+		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model.di", true);
+		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model.uml", true);
+		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p1/profile1.profile.uml", true);
+		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p2/profile2.profile.uml", true);
+
+		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);
+		ModelSet newModelSet = null;
+
+		try {
+			// The modelset doesn't have any reference to the target profile
+			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));
+
+			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// Before the transformation, stereotypes from the source profile must be applied
+			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);
+
+			// Execute the transformation
+			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {
+
+				@Override
+				protected void doExecute() {
+					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, null, null);
+				}
+
+			});
+
+			// After the transformation, stereotypes from the target profile must be applied
+			checkAppliedProfileAndStereotypes(modelSet, rootModel, targetProfileURI);
+
+			// Save, reload, and check again
+			modelSet.save(new NullProgressMonitor());
+
+			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+
+			Assert.assertNull("The modelset should not have references to the source library", newModelSet.getResource(sourceProfileURI, false));
+
+			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// After the transformation + reload, stereotypes from the target profile must be applied
+			checkAppliedProfileAndStereotypes(modelSet, rootModel, targetProfileURI);
+		} finally {
+			// Cleanup
+			domain.dispose();
+			modelSet.unload();
+
+			if(newModelSet != null) {
+				ModelUtils.getEditingDomain(newModelSet).dispose();
+				newModelSet.unload();
+			}
+
+			project.delete(true, null);
+		}
+	}
+
+	private void checkAppliedProfileAndStereotypes(ModelSet modelSet, Model rootModel, URI expectedProfileURI) throws Exception {
+		Profile expectedProfile = UMLUtil.load(modelSet, expectedProfileURI, UMLPackage.eINSTANCE.getProfile());
+
+		Assert.assertEquals(expectedProfile, rootModel.getAppliedProfiles().get(0));
+
+		NamedElement class1 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class1").iterator().next();
+		NamedElement class2 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class2").iterator().next();
+		NamedElement class3 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class3").iterator().next();
+
+		NamedElement stereotype1 = UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype1").iterator().next();
+		NamedElement stereotype2 = UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype2").iterator().next();
+		NamedElement stereotype3 = UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype3").iterator().next();
+
+		Assert.assertEquals(stereotype1, class1.getAppliedStereotype("Profile::Stereotype1"));
+		Assert.assertEquals(stereotype2, class2.getAppliedStereotype("Profile::Stereotype2"));
+		Assert.assertEquals(stereotype3, class3.getAppliedStereotype("Profile::Stereotype3"));
+	}
+
+	// Switch from two different versions of a profile, verifying properties
+	@Test
+	public void testSwitchProfilesWithStereotypeProperties() throws Exception {
+		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model2");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p3/profile3.profile");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p4/profile4.profile");
+
+		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.di", true);
+		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.uml", true);
+		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p3/profile3.profile.uml", true);
+		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p4/profile4.profile.uml", true);
+
+		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);
+		ModelSet newModelSet = null;
+
+		try {
+			// The modelset doesn't have any reference to the target profile
+			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));
+
+			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// Before the transformation, stereotypes from the source profile must be applied
+			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);
+
+			// Execute the transformation
+			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {
+
+				@Override
+				protected void doExecute() {
+					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, null, null);
+				}
+
+			});
+
+			// After the transformation, stereotypes from the target profile must be applied
+			checkAppliedProfileAndStereotypeProperties(modelSet, rootModel, targetProfileURI);
+
+			// Save, reload, and check again
+			modelSet.save(new NullProgressMonitor());
+
+			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+
+			Assert.assertNull("The modelset should not have references to the source library", newModelSet.getResource(sourceProfileURI, false));
+
+			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// After the transformation + reload, stereotypes from the target profile must be applied
+			checkAppliedProfileAndStereotypeProperties(modelSet, rootModel, targetProfileURI);
+		} finally {
+			// Cleanup
+			domain.dispose();
+			modelSet.unload();
+
+			if(newModelSet != null) {
+				ModelUtils.getEditingDomain(newModelSet).dispose();
+				newModelSet.unload();
+			}
+
+			project.delete(true, null);
+		}
+	}
+
+	// Verify that stereotype applications that can be retargeted to the new profile retain their identities
+	@Test
+	public void testSwitchProfilesStereotypeIdentities() throws Exception {
+		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model2");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p3/profile3.profile");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p4/profile4.profile");
+
+		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.di", true);
+		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.uml", true);
+		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p3/profile3.profile.uml", true);
+		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p4/profile4.profile.uml", true);
+
+		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);
+		ModelSet newModelSet = null;
+
+		try {
+			// The modelset doesn't have any reference to the target profile
+			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));
+
+			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// Gather the identities of stereotype instances
+			Map<String, EObject> idsToStereotypeInstances = new HashMap<String, EObject>();
+			XMLResource xml = (XMLResource)rootModel.eResource();
+			for(TreeIterator<EObject> iter = xml.getAllContents(); iter.hasNext();) {
+				EObject next = iter.next();
+				if(!(next instanceof Element)) {
+					iter.prune();
+				} else {
+					for(EObject stereo : ((Element)next).getStereotypeApplications()) {
+						idsToStereotypeInstances.put(xml.getID(stereo), stereo);
+					}
+				}
+			}
+
+			// Before the transformation, stereotypes from the source profile must be applied
+			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);
+
+			// Execute the transformation
+			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {
+
+				@Override
+				protected void doExecute() {
+					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, null, null);
+				}
+
+			});
+
+			// Save, reload, and check IDs
+			modelSet.save(new NullProgressMonitor());
+
+			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+
+			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// All of the stereotype instances must have existed before
+			xml = (XMLResource)rootModel.eResource();
+			for(TreeIterator<EObject> iter = xml.getAllContents(); iter.hasNext();) {
+				EObject next = iter.next();
+				if(!(next instanceof Element)) {
+					iter.prune();
+				} else {
+					Element element = (Element)next;
+					for(Stereotype stereo : element.getAppliedStereotypes()) {
+						// The required stereotypes were added in the new profile definition, so they couldn't have been applied before
+						if(!element.isStereotypeRequired(stereo)) {
+							EObject application = element.getStereotypeApplication(stereo);
+							EObject original = idsToStereotypeInstances.remove(xml.getID(application));
+							Assert.assertNotNull("Stereotype instance has a new identity", original);
+							Assert.assertEquals("Stereotype instance has wrong identity", UML2Util.getQualifiedName(original.eClass(), "::"), UML2Util.getQualifiedName(application.eClass(), "::"));
+						}
+					}
+				}
+			}
+
+		} finally {
+			// Cleanup
+			domain.dispose();
+			modelSet.unload();
+
+			if(newModelSet != null) {
+				ModelUtils.getEditingDomain(newModelSet).dispose();
+				newModelSet.unload();
+			}
+
+			project.delete(true, null);
+		}
+	}
+
+	private void checkAppliedProfileAndStereotypeProperties(ModelSet modelSet, Model rootModel, URI expectedProfileURI) throws Exception {
+		Profile expectedProfile = UMLUtil.load(modelSet, expectedProfileURI, UMLPackage.eINSTANCE.getProfile());
+
+		Assert.assertEquals(expectedProfile, rootModel.getAppliedProfiles().get(0));
+
+		NamedElement class1 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class1").iterator().next();
+		NamedElement class2 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class2").iterator().next();
+
+		Stereotype stereotype1 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype1").iterator().next();
+		Stereotype stereotype2 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype2").iterator().next();
+
+		EnumerationLiteral attribute1 = (EnumerationLiteral)class1.getValue(stereotype1, "Attribute1");
+		Assert.assertNotNull(attribute1);
+		Assert.assertEquals("EnumerationLiteral3", attribute1.getName());
+
+		Operation operation = (Operation)class2.getValue(stereotype2, "operation");
+		Assert.assertNotNull(operation);
+		Assert.assertEquals("Operation1", operation.getName());
+		Assert.assertSame(class2, operation.getNamespace());
+	}
+
+	// Switch from two different versions of a profile, verifying that new required stereotypes are applied
+	@Test
+	public void testSwitchProfilesWithRequiredStereotypes() throws Exception {
+		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model2");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p3/profile3.profile");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p4/profile4.profile");
+
+		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.di", true);
+		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.uml", true);
+		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p3/profile3.profile.uml", true);
+		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p4/profile4.profile.uml", true);
+
+		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);
+		ModelSet newModelSet = null;
+
+		try {
+			// The modelset doesn't have any reference to the target profile
+			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));
+
+			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// Before the transformation, stereotypes from the source profile must be applied
+			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);
+
+			// Execute the transformation
+			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {
+
+				@Override
+				protected void doExecute() {
+					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, null, null);
+				}
+
+			});
+
+			// After the transformation, stereotypes from the target profile must be applied
+			checkAppliedProfileAndRequiredStereotypes(modelSet, rootModel, targetProfileURI);
+
+			// Save, reload, and check again
+			modelSet.save(new NullProgressMonitor());
+
+			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+
+			Assert.assertNull("The modelset should not have references to the source library", newModelSet.getResource(sourceProfileURI, false));
+
+			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// After the transformation + reload, stereotypes from the target profile must be applied
+			checkAppliedProfileAndStereotypeProperties(modelSet, rootModel, targetProfileURI);
+		} finally {
+			// Cleanup
+			domain.dispose();
+			modelSet.unload();
+
+			if(newModelSet != null) {
+				ModelUtils.getEditingDomain(newModelSet).dispose();
+				newModelSet.unload();
+			}
+
+			project.delete(true, null);
+		}
+	}
+
+	private void checkAppliedProfileAndRequiredStereotypes(ModelSet modelSet, Model rootModel, URI expectedProfileURI) throws Exception {
+		Profile expectedProfile = UMLUtil.load(modelSet, expectedProfileURI, UMLPackage.eINSTANCE.getProfile());
+
+		Assert.assertEquals(expectedProfile, rootModel.getAppliedProfiles().get(0));
+
+		NamedElement class1 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class1").iterator().next();
+		NamedElement class2 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class2").iterator().next();
+		NamedElement class3 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class3").iterator().next();
+
+		Stereotype stereotype4 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype4").iterator().next();
+
+		Assert.assertTrue(class1.isStereotypeApplied(stereotype4));
+		Assert.assertTrue(class2.isStereotypeApplied(stereotype4));
+		Assert.assertTrue(class3.isStereotypeApplied(stereotype4));
+	}
+
+	// Switch from two different versions of a profile, verifying that missing definitions are handled correctly
+	@Test
+	public void testSwitchProfilesWithMissingDefinitions() throws Exception {
+		IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model2");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p3/profile3.profile");
+		PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p5/profile5.profile");
+
+		final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.di", true);
+		final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.uml", true);
+		final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p3/profile3.profile.uml", true);
+		final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p5/profile5.profile.uml", true);
+
+		final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);
+		ModelSet newModelSet = null;
+
+		try {
+			// The modelset doesn't have any reference to the target profile
+			Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));
+
+			Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// Before the transformation, stereotypes from the source profile must be applied
+			checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);
+
+			final BasicDiagnostic diagnostics = new BasicDiagnostic();
+
+			// Execute the transformation
+			domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {
+
+				@Override
+				protected void doExecute() {
+					new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, diagnostics, null);
+				}
+
+			});
+
+			// After the transformation, stereotypes from the target profile must be applied
+			checkAppliedProfileAndMissingDefinitions(modelSet, rootModel, targetProfileURI, diagnostics);
+
+			// Save, reload, and check again
+			modelSet.save(new NullProgressMonitor());
+
+			newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+
+			Assert.assertNull("The modelset should not have references to the source library", newModelSet.getResource(sourceProfileURI, false));
+
+			rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+			// After the transformation + reload, stereotypes from the target profile must be applied
+			checkAppliedProfileAndMissingDefinitions(modelSet, rootModel, targetProfileURI, diagnostics);
+		} finally {
+			// Cleanup
+			domain.dispose();
+			modelSet.unload();
+
+			if(newModelSet != null) {
+				ModelUtils.getEditingDomain(newModelSet).dispose();
+				newModelSet.unload();
+			}
+
+			project.delete(true, null);
+		}
+	}
+
+	private void checkAppliedProfileAndMissingDefinitions(ModelSet modelSet, Model rootModel, URI expectedProfileURI, Diagnostic diagnostics) throws Exception {
+		Profile expectedProfile = UMLUtil.load(modelSet, expectedProfileURI, UMLPackage.eINSTANCE.getProfile());
+
+		Assert.assertEquals(expectedProfile, rootModel.getAppliedProfiles().get(0));
+
+		// We have reported problems
+		Assert.assertNotNull(diagnostics.getChildren());
+		Assert.assertNotEquals(0, diagnostics.getChildren().size());
+
+		// The resource has no unrecognized schema content
+		Assert.assertTrue(((XMLResource)rootModel.eResource()).getEObjectToExtensionMap().isEmpty());
+
+		NamedElement class1 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class1").iterator().next();
+		NamedElement class2 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class2").iterator().next();
+		NamedElement class3 = UMLUtil.findNamedElements(rootModel.eResource(), "model::Class3").iterator().next();
+
+		Stereotype stereotype1 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype1").iterator().next();
+		Stereotype stereotype2 = (Stereotype)UMLUtil.findNamedElements(expectedProfile.eResource(), "Profile::Stereotype2").iterator().next();
+
+		Assert.assertTrue(class1.isStereotypeApplied(stereotype1));
+		EObject application = class1.getStereotypeApplication(stereotype1);
+		Assert.assertNull(application.eClass().getEStructuralFeature("Attribute1"));
+
+		Assert.assertTrue(class2.isStereotypeApplied(stereotype2));
+		application = class2.getStereotypeApplication(stereotype2);
+		Assert.assertNull(application.eClass().getEStructuralFeature("operation"));
+
+		Assert.assertTrue(class3.getAppliedStereotypes().isEmpty());
+	}
+
+	// Switch from a library to an un-existing resource
+	@Ignore("Todo")
+	@Test
+	public void testSwitchToProxy() throws Exception {
+		// TODO
+	}
+
+	// Switch from a proxy to a library
+	@Ignore("Todo")
+	@Test
+	public void testSwitchFromProxy() throws Exception {
+		// TODO
+	}
+
+	// Switch from a library to a modified copy of this library
+	@Ignore("Todo")
+	@Test
+	public void testSwitchToDifferentVersion() throws Exception {
+		// TODO
+	}
+
+	@Override
+	protected String getSourcePath() {
+		return SOURCE_PATH;
+	}
+
+	@Override
+	protected Bundle getBundle() {
+		return Activator.getDefault().getBundle();
+	}
+}
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/UMLContentProviderTest.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/UMLContentProviderTest.java
index a1d3fe31485..b0a5e29ad0e 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/UMLContentProviderTest.java
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/UMLContentProviderTest.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.uml.tools.tests.tests;

-

-//TODO : Test UML-specific elements (RevealElement for external resources, ...)

-public class UMLContentProviderTest {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.tools.tests.tests;
+
+//TODO : Test UML-specific elements (RevealElement for external resources, ...)
+public class UMLContentProviderTest {
+
+}
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/UMLStereotypePropertyContentProviderTest.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/UMLStereotypePropertyContentProviderTest.java
index da78ed3d4ea..c705f91574f 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/UMLStereotypePropertyContentProviderTest.java
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/UMLStereotypePropertyContentProviderTest.java
@@ -1,383 +1,383 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.tests.tests;

-

-import static org.junit.Assert.assertNotNull;

-

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.eclipse.papyrus.uml.tools.providers.UMLStereotypePropertyContentProvider;

-import org.eclipse.papyrus.uml.tools.tests.Activator;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * This class tests the class UMLStereotypePropertyContentProvider.

- * <ul>

- * <li>tests the returned children according to the boolean baseProperty</li>

- * <li>verifies that the returned children don't contains the inherited properties</li>

- * </ul>

- *

- * @author Vincent Lorenzo

- *

- */

-public class UMLStereotypePropertyContentProviderTest extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-	

-	/** the root profile of the tested model */

-	private Profile rootProfile;

-

-	/** the two subprofile */

-	private Profile subProfile1;

-

-	private Profile subProfile2;

-

-	/** the stereotypes owned by these subprofiles */

-	private Stereotype ste1;

-

-	private Stereotype ste2;

-

-	/** the properties owned by these stereotypes */

-	private Property prop1;

-

-	private Property prop2;

-

-	/** the base properties of these stereotypes */

-	private Property basePropSte1;

-

-	private Property basePropSte2;

-

-	/**

-	 * Inits the fields of this class

-	 */

-	@Before

-	public void init() {

-		try {

-			EObject testModel = EMFHelper.loadEMFModel(houseKeeper.createResourceSet(), URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/uml/profileTest.profile.uml", true)); //$NON-NLS-1$

-			Assert.assertTrue(testModel instanceof Profile);

-			rootProfile = (Profile)testModel;

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-		}

-		assertNotNull("Cannot load the EMF Tests model", rootProfile); //$NON-NLS-1$

-

-		subProfile1 = (Profile)rootProfile.getPackagedElement("Profile1"); //$NON-NLS-1$

-		subProfile2 = (Profile)rootProfile.getPackagedElement("Profile2"); //$NON-NLS-1$

-

-		Assert.assertNotNull(subProfile1);

-		Assert.assertNotNull(subProfile2);

-

-		ste1 = (Stereotype)subProfile1.getMember("Stereotype1"); //$NON-NLS-1$

-		ste2 = (Stereotype)subProfile2.getMember("Stereotype2"); //$NON-NLS-1$

-

-		Assert.assertNotNull(ste1);

-		Assert.assertNotNull(ste2);

-

-		prop1 = (Property)ste1.getMember("prop1"); //$NON-NLS-1$

-		prop2 = (Property)ste2.getMember("prop2"); //$NON-NLS-1$

-

-		Assert.assertNotNull(prop1);

-		Assert.assertNotNull(prop2);

-

-		basePropSte1 = (Property)ste1.getMember("base_Activity"); //$NON-NLS-1$

-		basePropSte2 = (Property)ste2.getMember("base_Class"); //$NON-NLS-1$

-

-		Assert.assertNotNull(basePropSte1);

-		Assert.assertNotNull(basePropSte2);

-

-	}

-

-	/**

-	 * We test the children of the rootProfile.

-	 * In this test,

-	 * <ul>

-	 * <li>we don't want the properties base_ExtendedClass</li>

-	 * <li>we don't want the inheritedProperties</li>

-	 * </ul>

-	 */

-	@Test

-	public void testProfileContentWithoutBaseClassPropertyWithoutInheritedProperties() {

-		UMLStereotypePropertyContentProvider provider = new UMLStereotypePropertyContentProvider();

-		provider.setIgnoreBaseProperty(true);

-		provider.setIgnoreInheritedElements(true);

-		provider.setProfiles(Collections.singletonList(rootProfile));

-		//we test the root

-		Object[] elements = provider.getElements();

-		Assert.assertEquals(1, elements.length);

-		Assert.assertEquals(elements[0], rootProfile);

-

-		//we test the first level of children

-		Assert.assertEquals(true, provider.hasChildren(rootProfile));

-		List<?> children = Arrays.asList(provider.getChildren(rootProfile));

-

-		Assert.assertEquals(2, children.size());

-		Assert.assertTrue(children.contains(subProfile1));

-		Assert.assertTrue(children.contains(subProfile2));

-

-

-		//we test the children of the first subprofile

-		Assert.assertEquals(true, provider.hasChildren(subProfile1));

-		children = Arrays.asList(provider.getChildren(subProfile1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(ste1));

-

-		//we test the children of the ste1

-		Assert.assertEquals(true, provider.hasChildren(ste1));

-		children = Arrays.asList(provider.getChildren(ste1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(prop1));

-

-		//we test the children of the prop1

-		Assert.assertEquals(false, provider.hasChildren(prop1));

-

-

-		//we test the children of the 2nd subprofile

-		Assert.assertEquals(true, provider.hasChildren(subProfile2));

-		children = Arrays.asList(provider.getChildren(subProfile2));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(ste2));

-

-		//we test the children of the ste2

-		Assert.assertEquals(true, provider.hasChildren(ste2));

-		children = Arrays.asList(provider.getChildren(ste2));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(prop2));

-

-		//we test the children of the prop2

-		Assert.assertEquals(false, provider.hasChildren(prop2));

-	}

-

-	/**

-	 * We test the children of the rootProfile.

-	 * In this test,

-	 * <ul>

-	 * <li>we want the properties base_ExtendedClass</li>

-	 * <li>we don't want the inheritedProperties</li>

-	 * </ul>

-	 */

-	@Test

-	public void testProfileContentWithBaseClassPropertyWithoutInheritedProperties() {

-		UMLStereotypePropertyContentProvider provider = new UMLStereotypePropertyContentProvider();

-		provider.setIgnoreBaseProperty(false);

-		provider.setIgnoreInheritedElements(true);

-		provider.setProfiles(Collections.singletonList(rootProfile));

-		//we test the root

-		Object[] elements = provider.getElements();

-		Assert.assertEquals(1, elements.length);

-		Assert.assertEquals(elements[0], rootProfile);

-

-		//we test the first level of children

-		Assert.assertEquals(true, provider.hasChildren(rootProfile));

-		List<?> children = Arrays.asList(provider.getChildren(rootProfile));

-

-		Assert.assertEquals(2, children.size());

-		Assert.assertTrue(children.contains(subProfile1));

-		Assert.assertTrue(children.contains(subProfile2));

-

-

-		//we test the children of the first subprofile

-		Assert.assertEquals(true, provider.hasChildren(subProfile1));

-		children = Arrays.asList(provider.getChildren(subProfile1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(ste1));

-

-		//we test the children of the ste1

-		Assert.assertEquals(true, provider.hasChildren(ste1));

-		children = Arrays.asList(provider.getChildren(ste1));

-		Assert.assertEquals(2, children.size());

-		Assert.assertTrue(children.contains(prop1));

-		Assert.assertTrue(children.contains(basePropSte1));

-

-		//we test the children of the prop1

-		Assert.assertEquals(false, provider.hasChildren(prop1));

-

-

-		//we test the children of the 2nd subprofile

-		Assert.assertEquals(true, provider.hasChildren(subProfile2));

-		children = Arrays.asList(provider.getChildren(subProfile2));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(ste2));

-

-		//we test the children of the ste2

-		Assert.assertEquals(true, provider.hasChildren(ste2));

-		children = Arrays.asList(provider.getChildren(ste2));

-		Assert.assertEquals(2, children.size());

-		Assert.assertTrue(children.contains(prop2));

-		Assert.assertTrue(children.contains(basePropSte2));

-

-		//we test the children of the prop2

-		Assert.assertEquals(false, provider.hasChildren(prop2));

-	}

-

-

-	/**

-	 * We test the children of the rootProfile.

-	 * In this test,

-	 * <ul>

-	 * <li>we don't want the properties base_ExtendedClass</li>

-	 * <li>we want the inheritedProperties</li>

-	 * </ul>

-	 */

-	@Test

-	public void testProfileContentWithoutBaseClassPropertyWithInheritedProperties() {

-		UMLStereotypePropertyContentProvider provider = new UMLStereotypePropertyContentProvider();

-		provider.setIgnoreBaseProperty(true);

-		provider.setIgnoreInheritedElements(false);

-		provider.setProfiles(Collections.singletonList(rootProfile));

-		//we test the root

-		Object[] elements = provider.getElements();

-		Assert.assertEquals(1, elements.length);

-		Assert.assertEquals(elements[0], rootProfile);

-

-		//we test the first level of children

-		Assert.assertEquals(true, provider.hasChildren(rootProfile));

-		List<?> children = Arrays.asList(provider.getChildren(rootProfile));

-

-		Assert.assertEquals(2, children.size());

-		Assert.assertTrue(children.contains(subProfile1));

-		Assert.assertTrue(children.contains(subProfile2));

-

-

-		//we test the children of the first subprofile

-		Assert.assertEquals(true, provider.hasChildren(subProfile1));

-		children = Arrays.asList(provider.getChildren(subProfile1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(ste1));

-

-		//we test the children of the ste1

-		Assert.assertEquals(true, provider.hasChildren(ste1));

-		children = Arrays.asList(provider.getChildren(ste1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(prop1));

-

-		//we test the children of the prop1

-		Assert.assertEquals(false, provider.hasChildren(prop1));

-

-

-		//we test the children of the 2nd subprofile

-		Assert.assertEquals(true, provider.hasChildren(subProfile2));

-		children = Arrays.asList(provider.getChildren(subProfile2));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(ste2));

-

-		//we test the children of the ste2

-		Assert.assertEquals(true, provider.hasChildren(ste2));

-		children = Arrays.asList(provider.getChildren(ste2));

-		Assert.assertEquals(2, children.size());

-		Assert.assertTrue(children.contains(prop2));

-		Assert.assertTrue(children.contains(prop1));

-

-		//we test the children of the prop2

-		Assert.assertEquals(false, provider.hasChildren(prop2));

-	}

-

-	/**

-	 * We test the children of the rootProfile.

-	 * In this test,

-	 * <ul>

-	 * <li>we want the properties base_ExtendedClass</li>

-	 * <li>we want the inheritedProperties</li>

-	 * </ul>

-	 */

-	@Test

-	public void testProfileContentWithBaseClassPropertyWithInheritedProperties() {

-		UMLStereotypePropertyContentProvider provider = new UMLStereotypePropertyContentProvider();

-		provider.setIgnoreBaseProperty(false);

-		provider.setIgnoreInheritedElements(false);

-		provider.setProfiles(Collections.singletonList(rootProfile));

-		//we test the root

-		Object[] elements = provider.getElements();

-		Assert.assertEquals(1, elements.length);

-		Assert.assertEquals(elements[0], rootProfile);

-

-		//we test the first level of children

-		Assert.assertEquals(true, provider.hasChildren(rootProfile));

-		List<?> children = Arrays.asList(provider.getChildren(rootProfile));

-

-		Assert.assertEquals(2, children.size());

-		Assert.assertTrue(children.contains(subProfile1));

-		Assert.assertTrue(children.contains(subProfile2));

-

-

-		//we test the children of the first subprofile

-		Assert.assertEquals(true, provider.hasChildren(subProfile1));

-		children = Arrays.asList(provider.getChildren(subProfile1));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(ste1));

-

-		//we test the children of the ste1

-		Assert.assertEquals(true, provider.hasChildren(ste1));

-		children = Arrays.asList(provider.getChildren(ste1));

-		Assert.assertEquals(2, children.size());

-		Assert.assertTrue(children.contains(prop1));

-		Assert.assertTrue(children.contains(basePropSte1));

-

-		//we test the children of the prop1

-		Assert.assertEquals(false, provider.hasChildren(prop1));

-

-

-		//we test the children of the 2nd subprofile

-		Assert.assertEquals(true, provider.hasChildren(subProfile2));

-		children = Arrays.asList(provider.getChildren(subProfile2));

-		Assert.assertEquals(1, children.size());

-		Assert.assertTrue(children.contains(ste2));

-

-		//we test the children of the ste2

-		Assert.assertEquals(true, provider.hasChildren(ste2));

-		children = Arrays.asList(provider.getChildren(ste2));

-		Assert.assertEquals(4, children.size());

-		Assert.assertTrue(children.contains(prop2));

-		Assert.assertTrue(children.contains(basePropSte2));

-		Assert.assertTrue(children.contains(basePropSte1));

-		Assert.assertTrue(children.contains(prop1));

-

-		//we test the children of the prop2

-		Assert.assertEquals(false, provider.hasChildren(prop2));

-	}

-

-

-	/**

-	 *

-	 */

-	@After

-	public void enfOfTests() {

-		rootProfile = null;

-		subProfile1 = null;

-		ste1 = null;

-		prop1 = null;

-		basePropSte1 = null;

-		subProfile2 = null;

-		ste2 = null;

-		prop2 = null;

-		basePropSte2 = null;

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.tools.tests.tests;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.tools.providers.UMLStereotypePropertyContentProvider;
+import org.eclipse.papyrus.uml.tools.tests.Activator;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * This class tests the class UMLStereotypePropertyContentProvider.
+ * <ul>
+ * <li>tests the returned children according to the boolean baseProperty</li>
+ * <li>verifies that the returned children don't contains the inherited properties</li>
+ * </ul>
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class UMLStereotypePropertyContentProviderTest extends AbstractPapyrusTest {
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+	
+	/** the root profile of the tested model */
+	private Profile rootProfile;
+
+	/** the two subprofile */
+	private Profile subProfile1;
+
+	private Profile subProfile2;
+
+	/** the stereotypes owned by these subprofiles */
+	private Stereotype ste1;
+
+	private Stereotype ste2;
+
+	/** the properties owned by these stereotypes */
+	private Property prop1;
+
+	private Property prop2;
+
+	/** the base properties of these stereotypes */
+	private Property basePropSte1;
+
+	private Property basePropSte2;
+
+	/**
+	 * Inits the fields of this class
+	 */
+	@Before
+	public void init() {
+		try {
+			EObject testModel = EMFHelper.loadEMFModel(houseKeeper.createResourceSet(), URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/uml/profileTest.profile.uml", true)); //$NON-NLS-1$
+			Assert.assertTrue(testModel instanceof Profile);
+			rootProfile = (Profile)testModel;
+		} catch (IOException ex) {
+			Activator.log.error(ex);
+		}
+		assertNotNull("Cannot load the EMF Tests model", rootProfile); //$NON-NLS-1$
+
+		subProfile1 = (Profile)rootProfile.getPackagedElement("Profile1"); //$NON-NLS-1$
+		subProfile2 = (Profile)rootProfile.getPackagedElement("Profile2"); //$NON-NLS-1$
+
+		Assert.assertNotNull(subProfile1);
+		Assert.assertNotNull(subProfile2);
+
+		ste1 = (Stereotype)subProfile1.getMember("Stereotype1"); //$NON-NLS-1$
+		ste2 = (Stereotype)subProfile2.getMember("Stereotype2"); //$NON-NLS-1$
+
+		Assert.assertNotNull(ste1);
+		Assert.assertNotNull(ste2);
+
+		prop1 = (Property)ste1.getMember("prop1"); //$NON-NLS-1$
+		prop2 = (Property)ste2.getMember("prop2"); //$NON-NLS-1$
+
+		Assert.assertNotNull(prop1);
+		Assert.assertNotNull(prop2);
+
+		basePropSte1 = (Property)ste1.getMember("base_Activity"); //$NON-NLS-1$
+		basePropSte2 = (Property)ste2.getMember("base_Class"); //$NON-NLS-1$
+
+		Assert.assertNotNull(basePropSte1);
+		Assert.assertNotNull(basePropSte2);
+
+	}
+
+	/**
+	 * We test the children of the rootProfile.
+	 * In this test,
+	 * <ul>
+	 * <li>we don't want the properties base_ExtendedClass</li>
+	 * <li>we don't want the inheritedProperties</li>
+	 * </ul>
+	 */
+	@Test
+	public void testProfileContentWithoutBaseClassPropertyWithoutInheritedProperties() {
+		UMLStereotypePropertyContentProvider provider = new UMLStereotypePropertyContentProvider();
+		provider.setIgnoreBaseProperty(true);
+		provider.setIgnoreInheritedElements(true);
+		provider.setProfiles(Collections.singletonList(rootProfile));
+		//we test the root
+		Object[] elements = provider.getElements();
+		Assert.assertEquals(1, elements.length);
+		Assert.assertEquals(elements[0], rootProfile);
+
+		//we test the first level of children
+		Assert.assertEquals(true, provider.hasChildren(rootProfile));
+		List<?> children = Arrays.asList(provider.getChildren(rootProfile));
+
+		Assert.assertEquals(2, children.size());
+		Assert.assertTrue(children.contains(subProfile1));
+		Assert.assertTrue(children.contains(subProfile2));
+
+
+		//we test the children of the first subprofile
+		Assert.assertEquals(true, provider.hasChildren(subProfile1));
+		children = Arrays.asList(provider.getChildren(subProfile1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(ste1));
+
+		//we test the children of the ste1
+		Assert.assertEquals(true, provider.hasChildren(ste1));
+		children = Arrays.asList(provider.getChildren(ste1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(prop1));
+
+		//we test the children of the prop1
+		Assert.assertEquals(false, provider.hasChildren(prop1));
+
+
+		//we test the children of the 2nd subprofile
+		Assert.assertEquals(true, provider.hasChildren(subProfile2));
+		children = Arrays.asList(provider.getChildren(subProfile2));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(ste2));
+
+		//we test the children of the ste2
+		Assert.assertEquals(true, provider.hasChildren(ste2));
+		children = Arrays.asList(provider.getChildren(ste2));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(prop2));
+
+		//we test the children of the prop2
+		Assert.assertEquals(false, provider.hasChildren(prop2));
+	}
+
+	/**
+	 * We test the children of the rootProfile.
+	 * In this test,
+	 * <ul>
+	 * <li>we want the properties base_ExtendedClass</li>
+	 * <li>we don't want the inheritedProperties</li>
+	 * </ul>
+	 */
+	@Test
+	public void testProfileContentWithBaseClassPropertyWithoutInheritedProperties() {
+		UMLStereotypePropertyContentProvider provider = new UMLStereotypePropertyContentProvider();
+		provider.setIgnoreBaseProperty(false);
+		provider.setIgnoreInheritedElements(true);
+		provider.setProfiles(Collections.singletonList(rootProfile));
+		//we test the root
+		Object[] elements = provider.getElements();
+		Assert.assertEquals(1, elements.length);
+		Assert.assertEquals(elements[0], rootProfile);
+
+		//we test the first level of children
+		Assert.assertEquals(true, provider.hasChildren(rootProfile));
+		List<?> children = Arrays.asList(provider.getChildren(rootProfile));
+
+		Assert.assertEquals(2, children.size());
+		Assert.assertTrue(children.contains(subProfile1));
+		Assert.assertTrue(children.contains(subProfile2));
+
+
+		//we test the children of the first subprofile
+		Assert.assertEquals(true, provider.hasChildren(subProfile1));
+		children = Arrays.asList(provider.getChildren(subProfile1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(ste1));
+
+		//we test the children of the ste1
+		Assert.assertEquals(true, provider.hasChildren(ste1));
+		children = Arrays.asList(provider.getChildren(ste1));
+		Assert.assertEquals(2, children.size());
+		Assert.assertTrue(children.contains(prop1));
+		Assert.assertTrue(children.contains(basePropSte1));
+
+		//we test the children of the prop1
+		Assert.assertEquals(false, provider.hasChildren(prop1));
+
+
+		//we test the children of the 2nd subprofile
+		Assert.assertEquals(true, provider.hasChildren(subProfile2));
+		children = Arrays.asList(provider.getChildren(subProfile2));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(ste2));
+
+		//we test the children of the ste2
+		Assert.assertEquals(true, provider.hasChildren(ste2));
+		children = Arrays.asList(provider.getChildren(ste2));
+		Assert.assertEquals(2, children.size());
+		Assert.assertTrue(children.contains(prop2));
+		Assert.assertTrue(children.contains(basePropSte2));
+
+		//we test the children of the prop2
+		Assert.assertEquals(false, provider.hasChildren(prop2));
+	}
+
+
+	/**
+	 * We test the children of the rootProfile.
+	 * In this test,
+	 * <ul>
+	 * <li>we don't want the properties base_ExtendedClass</li>
+	 * <li>we want the inheritedProperties</li>
+	 * </ul>
+	 */
+	@Test
+	public void testProfileContentWithoutBaseClassPropertyWithInheritedProperties() {
+		UMLStereotypePropertyContentProvider provider = new UMLStereotypePropertyContentProvider();
+		provider.setIgnoreBaseProperty(true);
+		provider.setIgnoreInheritedElements(false);
+		provider.setProfiles(Collections.singletonList(rootProfile));
+		//we test the root
+		Object[] elements = provider.getElements();
+		Assert.assertEquals(1, elements.length);
+		Assert.assertEquals(elements[0], rootProfile);
+
+		//we test the first level of children
+		Assert.assertEquals(true, provider.hasChildren(rootProfile));
+		List<?> children = Arrays.asList(provider.getChildren(rootProfile));
+
+		Assert.assertEquals(2, children.size());
+		Assert.assertTrue(children.contains(subProfile1));
+		Assert.assertTrue(children.contains(subProfile2));
+
+
+		//we test the children of the first subprofile
+		Assert.assertEquals(true, provider.hasChildren(subProfile1));
+		children = Arrays.asList(provider.getChildren(subProfile1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(ste1));
+
+		//we test the children of the ste1
+		Assert.assertEquals(true, provider.hasChildren(ste1));
+		children = Arrays.asList(provider.getChildren(ste1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(prop1));
+
+		//we test the children of the prop1
+		Assert.assertEquals(false, provider.hasChildren(prop1));
+
+
+		//we test the children of the 2nd subprofile
+		Assert.assertEquals(true, provider.hasChildren(subProfile2));
+		children = Arrays.asList(provider.getChildren(subProfile2));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(ste2));
+
+		//we test the children of the ste2
+		Assert.assertEquals(true, provider.hasChildren(ste2));
+		children = Arrays.asList(provider.getChildren(ste2));
+		Assert.assertEquals(2, children.size());
+		Assert.assertTrue(children.contains(prop2));
+		Assert.assertTrue(children.contains(prop1));
+
+		//we test the children of the prop2
+		Assert.assertEquals(false, provider.hasChildren(prop2));
+	}
+
+	/**
+	 * We test the children of the rootProfile.
+	 * In this test,
+	 * <ul>
+	 * <li>we want the properties base_ExtendedClass</li>
+	 * <li>we want the inheritedProperties</li>
+	 * </ul>
+	 */
+	@Test
+	public void testProfileContentWithBaseClassPropertyWithInheritedProperties() {
+		UMLStereotypePropertyContentProvider provider = new UMLStereotypePropertyContentProvider();
+		provider.setIgnoreBaseProperty(false);
+		provider.setIgnoreInheritedElements(false);
+		provider.setProfiles(Collections.singletonList(rootProfile));
+		//we test the root
+		Object[] elements = provider.getElements();
+		Assert.assertEquals(1, elements.length);
+		Assert.assertEquals(elements[0], rootProfile);
+
+		//we test the first level of children
+		Assert.assertEquals(true, provider.hasChildren(rootProfile));
+		List<?> children = Arrays.asList(provider.getChildren(rootProfile));
+
+		Assert.assertEquals(2, children.size());
+		Assert.assertTrue(children.contains(subProfile1));
+		Assert.assertTrue(children.contains(subProfile2));
+
+
+		//we test the children of the first subprofile
+		Assert.assertEquals(true, provider.hasChildren(subProfile1));
+		children = Arrays.asList(provider.getChildren(subProfile1));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(ste1));
+
+		//we test the children of the ste1
+		Assert.assertEquals(true, provider.hasChildren(ste1));
+		children = Arrays.asList(provider.getChildren(ste1));
+		Assert.assertEquals(2, children.size());
+		Assert.assertTrue(children.contains(prop1));
+		Assert.assertTrue(children.contains(basePropSte1));
+
+		//we test the children of the prop1
+		Assert.assertEquals(false, provider.hasChildren(prop1));
+
+
+		//we test the children of the 2nd subprofile
+		Assert.assertEquals(true, provider.hasChildren(subProfile2));
+		children = Arrays.asList(provider.getChildren(subProfile2));
+		Assert.assertEquals(1, children.size());
+		Assert.assertTrue(children.contains(ste2));
+
+		//we test the children of the ste2
+		Assert.assertEquals(true, provider.hasChildren(ste2));
+		children = Arrays.asList(provider.getChildren(ste2));
+		Assert.assertEquals(4, children.size());
+		Assert.assertTrue(children.contains(prop2));
+		Assert.assertTrue(children.contains(basePropSte2));
+		Assert.assertTrue(children.contains(basePropSte1));
+		Assert.assertTrue(children.contains(prop1));
+
+		//we test the children of the prop2
+		Assert.assertEquals(false, provider.hasChildren(prop2));
+	}
+
+
+	/**
+	 *
+	 */
+	@After
+	public void enfOfTests() {
+		rootProfile = null;
+		subProfile1 = null;
+		ste1 = null;
+		prop1 = null;
+		basePropSte1 = null;
+		subProfile2 = null;
+		ste2 = null;
+		prop2 = null;
+		basePropSte2 = null;
+
+	}
+
+}
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF
index 332dd38624a..86b49c6706b 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.uml.tools.utils.tests.tests

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.tools.utils.tests.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/META-INF/MANIFEST.MF
index 54c06752db9..102ee4cf28b 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

-Bundle-SymbolicName: org.eclipse.papyrus.uml.validation.tests.genvalidation;singleton:=true

-Bundle-Name: %pluginName

-Bundle-Version: 1.2.0.qualifier

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.validation,

- org.eclipse.papyrus.uml.service.validation;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.papyrus.uml.validation.tests.staticprofile;bundle-version="[1.2.0,2.0.0)"

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.validation.tests.genvalidation.Activator

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Bundle-ActivationPolicy: lazy

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

+Manifest-Version: 1.0
+Bundle-SymbolicName: org.eclipse.papyrus.uml.validation.tests.genvalidation;singleton:=true
+Bundle-Name: %pluginName
+Bundle-Version: 1.2.0.qualifier
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.validation,
+ org.eclipse.papyrus.uml.service.validation;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.validation.tests.staticprofile;bundle-version="[1.2.0,2.0.0)"
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.validation.tests.genvalidation.Activator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/about.html b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/about.html
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/plugin.properties b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/plugin.properties
index f3b98cf2049..f6b84fb069d 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/plugin.properties
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/plugin.properties
@@ -1,12 +1,12 @@
-################################################################################

-# 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:

-#     Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - initial API and implementation

-################################################################################

-pluginName=Generated Papyrus UML validation plugin

-providerName=Eclipse Modeling Project

+################################################################################
+# 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:
+#     Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - initial API and implementation
+################################################################################
+pluginName=Generated Papyrus UML validation plugin
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/META-INF/MANIFEST.MF
index 23fb8229682..8c4c9025fba 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0

-Bundle-SymbolicName: org.eclipse.papyrus.uml.validation.tests.staticprofile;singleton:=true

-Export-Package: org.eclipse.papyrus.uml.validation.tests.staticprofile,

- profile,

- profile.impl,

- profile.util

-Bundle-Name: %pluginName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ClassPath: .

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.common;bundle-version="2.12.0",

- org.eclipse.emf.ecore;bundle-version="2.12.0";visibility:=reexport,

- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.validation.tests.staticprofile.Activator

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Bundle-ActivationPolicy: lazy

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

+Manifest-Version: 1.0
+Bundle-SymbolicName: org.eclipse.papyrus.uml.validation.tests.staticprofile;singleton:=true
+Export-Package: org.eclipse.papyrus.uml.validation.tests.staticprofile,
+ profile,
+ profile.impl,
+ profile.util
+Bundle-Name: %pluginName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ClassPath: .
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.common;bundle-version="2.12.0",
+ org.eclipse.emf.ecore;bundle-version="2.12.0";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.validation.tests.staticprofile.Activator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/about.html b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/about.html
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/plugin.properties b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/plugin.properties
index 3e05ddf472d..2512651f45c 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/plugin.properties
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/plugin.properties
@@ -1,12 +1,12 @@
-################################################################################

-# 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:

-#     Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - initial API and implementation

-################################################################################

-pluginName=Static profile for Papyrus UML validation tests

-providerName=Eclipse Modeling Project

+################################################################################
+# 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:
+#     Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - initial API and implementation
+################################################################################
+pluginName=Static profile for Papyrus UML validation tests
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.project b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.project
index baf5b5828b9..d1edd220819 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.project
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.validation.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.validation.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/META-INF/MANIFEST.MF
index c2a63955e04..53596fdb33b 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
-Manifest-Version: 1.0

-Bundle-Description: Tests for validation rules of the UmlRT profile

-Bundle-SymbolicName: org.eclipse.papyrus.uml.validation.tests;singleton:=true

-Bundle-Version: 1.2.0.qualifier

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.junit,

- org.eclipse.ui.views.properties.tabbed;bundle-version="3.6.0",

- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.service.validation;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.ocl.xtext.completeocl;bundle-version="1.1.0",

- org.eclipse.ocl.pivot.uml;bundle-version="1.1.0",

- org.eclipse.papyrus.uml.validation.tests.staticprofile;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.validation.tests.genvalidation;bundle-version="[1.2.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.validation.tests.Activator

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Export-Package: org.eclipse.papyrus.uml.validation.tests,

- org.eclipse.papyrus.uml.validation.tests.rules

+Manifest-Version: 1.0
+Bundle-Description: Tests for validation rules of the UmlRT profile
+Bundle-SymbolicName: org.eclipse.papyrus.uml.validation.tests;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.junit,
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.6.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.validation;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ocl.xtext.completeocl;bundle-version="1.1.0",
+ org.eclipse.ocl.pivot.uml;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.validation.tests.staticprofile;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.validation.tests.genvalidation;bundle-version="[1.2.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.validation.tests.Activator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.papyrus.uml.validation.tests,
+ org.eclipse.papyrus.uml.validation.tests.rules
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/about.html b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/about.html
index 209103075a7..dd3c089a94c 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/about.html
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/build.properties b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/build.properties
index fcf7058002e..4d4e8d3850e 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/build.properties
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/build.properties
@@ -1,10 +1,10 @@
-#

-

-bin.includes = .,\

-               resources/,\

-               META-INF/,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src/

-output.. = bin/

+#
+
+bin.includes = .,\
+               resources/,\
+               META-INF/,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/plugin.properties b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/plugin.properties
index 5739009347f..765c6c56c08 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/plugin.properties
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/plugin.properties
@@ -1,12 +1,12 @@
-################################################################################

-# 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:

-#     Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - initial API and implementation

-################################################################################

-pluginName=Papyrus UML validation tests

-providerName=Eclipse Modeling Project

+################################################################################
+# 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:
+#     Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - initial API and implementation
+################################################################################
+pluginName=Papyrus UML validation tests
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/Activator.java b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/Activator.java
index 22a8a350e0c..f6930a9b397 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/Activator.java
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/Activator.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:

- *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.validation.tests;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.validation.tests"; //$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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.validation.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.validation.tests"; //$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/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
index 5f0a5a045a7..41936b60712 100644
--- a/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -1,39 +1,39 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.core.resources,

- org.eclipse.ui.ide,

- org.eclipse.ui.navigator,

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.eclipse.gmf.runtime.notation,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sasheditor;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.widgets;bundle-version="[3.0.0,4.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.tools;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.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.views.modelexplorer.tests

-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.views.modelexplorer.tests.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.navigator,
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.gmf.runtime.notation,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sasheditor;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.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.tools;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.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.views.modelexplorer.tests
+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.views.modelexplorer.tests.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF
index 54e9c8b8813..20a5c6966ed 100644
--- a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties.model.xwt;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.properties.generation;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)",

- org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.m2m.qvt.oml;bundle-version="3.2.0",

- org.eclipse.core.resources;bundle-version="3.8.0",

- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

- org.junit;bundle-version="4.10.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.junit.utils;bundle-version="[2.1.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.views.properties.toolsmiths.tests,

- org.eclipse.papyrus.views.properties.toolsmiths.tests.qvt

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Properties view customization Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.views.properties.toolsmiths.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.views.properties.model.xwt;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.properties.generation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="2.8.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.m2m.qvt.oml;bundle-version="3.2.0",
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.junit.utils;bundle-version="[2.1.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.views.properties.toolsmiths.tests,
+ org.eclipse.papyrus.views.properties.toolsmiths.tests.qvt
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Properties view customization Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.views.properties.toolsmiths.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5